]> git.donarmstrong.com Git - debbugs.git/blobdiff - scripts/service.in
[project @ 2003-08-20 23:33:54 by cjwatson]
[debbugs.git] / scripts / service.in
index a295f665dde6d403ae85262f7e016ec1e17aa102..1d1333f579b2a8ad03405ccfd7dde6b4dec83cc0 100755 (executable)
@@ -1,15 +1,14 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.51 2002/09/25 16:19:08 doogie Exp $
-# ^ more or less ^
+# $Id: service.in,v 1.85 2003/08/20 23:33:54 cjwatson Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
 
-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";
@@ -36,34 +35,70 @@ open(M,"incoming/P$nn");
 @msg=@log;
 close(M);
 
-grep((s/\n$//,s/\s+$//),@msg);
+chomp @msg;
 
 print "###\n",join("##\n",@msg),"\n###\n" if $debug;
 
-chop($tdate= `date -u '+%a, %d %h %Y %T GMT'`);
-$fwd= <<END;
-Received: via spool for service; $tdate
-END
+my $parser = new MIME::Parser;
+mkdir "$gSpoolDir/mime.tmp", 0777;
+$parser->output_under("$gSpoolDir/mime.tmp");
+my $entity = eval { $parser->parse_data(join('',@log)) };
+
+# header and decoded body respectively
+my (@headerlines, @bodylines);
+
+if ($entity and $entity->head->tags) {
+    @headerlines = @{$entity->head->header};
+    chomp @headerlines;
 
-for ($i=0; $i<=$#msg; $i++) {
-     $_ = $msg[$i];
-    last unless length($_);
-    $fwd .= $_."\n";
-    while ($msg[$i+1] =~ m/^\s/) {
-       $i++;
-        $fwd .= $msg[$i]."\n" if $ins; # Huh ? Where is ins set ?
-        $_ .= ' '.$msg[$i];
+    my $entity_body = getmailbody($entity);
+    @bodylines = $entity_body ? $entity_body->as_lines() : ();
+    chomp @bodylines;
+} else {
+    # Legacy pre-MIME code, kept around in case MIME::Parser fails.
+    my $i;
+    for ($i = 0; $i <= $#msg; $i++) {
+       $_ = $msg[$i];
+       last unless length($_);
+       while ($msg[$i+1] =~ m/^\s/) {
+           $i++;
+           $_ .= "\n".$msg[$i];
+       }
+       push @headerlines, $_;
     }
+
+    @bodylines = @msg[$i..$#msg];
+}
+
+for (@headerlines) {
+    s/\n\s/ /g;
     print ">$_<\n" if $debug;
     if (s/^(\S+):\s*//) {
-       $v= $1; $v =~ y/A-Z/a-z/;
+       my $v = lc $1;
        print ">$v=$_<\n" if $debug;
-        $header{$v}= $_;
+       $header{$v} = $_;
     } else {
-       print "!>$_<\n" if $debug; 
+       print "!>$_<\n" if $debug;
     }
 }
 
+# Strip off RFC2440-style PGP clearsigning.
+if (@bodylines and $bodylines[0] =~ /^-----BEGIN PGP SIGNED/) {
+    shift @bodylines while @bodylines and length $bodylines[0];
+    shift @bodylines while @bodylines and $bodylines[0] !~ /\S/;
+    for my $findsig (0 .. $#bodylines) {
+       if ($bodylines[$findsig] =~ /^-----BEGIN PGP SIGNATURE/) {
+           $#bodylines = $findsig - 1;
+           last;
+       }
+    }
+    map { s/^- // } @bodylines;
+}
+
+grep(s/\s+$//,@bodylines);
+
+print "***\n",join("\n",@bodylines),"\n***\n" if $debug;
+
 if (defined $header{'resent-from'} && !defined $header{'from'}) {
     $header{'from'} = $header{'resent-from'};
 }
@@ -90,9 +125,6 @@ $mergelowstate= 'idle';
 $midix=0;    
 $extras="";
 
-#strip blank line(s) after header
-while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
-
 my $quickabort = 0;
 
 my $fuckheads = "(" . join("|", @gFuckheads) . ")";
@@ -101,24 +133,11 @@ if (@gFuckheads and $replyto =~ m/$fuckheads/) {
        $quickabort = 1;
 }
 
-#strip, if exists, mime header
-if ( $msg[$i] =~ /^This is a multi-part message in MIME format./ ) {
-    while ( $i <= $#msg && length( $msg[$i] ) ) {
-        $fwd .= $msg[$i] . "\n"; $i++; 
-    }
-    while ( $i <= $#msg && !length( $msg[$i] ) ) {
-        $fwd .= "\n"; $i++; 
-    }
-}
-if ( $msg[$i] =~ /^--/ || $msg[$i] =~ /^\s*$/ ) {
-    while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i]; $i++; }
-    while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
-}      
-
+my %limit_pkgs = ();
 my %clonebugs = ();
 my @bcc = ();
 
-for ($procline=$i; $procline<=$#msg; $procline++) {
+for ($procline=0; $procline<=$#bodylines; $procline++) {
     $state eq 'idle' || print "$state ?\n";
     $lowstate eq 'idle' || print "$lowstate ?\n";
     $mergelowstate eq 'idle' || print "$mergelowstate ?\n";
@@ -126,9 +145,10 @@ for ($procline=$i; $procline<=$#msg; $procline++) {
          &transcript("Stopping processing here.\n\n");
         last;
     }
-    $_= $msg[$procline]; s/\s+$//;
-    next unless m/\S/; next if m/^\s*\#/;
+    $_= $bodylines[$procline]; s/\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");
@@ -138,115 +158,45 @@ for ($procline=$i; $procline<=$#msg; $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");
@@ -291,29 +241,37 @@ 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}, $data->{severity});
                                        if ( length( $gDoneList ) > 0 && length( $gListDomain ) >
                                        0 ) { &addccaddress("$gDoneList\@$gListDomain"); }
-                    $s_done= $replyto;
+                    $data->{done}= $replyto;
+                    my @keywords= split ' ', $data->{keywords};
+                    if (grep $_ eq 'pending', @keywords) {
+                        $extramessage= "Removed pending tag.\n";
+                        $data->{keywords}= join ' ', grep $_ ne 'pending',
+                                                @keywords;
+                    }
+
                    $message= <<END;
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $s_originator
+To: $data->{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: <handler.$ref.$nn.notifdonectrl.$midix\@$gEmailDomain>
 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.
@@ -325,7 +283,7 @@ $gMaintainer
 (administrator, $gProject $gBugs database)
 
 END
-                    &sendmailmessage($message,$s_originator);
+                    &sendmailmessage($message,$data->{originator});
                 } while (&getnextbug);
             }
         }
@@ -334,16 +292,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}, $data->{severity});
                 &addmaintainers($newpackage);
-                $s_package= $newpackage;
+                $data->{package}= $newpackage;
             } while (&getnextbug);
         }
     } elsif (m/^reopen\s+\#?(-?\d+)$/i ? ($noriginator='', 1) :
@@ -353,7 +311,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 {
@@ -361,44 +319,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->{severity});
+                    $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}, $data->{severity});
+            $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= <<END;
+From: $gMaintainerEmail ($gProject $gBug Tracking System)
+To: $oldsubmitter
+Subject: $gBug#$ref submitter address changed
+         ($header{'subject'})
+References: $header{'message-id'} $data->{msgid}
+In-Reply-To: $data->{msgid}
+Message-ID: <handler.$ref.$nn.newsubmitter.$midix\@$gEmailDomain>
+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 {
+            &notfoundbug;
+        }
     } 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}, $data->{severity});
                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->{severity});
+                    $data->{forwarded}= '';
                 } while (&getnextbug);
             }
         }
@@ -410,16 +416,24 @@ 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});
+                if (defined $gStrongList and
+                        grep { $_ eq $newseverity } @strongseverities) {
+                    my $addbcc = "$gStrongList\@$gListDomain";
+                    push @bcc, $addbcc unless grep { $_ eq $addbcc } @bccs;
+                }
+                $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";
@@ -442,6 +456,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") {
@@ -450,20 +469,20 @@ END
                $action= "Tags removed: " . join(", ", @okaytags);
            }
            do {
-                &addmaintainers($s_package);
-               $s_keywords = '' if ($addsub eq "set");
+                &addmaintainers($data->{package}, $data->{severity});
+               $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) {
@@ -474,12 +493,12 @@ END
        }
         if (&getbug) {
             &foundbug;
-            &addmaintainers($s_package);
-            $s_subject= $newtitle;
+            &addmaintainers($data->{package}, $data->{severity});
+            $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");
@@ -490,22 +509,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->{severity});
+                   $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= ();
@@ -514,24 +533,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) { &notfoundbug; @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) {
@@ -539,9 +561,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->{severity});
+               $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
+               $data->{keywords}= join(' ', keys %tags);
                &savebug;
            }
            &transcript("$action\n\n");
@@ -556,7 +578,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 {
@@ -584,12 +606,23 @@ 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);
 
                    $ref++;
                }
            }
        }
+    } elsif (m/^package\s*(\S.*\S)?\s*$/i) {
+        $ok++;
+       my @pkgs = split /\s+/, $1;
+       if (scalar(@pkgs) > 0) {
+               %limit_pkgs = map { ($_, 1) } @pkgs;
+               &transcript("Ignoring bugs not assigned to: " . 
+                       join(" ", keys(%limit_pkgs)) . "\n\n");
+       } else {
+               %limit_pkgs = ();
+               &transcript("Not ignoring any bugs.\n\n");
+       }
     } else {
         &transcript("Unknown command or malformed arguments to command.\n\n");
         if (++$unknowns >= 5) {
@@ -598,7 +631,7 @@ END
         }
     }
 }
-if ($procline>$#msg) {
+if ($procline>$#bodylines) {
     &transcript(">\nEnd of message, stopping processing here.\n\n");
 }
 if (!$ok && !quickabort) {
@@ -634,10 +667,6 @@ if (@maintccs) {
     &transcript("MC|@maintccs|\n") if $dl>2;
     $maintccs .= "Cc: " . join(",\n    ",@maintccs) . "\n";
 }
-if (@bcc) {
-    &transcript("BCC|@bcc|\n") if $dl>2;
-    $maintccs .= "Bcc: " . join(,\n   ", @bcc) . "\n";
-}
 
 if (!defined $header{'subject'} || $header{'subject'} eq "") {
   $header{'subject'} = "your mail";
@@ -650,6 +679,7 @@ ${maintccs}Subject: Processed: $header{'subject'}
 In-Reply-To: $header{'message-id'}
 References: $header{'message-id'}
 Message-ID: <handler.s.$nn.transcript\@$gEmailDomain>
+Precedence: bulk
 
 ${transcript}Please contact me if you need assistance.
 
@@ -668,23 +698,18 @@ print(AP
       &sani($header{'from'})."</code>\n".
       "to <code>".&sani($controlrequestaddr)."</code>\n".
       "\3\n".
-      "\7\n",@log,"\n\3\n") || &quit("writing db-h/-1.log: $!");
+      "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/-1.log: $!");
 close(AP) || &quit("open db-h/-1.log: $!");
 &unfilelock;
 utime(time,time,"db-h");
 
-&sendmailmessage($reply,$replyto,@maintccaddrs);
+&sendmailmessage($reply,$replyto,@maintccaddrs,@bcc);
 
 unlink("incoming/P$nn") || &quit("unlinking incoming/P$nn: $!");
 
-sub get_addresses {
-    return
-       map { $_->address() }
-       map { Mail::Address->parse($_) } @_;
-}
-
 sub sendmailmessage {
     local ($message,@recips) = @_;
+    $message = "X-Loop: $gMaintainerEmail\n" . $message;
     print "mailing to >@recips<\n" if $debug;
     $c= open(D,"|-");
     defined($c) || &quit("mailing forking for sendmail: $!");
@@ -767,7 +792,14 @@ sub setbug {
         &dlex("setbug => 0s");
         return 0;
     }
-    @thisbugmergelist= split(/ /,$s_mergedwith);
+
+    if (keys(%limit_pkgs) && not defined $limit_pkgs{$data->{package}}) {
+       &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n");
+       &cancelbug;
+       return 0;
+    } 
+
+    @thisbugmergelist= split(/ /,$data->{mergedwith});
     if (!@thisbugmergelist) {
         &foundbug;
         $manybugs= 0;
@@ -829,7 +861,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");
@@ -850,7 +882,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");
@@ -883,35 +915,9 @@ sub savebug {
           "Request was from <code>".&sani($header{'from'})."</code>\n".
           "to <code>".&sani($controlrequestaddr)."</code>. \n".
           "\3\n".
-          "\7\n",@log,"\n\3\n") || &quit("writing db-h/$hash/$ref.log: $!");
+          "\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");
 }
@@ -931,6 +937,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");
@@ -957,6 +972,7 @@ Subject: $gProject $gBug help: $description
 References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.help.$midix\@$gEmailDomain>
+Precedence: bulk
 
 END
     $ok++;
@@ -965,8 +981,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(<L>) { $doc.=$_; }
     $!=0; close(L);
     if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {
@@ -984,6 +999,7 @@ Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.info.$midix\@$gEmailDomain>
+Precedence: bulk
 
 END
          $ok++;
@@ -1004,11 +1020,17 @@ 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 $_[1] and defined $gStrongList and
+                grep { $_ eq $_[1] } @strongseverities) {
+            push @bcc, "$gStrongList\@$gListDomain";
+        }
         if (defined($maintainerof{$p})) {
            $addmaint= $maintainerof{$p};
            &transcript("MR|$addmaint|$p|$ref|\n") if $dl>2;
@@ -1016,6 +1038,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;
        }
@@ -1045,7 +1068,7 @@ sub ensuremaintainersloaded {
 
     open(SOURCES, "$gPackageSource") || &quit("pkgsrc open: $!");
     while (<SOURCES>) {
-       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;
     }
@@ -1080,6 +1103,7 @@ Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}
 In-Reply-To: $header{'message-id'}
 Message-ID: <handler.s.$nn.info.$midix\@$gEmailDomain>
+Precedence: bulk
 
 $description follows: