X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice.in;h=c31399c1d2d19ac49c3832d973e6c3e82b347b72;hb=12521a4a51c5e082cacf085263f06bf838e0a839;hp=086395f7f38a94b0f22ac5bdedfe5cb15151eeb8;hpb=f4bf51775dff6370341b85ec8a1b19c3f700c32e;p=debbugs.git diff --git a/scripts/service.in b/scripts/service.in index 086395f..c31399c 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: service.in,v 1.57 2002/10/20 13:21:15 cjwatson Exp $ +# $Id: service.in,v 1.77 2003/06/05 08:26:59 cjwatson Exp $ # ^ more or less ^ # # Usage: service .nn @@ -9,8 +9,8 @@ use Mail::Address; use File::Copy; use MIME::Parser; -$config_path = '/org/bugs.debian.org/etc'; -$lib_path = '/org/bugs.debian.org/scripts'; +$config_path = '/etc/debbugs'; +$lib_path = '/usr/lib/debbugs'; require "$config_path/config"; require "$lib_path/errorlib"; @@ -147,8 +147,9 @@ for ($procline=0; $procline<=$#bodylines; $procline++) { last; } $_= $bodylines[$procline]; s/\s+$//; - next unless m/\S/; next if m/^\s*\#/; + next unless m/\S/; &transcript("> $_\n"); + next if m/^\s*\#/; $action= ''; if (m/^stop/i || m/^quit/i || m/^--/ || m/^thank/i) { &transcript("Stopping processing here.\n\n"); @@ -158,115 +159,45 @@ for ($procline=0; $procline<=$#bodylines; $procline++) { &transcript("Debug level $dl.\n\n"); } elsif (m/^(send|get)\s+\#?(\d{2,})$/i) { $ref= $2+0; - &sendlynxdoc("$ref","logs for $gBug#$ref"); - } elsif (m/^send-detail\s+\#?(\d+)$/i) { - &transcript("This BTS function is currently disabled, sorry.\n\n"); - $ok++; # well, it's not really ok, but it fixes #81224 :) -# $ref= $1+0; $reffile= $ref; $reffile =~ s,^..,$&/$&,; -# &sendlynxdoc("db/$reffile-b.html","additional logs for $gBug#$ref"); + &sendlynxdoc("bugreport.cgi?bug=$ref","logs for $gBug#$ref"); + } elsif (m/^send-detail\s+\#?(\d{2,})$/i) { + $ref= $1+0; + &sendlynxdoc("bugreport.cgi?bug=$ref&boring=yes", + "detailed logs for $gBug#$ref"); } elsif (m/^index(\s+full)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ix/full.html",'full index'); } elsif (m/^index-summary\s+by-package$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ix/psummary.html",'summary index sorted by package/title'); } elsif (m/^index-summary(\s+by-number)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ix/summary.html",'summary index sorted by number/date'); } elsif (m/^index(\s+|-)pack(age)?s?$/i) { - &sendlynxdoc("cgi-bin/pkgindex.cgi?indexon=pkg",'index of packages'); + &sendlynxdoc("pkgindex.cgi?indexon=pkg",'index of packages'); } elsif (m/^index(\s+|-)maints?$/i) { - &sendlynxdoc("cgi-bin/pkgindex.cgi?indexon=maint",'index of maintainers'); + &sendlynxdoc("pkgindex.cgi?indexon=maint",'index of maintainers'); } elsif (m/^index(\s+|-)maint\s+(\S+)$/i) { $maint = $2; -# check for crap in $maint - if ($maint =~ m/^\./ || $maint !~ m/^[\d\w-+.@]+$/) { - &transcript("Invalid request $maint!\n"); - next; - } - &sendlynxdoc("$maint","$gBug list for maintainer \`$maint'"); -if (0) { - $substrg= $2; $matches=0; - opendir(DBD,"$gWebDir/db/ma") || die $!; - while (defined($_=readdir(DBD))) { - next unless m/^l/ && m/\.html$/; - &transcript("F|$_\n") if $dl>1; - $filename= $_; s/^l//; s/\.html$//; - &transcript("P|$_\n") if $dl>2; - while (s/-(..)([^_])/-$1_-$2/) { } - &transcript("P|$_\n") if $dl>2; - s/^(.{0,2})_/$1-20_/g; while (s/([^-]..)_/$1-20_/) { }; - &transcript("P|$_\n") if $dl>2; - s/^,(.*),(.*),([^,]+)$/$1-40_$2-20_-28_$3-29_/; - &transcript("P|$_\n") if $dl>2; - s/^([^,]+),(.*),(.*),$/$1-20_-3c_$2-40_$3-3e_/; - &transcript("P|$_\n") if $dl>2; - s/\./-2e_/g; - &transcript("P|$_\n") if $dl>2; - $out=''; - while (m/-(..)_/) { $out.= $`.sprintf("%c",hex($1)); $_=$'; } - $out.=$_; - &transcript("M|$out\n") if $dl>1; - next unless index(lc $out, lc $substrg)>=0; - &transcript("S|$filename\n") if $dl>0; - &transcript("S|$out\n") if $dl>0; - $matches++; - &sendlynxdocraw("db/ma/$filename","$gBug list for maintainer \`$out'"); - } - if ($matches) { - &transcript("$gBug list(s) for $matches maintainer(s) sent.\n\n"); - } else { - &transcript("No maintainers found containing \`$substrg'.\n". - "Use \`index-maint' to get list of maintainers.\n\n"); - } -} # 0 + &sendlynxdoc("pkgreport.cgi?maint=" . urlsanit($maint), + "$gBug list for maintainer \`$maint'"); $ok++; } elsif (m/^index(\s+|-)pack(age)?s?\s+(\S.*\S)$/i) { $package = $+; -# check for crap in $package - if ($package =~ m/^\./ || $package !~ m/^[\d\w-+.@]+$/) { - &transcript("Invalid request $package!\n"); - next; - } - &sendlynxdoc("$package","$gBug list for package $package sent.\n\n"); -if (0) { - $substrg= $+; $matches=0; - opendir(DBD,"$gWebDir/db/pa") || die $!; - while (defined($_=readdir(DBD))) { - next unless m/^l/ && m/\.html$/; - &transcript("F|$_\n") if $dl>1; - $filename= $_; s/^l//; s/\.html$//; - next unless index(lc $_, lc $substrg)>=0; - &transcript("S|$filename\n") if $dl>0; - &transcript("S|$out\n") if $dl>0; - $matches++; - &sendlynxdocraw("db/pa/$filename","$gBug list for package \`$_'"); - } - if ($matches) { - &transcript("$gBug list(s) for $matches package(s) sent.\n\n"); - } else { - &transcript("No packages found containing \`$substrg'.\n". - "Use \`index-packages' to get list of packages.\n\n"); - } -} # 0 + &sendlynxdoc("pkgreport.cgi?pkg=" . urlsanit($package), + "$gBug list for package $package"); $ok++; } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ju/unmatched-1.html","junk (this week)"); } elsif (m/^send-unmatched\s+(last|-1)$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ju/unmatched-2.html","junk (last week)"); } elsif (m/^send-unmatched\s+(old|-2)$/i) { &transcript("This BTS function is currently disabled, sorry.\n\n"); $ok++; # well, it's not really ok, but it fixes #81224 :) -# &sendlynxdoc("db/ju/unmatched-3.html","junk (two weeks ago)"); } elsif (m/^getinfo\s+([\w-.]+)$/i) { -# the following is basically a Debian-specific kludge, but who cares + # the following is basically a Debian-specific kludge, but who cares $req = $1; if ($req =~ /^maintainers$/i && -f "$gConfigDir/Maintainers") { &sendinfo("local", "$gConfigDir/Maintainers", "Maintainers file"); @@ -311,29 +242,30 @@ END $ok++; $ref= $1; if (&setbug) { - if (length($s_done)) { + &transcript("'close' is deprecated; see http://$gWebDomain/Developer$gHTMLSuffix#closing.\n"); + if (length($data->{done})) { &transcript("$gBug is already closed, cannot re-close.\n\n"); &nochangebug; } else { - $action= "$gBug closed, send any further explanations to $s_originator"; + $action= "$gBug closed, send any further explanations to $data->{originator}"; do { - &addmaintainers($s_package); + &addmaintainers($data->{package}); if ( length( $gDoneList ) > 0 && length( $gListDomain ) > 0 ) { &addccaddress("$gDoneList\@$gListDomain"); } - $s_done= $replyto; + $data->{done}= $replyto; $message= <{originator} Subject: $gBug#$ref acknowledged by developer ($header{'subject'}) -References: $header{'message-id'} $s_msgid -In-Reply-To: $s_msgid +References: $header{'message-id'} $data->{msgid} +In-Reply-To: $data->{msgid} Message-ID: Reply-To: $ref\@$gEmailDomain This is an automatic notification regarding your $gBug report -#$ref: $s_subject, -which was filed against the $s_package package. +#$ref: $data->{subject}, +which was filed against the $data->{package} package. It has been marked as closed by one of the developers, namely $replyto. @@ -345,7 +277,7 @@ $gMaintainer (administrator, $gProject $gBugs database) END - &sendmailmessage($message,$s_originator); + &sendmailmessage($message,$data->{originator}); } while (&getnextbug); } } @@ -354,16 +286,16 @@ END $ref= $1; $newpackage= $2; $newpackage =~ y/A-Z/a-z/; if (&setbug) { - if (length($s_package)) { - $action= "$gBug reassigned from package \`$s_package'". + if (length($data->{package})) { + $action= "$gBug reassigned from package \`$data->{package}'". " to \`$newpackage'."; } else { $action= "$gBug assigned to package \`$newpackage'."; } do { - &addmaintainers($s_package); + &addmaintainers($data->{package}); &addmaintainers($newpackage); - $s_package= $newpackage; + $data->{package}= $newpackage; } while (&getnextbug); } } elsif (m/^reopen\s+\#?(-?\d+)$/i ? ($noriginator='', 1) : @@ -373,7 +305,7 @@ END $ok++; $ref= $1; if (&setbug) { - if (!length($s_done)) { + if (!length($data->{done})) { &transcript("$gBug is already open, cannot reopen.\n\n"); &nochangebug; } else { @@ -381,44 +313,92 @@ END $noriginator eq '' ? "$gBug reopened, originator not changed." : "$gBug reopened, originator set to $noriginator."; do { - &addmaintainers($s_package); - $s_originator= $noriginator eq '' ? $s_originator : $noriginator; - $s_done= ''; + &addmaintainers($data->{package}); + $data->{originator}= $noriginator eq '' ? $data->{originator} : $noriginator; + $data->{done}= ''; } while (&getnextbug); } } + } elsif (m/^submitter\s+\#?(-?\d+)\s+\!$/i ? ($newsubmitter=$replyto, 1) : + m/^submitter\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newsubmitter=$2, 1) : 0) { + $ok++; + $ref= $1; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + if (&getbug) { + &foundbug; + &addmaintainers($data->{package}); + $oldsubmitter= $data->{originator}; + $data->{originator}= $newsubmitter; + $action= "Changed $gBug submitter from $oldsubmitter to $newsubmitter."; + &savebug; + &transcript("$action\n"); + if (length($data->{done})) { + &transcript("(By the way, that $gBug is currently marked as done.)\n"); + } + &transcript("\n"); + $message= <{msgid} +In-Reply-To: $data->{msgid} +Message-ID: +Reply-To: $ref\@$gEmailDomain + +The submitter address recorded for your $gBug report +#$ref: $data->{subject} +has been changed. + +The new submitter address for this report is +$newsubmitter. + +This change was made by +$replyto. +If it was incorrect, please contact them directly. + +$gMaintainer +(administrator, $gProject $gBugs database) + +END + &sendmailmessage($message,$oldsubmitter); + } else { + ¬foundbug; + } } elsif (m/^forwarded\s+\#?(-?\d+)\s+(\S.*\S)$/i) { $ok++; $ref= $1; $whereto= $2; if (&setbug) { - if (length($s_forwarded)) { - $action= "Forwarded-to-address changed from $s_forwarded to $whereto."; + if (length($data->{forwarded})) { + $action= "Forwarded-to-address changed from $data->{forwarded} to $whereto."; } else { $action= "Noted your statement that $gBug has been forwarded to $whereto."; } - if (length($s_done)) { + if (length($data->{done})) { $extramessage= "(By the way, this $gBug is currently marked as done.)\n"; } do { - &addmaintainers($s_package); + &addmaintainers($data->{package}); if (length($gFowardList)>0 && length($gListDomain)>0 ) { &addccaddress("$gFowardList\@$gListDomain"); } - $s_forwarded= $whereto; + $data->{forwarded}= $whereto; } while (&getnextbug); } } elsif (m/^notforwarded\s+\#?(-?\d+)$/i) { $ok++; $ref= $1; if (&setbug) { - if (!length($s_forwarded)) { + if (!length($data->{forwarded})) { &transcript("$gBug is not marked as having been forwarded.\n\n"); &nochangebug; } else { - $action= "Removed annotation that $gBug had been forwarded to $s_forwarded."; + $action= "Removed annotation that $gBug had been forwarded to $data->{forwarded}."; do { - &addmaintainers($s_package); - $s_forwarded= ''; + &addmaintainers($data->{package}); + $data->{forwarded}= ''; } while (&getnextbug); } } @@ -430,16 +410,19 @@ END if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) { &transcript("Severity level \`$newseverity' is not known.\n". "Recognized are: $gShowSeverities.\n\n"); + } elsif (exists $gObsoleteSeverities{$newseverity}) { + &transcript("Severity level \`$newseverity' is obsolete. " . + "$gObsoleteSeverities{$newseverity}\n\n"); } elsif (&setbug) { - $printseverity= $s_severity; + $printseverity= $data->{severity}; $printseverity= "$gDefaultSeverity" if $printseverity eq ''; $action= "Severity set to \`$newseverity'."; do { - &addmaintainers($s_package); - $s_severity= $newseverity; + &addmaintainers($data->{package}); + $data->{severity}= $newseverity; } while (&getnextbug); } - } elsif (m/^tags?\s+\#?(-?\d+)\s+(([=+-])\s+)?(\S.*)?$/i) { + } elsif (m/^tags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) { $ok++; $ref = $1; $addsubcode = $3; $tags = $4; $addsub = "add"; @@ -462,6 +445,11 @@ END "Recognized are: ".join(' ', @gTags).".\n\n"); } if (&setbug) { + if ($data->{keywords} eq '') { + &transcript("There were no tags set.\n"); + } else { + &transcript("Tags were: $data->{keywords}\n"); + } if ($addsub eq "set") { $action= "Tags set to: " . join(", ", @okaytags); } elsif ($addsub eq "add") { @@ -470,20 +458,20 @@ END $action= "Tags removed: " . join(", ", @okaytags); } do { - &addmaintainers($s_package); - $s_keywords = '' if ($addsub eq "set"); + &addmaintainers($data->{package}); + $data->{keywords} = '' if ($addsub eq "set"); if ($addsub eq "sub") { foreach my $t (@badtags) { - $s_keywords = join ' ', grep $_ ne $t, - split ' ', $s_keywords; + $data->{keywords} = join ' ', grep $_ ne $t, + split ' ', $data->{keywords}; } } foreach my $t (@okaytags) { - $s_keywords = join ' ', grep $_ ne $t, - split ' ', $s_keywords; - $s_keywords = "$t $s_keywords" unless($addsub eq "sub"); + $data->{keywords} = join ' ', grep $_ ne $t, + split ' ', $data->{keywords}; + $data->{keywords} = "$t $data->{keywords}" unless($addsub eq "sub"); } - $s_keywords =~ s/\s*$//; + $data->{keywords} =~ s/\s*$//; } while (&getnextbug); } } elsif (m/^retitle\s+\#?(-?\d+)\s+(\S.*\S)\s*$/i) { @@ -494,12 +482,12 @@ END } if (&getbug) { &foundbug; - &addmaintainers($s_package); - $s_subject= $newtitle; + &addmaintainers($data->{package}); + $data->{subject}= $newtitle; $action= "Changed $gBug title."; &savebug; &transcript("$action\n"); - if (length($s_done)) { + if (length($data->{done})) { &transcript("(By the way, that $gBug is currently marked as done.)\n"); } &transcript("\n"); @@ -510,22 +498,22 @@ END $ok++; $ref= $1; if (&setbug) { - if (!length($s_mergedwith)) { + if (!length($data->{mergedwith})) { &transcript("$gBug is not marked as being merged with any others.\n\n"); &nochangebug; } else { $mergelowstate eq 'locked' || die "$mergelowstate ?"; $action= "Disconnected #$ref from all other report(s)."; - @newmergelist= split(/ /,$s_mergedwith); + @newmergelist= split(/ /,$data->{mergedwith}); $discref= $ref; do { - &addmaintainers($s_package); - $s_mergedwith= ($ref == $discref) ? '' + &addmaintainers($data->{package}); + $data->{mergedwith}= ($ref == $discref) ? '' : join(' ',grep($_ ne $ref,@newmergelist)); } while (&getnextbug); } } - } elsif (m/^merge\s+(\d+(\s+\d+)+)\s*$/i) { + } elsif (m/^merge\s+(-?\d+(\s+-?\d+)+)\s*$/i) { $ok++; @tomerge= sort { $a <=> $b } split(/\s+/,$1); @newmergelist= (); @@ -534,24 +522,27 @@ END while (defined($ref= shift(@tomerge))) { &transcript("D| checking merge $ref\n") if $dl; $ref+= 0; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } next if grep($_ eq $ref,@newmergelist); if (!&getbug) { ¬foundbug; @newmergelist=(); last } &foundbug; - &transcript("D| adding $ref ($s_mergedwith)\n") if $dl; + &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl; $mismatch= ''; - &checkmatch('package','m_package',$s_package); - &checkmatch('forwarded addr','m_forwarded',$s_forwarded); - $s_severity = '$gDefaultSeverity' if $s_severity eq ''; - &checkmatch('severity','m_severity',$s_severity); - &checkmatch('done mark','m_done',length($s_done) ? 'done' : 'open'); - foreach my $t (split /\s+/, $s_keywords) { $tags{$t} = 1; } + &checkmatch('package','m_package',$data->{package}); + &checkmatch('forwarded addr','m_forwarded',$data->{forwarded}); + $data->{severity} = '$gDefaultSeverity' if $data->{severity} eq ''; + &checkmatch('severity','m_severity',$data->{severity}); + &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open'); + foreach my $t (split /\s+/, $data->{keywords}) { $tags{$t} = 1; } if (length($mismatch)) { &transcript("Mismatch - only $gBugs in same state can be merged:\n". $mismatch."\n"); &cancelbug; @newmergelist=(); last; } push(@newmergelist,$ref); - push(@tomerge,split(/ /,$s_mergedwith)); + push(@tomerge,split(/ /,$data->{mergedwith})); &cancelbug; } if (@newmergelist) { @@ -559,9 +550,9 @@ END $action= "Merged @newmergelist."; for $ref (@newmergelist) { &getbug || die "huh ? $gBug $ref disappeared during merge"; - &addmaintainers($s_package); - $s_mergedwith= join(' ',grep($_ ne $ref,@newmergelist)); - $s_keywords= join(' ', keys %tags); + &addmaintainers($data->{package}); + $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist)); + $data->{keywords}= join(' ', keys %tags); &savebug; } &transcript("$action\n\n"); @@ -576,7 +567,7 @@ END $ref = $origref; if (&setbug) { - if (length($s_mergedwith)) { + if (length($data->{mergedwith})) { &transcript("$gBug is marked as being merged with others.\n\n"); &nochangebug; } else { @@ -604,7 +595,7 @@ END copy("db-h/$ohash/$origref.log", "db-h/$hash/$ref.log"); copy("db-h/$ohash/$origref.status", "db-h/$hash/$ref.status"); copy("db-h/$ohash/$origref.report", "db-h/$hash/$ref.report"); - &bughook('new', $ref, "$s_originator\n$s_date\n$s_subject\n$s_msgid\n$s_package\n$s_keywords\n$s_done\n$s_forwarded\n$s_mergedwith\n$s_severity\n"); + &bughook('new', $ref, "$data->{originator}\n$data->{date}\n$data->{subject}\n$data->{msgid}\n$data->{package}\n$data->{keywords}\n$data->{done}\n$data->{forwarded}\n$data->{mergedwith}\n$data->{severity}\n"); $ref++; } @@ -666,6 +657,7 @@ ${maintccs}Subject: Processed: $header{'subject'} In-Reply-To: $header{'message-id'} References: $header{'message-id'} Message-ID: +Precedence: bulk ${transcript}Please contact me if you need assistance. @@ -784,7 +776,7 @@ sub setbug { &dlex("setbug => 0s"); return 0; } - @thisbugmergelist= split(/ /,$s_mergedwith); + @thisbugmergelist= split(/ /,$data->{mergedwith}); if (!@thisbugmergelist) { &foundbug; $manybugs= 0; @@ -846,7 +838,7 @@ sub getnextbug { # endmerge sub notfoundbug { &transcript("$gBug number $ref not found.\n\n"); } -sub foundbug { &transcript("$gBug#$ref: $s_subject\n"); } +sub foundbug { &transcript("$gBug#$ref: $data->{subject}\n"); } sub getmerge { &dlen("getmerge"); @@ -867,7 +859,7 @@ sub endmerge { sub getbug { &dlen("getbug $ref"); $lowstate eq 'idle' || die "$state ?"; - if (&lockreadbug($ref)) { + if (($data = &lockreadbug($ref))) { $sref= $ref; $lowstate= "open"; &dlex("getbug => 1"); @@ -902,33 +894,7 @@ sub savebug { "\3\n". "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log: $!"); close(L) || &quit("closing db-h/$hash/$ref.log: $!"); - open(S,">db-h/$hash/$ref.status.new") || &quit("opening db-h/$hash/$ref.status.new: $!"); - print(S - "$s_originator\n". - "$s_date\n". - "$s_subject\n". - "$s_msgid\n". - "$s_package\n". - "$s_keywords\n". - "$s_done\n". - "$s_forwarded\n". - "$s_mergedwith\n". - "$s_severity\n") || &quit("writing db-h/$hash/$ref.status.new: $!"); - close(S) || &quit("closing db-h/$hash/$ref.status.new: $!"); - rename("db-h/$hash/$ref.status.new","db-h/$hash/$ref.status") || - &quit("installing new db-h/$hash/$ref.status: $!"); - &bughook('change',$ref, - "$s_originator\n". - "$s_date\n". - "$s_subject\n". - "$s_msgid\n". - "$s_package\n". - "$s_keywords\n". - "$s_done\n". - "$s_forwarded\n". - "$s_mergedwith\n". - "$s_severity\n"); - &unfilelock; + unlockwritebug($ref, $data); $lowstate= "idle"; &dlex("savebug"); } @@ -948,6 +914,15 @@ sub transcript { $transcript.= $_[0]; } +sub urlsanit { + my $url = shift; + $url =~ s/%/%25/g; + $url =~ s/\+/%2b/g; + my %saniarray = ('<','lt', '>','gt', '&','amp', '"','quot'); + $url =~ s/([<>&"])/\&$saniarray{$1};/g; + return $url; +} + sub sendlynxdoc { &sendlynxdocraw; &transcript("\n"); @@ -974,6 +949,7 @@ Subject: $gProject $gBug help: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk END $ok++; @@ -982,8 +958,7 @@ END sub sendlynxdocraw { local ($relpath,$description) = @_; $doc=''; -# the below oughta use $gWebDomain but it can't - open(L,"lynx -nolist -dump http://bugs.debian.org/$relpath 2>&1 |") || &quit("fork for lynx: $!"); + open(L,"lynx -nolist -dump http://$gCGIDomain/\Q$relpath\E 2>&1 |") || &quit("fork for lynx: $!"); while() { $doc.=$_; } $!=0; close(L); if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) { @@ -1001,6 +976,7 @@ Subject: $gProject $gBugs information: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk END $ok++; @@ -1021,10 +997,12 @@ sub addmaintainers { for $p (split(m/[ \t?,()]+/,$_[0])) { $p =~ y/A-Z/a-z/; $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : ''); - if (defined($pkgsrc{$p})) { - push @bcc, "$pkgsrc{$p}\@packages.qa.debian.org"; - } else { - push @bcc, "$p\@packages.qa.debian.org"; + if (defined $gSubscriptionDomain) { + if (defined($pkgsrc{$p})) { + push @bcc, "$pkgsrc{$p}\@$gSubscriptionDomain"; + } else { + push @bcc, "$p\@$gSubscriptionDomain"; + } } if (defined($maintainerof{$p})) { $addmaint= $maintainerof{$p}; @@ -1033,6 +1011,7 @@ sub addmaintainers { print "maintainer add >$p|$addmaint<\n" if $debug; } else { print "maintainer none >$p<\n" if $debug; + &transcript("Warning: Unknown package '$p'\n"); &transcript("MR|unknown-package|$p|$ref|\n") if $dl>2; $maintccreasons{$gUnknownMaintainerEmail}{$p}{$ref}= 1; } @@ -1062,7 +1041,7 @@ sub ensuremaintainersloaded { open(SOURCES, "$gPackageSource") || &quit("pkgsrc open: $!"); while () { - next unless m/^(\S+)\s+(\S.*\S)\s*$/; + next unless m/^(\S+)\s+\S+\s+(\S.*\S)\s*$/; my ($a, $b) = ($1, $2); $pkgsrc{lc($a)} = $b; } @@ -1097,6 +1076,7 @@ Subject: $gProject $gBugs information: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk $description follows: