]> git.donarmstrong.com Git - debbugs.git/blobdiff - scripts/service.in
[project @ 2005-07-30 03:22:36 by don]
[debbugs.git] / scripts / service.in
index 8eca1324bc076a405e286465c979708843ce585a..693caec7477f605b297b4604037b9bc6efca6c7d 100755 (executable)
@@ -1,25 +1,33 @@
-#!/usr/bin/perl -w
-# $Id: service.in,v 1.19 2000/10/07 15:16:18 joy Exp $
+#!/usr/bin/perl
+# $Id: service.in,v 1.111 2005/07/30 03:22:36 don Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
 
-use Mail::Address;
-require('/etc/debbugs/config');
-require('/usr/lib/debbugs/errorlib');
-$ENV{'PATH'}= '/usr/lib/debbugs'.$ENV{'PATH'};;
+use File::Copy;
+use MIME::Parser;
+use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
+
+$config_path = '/etc/debbugs';
+$lib_path = '/usr/lib/debbugs';
+
+require "$config_path/config";
+require "$lib_path/errorlib";
+$ENV{'PATH'} = $lib_path.':'.$ENV{'PATH'};
+
 chdir("$gSpoolDir") || die "chdir spool: $!\n";
 
 # open(DEBUG,">&4");
+open DEBUG, ">/dev/null";
 $debug = 0;
-$wwwbase= "$gWebDir";
+umask(002);
 
 $_=shift;
 m/^[RC]\.\d+$/ || &quit("bad argument");
 $control= m/C/;
 $nn= $_;
-if (!rename("incoming/G$nn","incoming/P$nn")) 
-{      $_=$!.'';  m/no such file or directory/i && exit 0;
+if (!rename("incoming/G$nn","incoming/P$nn")) {
+    $_=$!.'';  m/no such file or directory/i && exit 0;
     &quit("renaming to lock: $!");
 }    
 
@@ -28,34 +36,83 @@ 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);
+# Bug numbers to send e-mail to, hash so that we don't send to the
+# same bug twice.
+my (%bug_affected);
+
+if ($entity and $entity->head->tags) {
+    @headerlines = @{$entity->head->header};
+    chomp @headerlines;
+
+    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) {
+    $_ = decode_rfc1522($_);
+    s/\n\s/ /g;
+    print ">$_<\n" if $debug;
+    if (s/^(\S+):\s*//) {
+       my $v = lc $1;
+       print ">$v=$_<\n" if $debug;
+       $header{$v} = $_;
+    } else {
+       print "!>$_<\n" if $debug;
+    }
+}
 
-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];
+# 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;
+       }
     }
-       print ">$_<\n" if $debug;
-    if (s/^(\S+):\s*//) 
-       {       $v= $1; $v =~ y/A-Z/a-z/;
-               print ">$v=$_<\n" if $debug;
-        $header{$v}= $_;
-    } else { print "!>$_<\n" if $debug; }
+    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'};
 }
 
 defined($header{'from'}) || &quit("no From header");
-delete $header{'reply-to'} if ( defined($header{'reply-to'}) && $header{'reply-to'} =~ m/^\s*$/ );
+
+delete $header{'reply-to'} 
+       if ( defined($header{'reply-to'}) && $header{'reply-to'} =~ m/^\s*$/ );
+
 if ( defined($header{'reply-to'}) && $header{'reply-to'} ne "" ) {
     $replyto = $header{'reply-to'};
 } else {
@@ -73,134 +130,103 @@ $mergelowstate= 'idle';
 $midix=0;    
 $extras="";
 
-#strip blank line(s) after header
-while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
+my $quickabort = 0;
 
-#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++; }
+my $fuckheads = "(" . join("|", @gFuckheads) . ")";
+if (@gFuckheads and $replyto =~ m/$fuckheads/) {
+       &transcript("This service is unavailable.\n\n");
+       $quickabort = 1;
 }
-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 = ();
+
+sub addbcc {
+    push @bcc, $_[0] unless grep { $_ eq $_[0] } @bcc;
+}
 
-for ($procline=$i; $procline<=$#msg; $procline++) 
-{      $state eq 'idle' || print "$state ?\n";
+for ($procline=0; $procline<=$#bodylines; $procline++) {
+    $state eq 'idle' || print "$state ?\n";
     $lowstate eq 'idle' || print "$lowstate ?\n";
     $mergelowstate eq 'idle' || print "$mergelowstate ?\n";
-    $_= $msg[$procline]; s/\s+$//;
-    next unless m/\S/; next if m/^\s*\#/;
+    if ($quickabort) {
+         &transcript("Stopping processing here.\n\n");
+        last;
+    }
+    $_= $bodylines[$procline]; s/\s+$//;
+    next unless m/\S/;
     &transcript("> $_\n");
+    next if m/^\s*\#/;
     $action= '';
-    if (m/^stop\s/i || m/^quit\s/i || m/^--/ || m/^thank/i) 
-       {       &transcript("Stopping processing here.\n\n");
+    if (m/^stop/i || m/^quit/i || m/^--/ || m/^thank/i) {
+       &transcript("Stopping processing here.\n\n");
         last;
     } elsif (m/^debug\s+(\d+)$/i && $1 >= 0 && $1 <= 1000) {
         $dl= $1+0;
         &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) {
-        $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) {
-        &sendlynxdoc("db/ix/full.html",'full index');
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index-summary\s+by-package$/i) {
-        &sendlynxdoc("db/ix/psummary.html",'summary index sorted by package/title');
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index-summary(\s+by-number)?$/i) {
-        &sendlynxdoc("db/ix/summary.html",'summary index sorted by number/date');
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index(\s+|-)pack(age)?s?$/i) {
-        &sendlynxdoc("db/ix/packages.html",'index of packages');
+       &sendlynxdoc("pkgindex.cgi?indexon=pkg",'index of packages');
     } elsif (m/^index(\s+|-)maints?$/i) {
-        &sendlynxdoc("db/ix/maintainers.html",'index of maintainers');
-    } elsif (m/^index(\s+|-)maint\s+(\S.*\S)$/i) {
-        $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");
-        }
+       &sendlynxdoc("pkgindex.cgi?indexon=maint",'index of maintainers');
+    } elsif (m/^index(\s+|-)maint\s+(\S+)$/i) {
+       $maint = $2;
+       &sendlynxdoc("pkgreport.cgi?maint=" . urlsanit($maint),
+                    "$gBug list for maintainer \`$maint'");
         $ok++;
     } elsif (m/^index(\s+|-)pack(age)?s?\s+(\S.*\S)$/i) {
-        $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");
-        }
+       $package = $+;
+       &sendlynxdoc("pkgreport.cgi?pkg=" . urlsanit($package),
+                    "$gBug list for package $package");
         $ok++;
     } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/i) {
-        &sendlynxdoc("db/ju/unmatched-1.html","junk (this week)");
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^send-unmatched\s+(last|-1)$/i) {
-        &sendlynxdoc("db/ju/unmatched-2.html","junk (last week)");
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^send-unmatched\s+(old|-2)$/i) {
-        &sendlynxdoc("db/ju/unmatched-3.html","junk (two weeks ago)");
-    } elsif (m/^getinfo\s+(\S+)$/i) {
-        $file= $1;
-        if ($file =~ m/^\./ || $file !~ m/^[-.0-9a-z]+$/ || $file =~ m/\.gz$/) {
-            &transcript("Filename $file is badly formatted.\n\n");
-        } elsif (open(P,"$gDocDir/$file")) {
-            $ok++;
-            &transcript("Info file $file appears below.\n\n");
-            $extras.= "\n---------- Info file $file follows:\n\n";
-            while(<P>) { $extras.= $_; }
-            close(P);
-        } else {
-            &transcript("Info file $file does not exist.\n\n");
-         }
-    } elsif (m/^help$/i) {
+       &transcript("This BTS function is currently disabled, sorry.\n\n");
+       $ok++; # well, it's not really ok, but it fixes #81224 :)
+    } elsif (m/^getinfo\s+([\w-.]+)$/i) {
+        # 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");
+       } elsif ($req =~ /^override\.(\w+)\.([\w-.]+)$/i) {
+           $req =~ s/.gz$//;
+           &sendinfo("ftp.d.o", "$req", "override file for $2 part of $1 distribution");
+       } elsif ($req =~ /^pseudo-packages\.(description|maintainers)$/i && -f "$gConfigDir/$req") {
+           &sendinfo("local", "$gConfigDir/$req", "$req file");
+       } else {
+           &transcript("Info file $req does not exist.\n\n");
+       }
+    } elsif (m/^help/i) {
         &sendhelp;
         &transcript("\n");
         $ok++;
-    } elsif (m/^refcard$/i) {
-        &sendtxthelp("bug-mailserver-refcard.txt","mailservers' reference card");
+    } elsif (m/^refcard/i) {
+        &sendtxthelp("bug-mailserver-refcard.txt","mail servers' reference card");
     } elsif (m/^subscribe/i) {
         &transcript(<<END);
 There is no $gProject $gBug mailing list.  If you wish to review bug reports
-please do so via http://$gWebUrl/ or ask this mailserver
+please do so via http://$gWebDomain/ or ask this mail server
 to send them to you.
 soon: MAILINGLISTS_TEXT
 END
@@ -219,71 +245,100 @@ END
             &transcript("Too many unknown commands, stopping here.\n\n");
             last;
         }
-    } elsif (m/^close\s+\#?(\d+)$/i) {
+#### interesting ones start here
+    } elsif (m/^close\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) {
        $ok++;
        $ref= $1;
+       $bug_affected{$ref}=1;
+       $version= $2;
        if (&setbug) {
-           if (length($s_done)) {
+           &transcript("'close' is deprecated; see http://$gWebDomain/Developer$gHTMLSuffix#closing.\n");
+           if (length($data->{done}) and not defined($version)) {
                &transcript("$gBug is already closed, cannot re-close.\n\n");
                 &nochangebug;
             } else {
-                $action= "$gBug closed, send any further explanations to $s_originator";
+                $action= "$gBug " .
+                    (defined($version) ?
+                        "marked as fixed in version $version" :
+                        "closed") .
+                    ", send any further explanations to $data->{originator}";
                 do {
-                    &addmaintainers($s_package);
+                    &addmaintainers($data);
                                        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;
+                    }
+                    addfixedversions($data, $data->{package}, $version, 'binary');
+
                    $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
+X-$gProject-PR-Message: they-closed-control $ref
 
 This is an automatic notification regarding your $gBug report
-#$ref: $s_subject.
+#$ref: $data->{subject},
+which was filed against the $data->{package} package.
 
 It has been marked as closed by one of the developers, namely
 $replyto.
 
 You should be hearing from them with a substantive response shortly,
-if you have not already done so.  If not, please contact them
-directly or myself.
+in case you haven't already. If not, please contact them directly.
 
 $gMaintainer
 (administrator, $gProject $gBugs database)
+
 END
-                    &sendmailmessage($message,$s_originator);
+                    &sendmailmessage($message,$data->{originator});
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^reassign\s+\#?(\d+)\s+(\S.*\S)$/i) {
+    } elsif (m/^reassign\s+\#?(-?\d+)\s+(\S+)(?:\s+(\d.*))?$/i) {
         $ok++;
         $ref= $1; $newpackage= $2;
+       $bug_affected{$ref}=1;
+        $version= $3;
        $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($newpackage);
-                $s_package= $newpackage;
+                &addmaintainers($data);
+                $data->{package}= $newpackage;
+                $data->{found_versions}= [];
+                $data->{fixed_versions}= [];
+                # TODO: what if $newpackage is a source package?
+                addfoundversions($data, $data->{package}, $version, 'binary');
+                &addmaintainers($data);
             } while (&getnextbug);
         }
-    } elsif (m/^reopen\s+\#?(\d+)$/i ? ($noriginator='', 1) :
-             m/^reopen\s+\#?(\d+)\s+\=$/i ? ($noriginator='', 1) :
-             m/^reopen\s+\#?(\d+)\s+\!$/i ? ($noriginator=$replyto, 1) :
-             m/^reopen\s+\#?(\d+)\s+(\S.*\S)$/i ? ($noriginator=$2, 1) : 0) {
+    } elsif (m/^reopen\s+\#?(-?\d+)$/i ? ($noriginator='', 1) :
+             m/^reopen\s+\#?(-?\d+)\s+\=$/i ? ($noriginator='', 1) :
+             m/^reopen\s+\#?(-?\d+)\s+\!$/i ? ($noriginator=$replyto, 1) :
+             m/^reopen\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($noriginator=$2, 1) : 0) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         if (&setbug) {
-            if (!length($s_done)) {
+            if (@{$data->{fixed_versions}}) {
+                &transcript("'reopen' is deprecated when a bug has been closed with a version;\nuse 'found' or 'submitter' as appropriate instead.\n");
+            }
+            if (!length($data->{done})) {
                 &transcript("$gBug is already open, cannot reopen.\n\n");
                 &nochangebug;
             } else {
@@ -291,138 +346,434 @@ 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);
+                    $data->{originator}= $noriginator eq '' ?  $data->{originator} : $noriginator;
+                    $data->{fixed_versions}= [];
+                    $data->{done}= '';
+                } while (&getnextbug);
+            }
+        }
+    } elsif (m/^found\s+\#?(-?\d+)(?:\s+(\d.*))?$/i) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            if (!length($data->{done}) and not defined($version)) {
+                &transcript("$gBug is already open, cannot reopen.\n\n");
+                &nochangebug;
+            } else {
+                $action=
+                    defined($version) ?
+                        "$gBug marked as found in version $version." :
+                        "$gBug reopened.";
+                do {
+                    &addmaintainers($data);
+                    # The 'done' field gets a bit weird with version
+                    # tracking, because a bug may be closed by multiple
+                    # people in different branches. Until we have something
+                    # more flexible, we set it every time a bug is fixed,
+                    # and clear it precisely when a found command is
+                    # received for the rightmost fixed-in version, which
+                    # equates to the most recent fixing of the bug, or when
+                    # a versionless found command is received.
+                    if (defined $version) {
+                        my $lastfixed =
+                            (reverse @{$data->{fixed_versions}})[0];
+                        # TODO: what if $data->{package} is a source package?
+                        addfoundversions($data, $data->{package}, $version, 'binary');
+                        if (defined $lastfixed and not grep { $_ eq $lastfixed } @{$data->{fixed_versions}}) {
+                            $data->{done} = '';
+                        }
+                    } else {
+                        # Versionless found; assume old-style "not fixed at
+                        # all".
+                        $data->{fixed_versions} = [];
+                        $data->{done} = '';
+                    }
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^forwarded\s+\#?(\d+)\s+(\S.*\S)$/i) {
+    } elsif (m/^notfound\s+\#?(-?\d+)\s+(\d.*)$/i) {
+        $ok++;
+        $ref= $1;
+        $version= $2;
+        if (&setbug) {
+            $action= "$gBug marked as not found in version $version.";
+            if (length($data->{done})) {
+                $extramessage= "(By the way, this $gBug is currently marked as done.)\n";
+            }
+            do {
+                &addmaintainers($data);
+                removefoundversions($data, $data->{package}, $version, 'binary');
+            } 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;
+       $bug_affected{$ref}=1;
+        if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
+            $ref = $clonebugs{$ref};
+        }
+        if (&getbug) {
+            if (&checkpkglimit) {
+                &foundbug;
+                &addmaintainers($data);
+                $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
+X-$gProject-PR-Message: submitter-changed $ref
+
+The submitter address recorded for your $gBug report
+#$ref: $data->{subject}
+has been changed.
+
+The old submitter address for this report was
+$oldsubmitter.
+The new submitter address 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 {
+                &cancelbug;
+            }
+        } else {
+            &notfoundbug;
+        }
+    } elsif (m/^forwarded\s+\#?(-?\d+)\s+(\S.*\S)$/i) {
         $ok++;
         $ref= $1; $whereto= $2;
+       $bug_affected{$ref}=1;
         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);
-                               if (length($gFowardList)>0 && length($gListDomain)>0 )
-                { &addccaddress("$gFowardList\@$gListDomain"); }
-                $s_forwarded= $whereto;
+                &addmaintainers($data);
+               if (length($gForwardList)>0 && length($gListDomain)>0 ) {
+                    &addccaddress("$gForwardList\@$gListDomain"); 
+               }
+                $data->{forwarded}= $whereto;
             } while (&getnextbug);
         }
-    } elsif (m/^notforwarded\s+\#?(\d+)$/i) {
+    } elsif (m/^notforwarded\s+\#?(-?\d+)$/i) {
         $ok++;
         $ref= $1;
+       $bug_affected{$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);
+                    $data->{forwarded}= '';
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^severity\s+\#?(\d+)\s+([-0-9a-z]+)$/i ||
-       m/^priority\s+\#?(\d+)\s+([-0-9a-z]+)$/i) {
+    } elsif (m/^severity\s+\#?(-?\d+)\s+([-0-9a-z]+)$/i ||
+       m/^priority\s+\#?(-?\d+)\s+([-0-9a-z]+)$/i) {
         $ok++;
         $ref= $1;
+       $bug_affected{$ref}=1;
         $newseverity= $2;
-        if (!grep($_ eq $newseverity, @severities, "$gDefaultSeverity")) {
+        if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) {
             &transcript("Severity level \`$newseverity' is not known.\n".
-                       "Recognised are: ".join(' ',@showseverities).".\n\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'.";
+           $action= "Severity set to \`$newseverity' from \`$printseverity'";
            do {
-                &addmaintainers($s_package);
-                $s_severity= $newseverity;
+                &addmaintainers($data);
+                if (defined $gStrongList and isstrongseverity($newseverity)) {
+                    addbcc("$gStrongList\@$gListDomain");
+                }
+                $data->{severity}= $newseverity;
             } while (&getnextbug);
         }
-    } elsif (m/^retitle\s+\#?(\d+)\s+(\S.*\S)\s*$/i) {
+    } elsif (m/^tags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) {
+       $ok++;
+       $ref = $1; $addsubcode = $3; $tags = $4;
+       $bug_affected{$ref}=1;
+       $addsub = "add";
+       if (defined $addsubcode) {
+           $addsub = "sub" if ($addsubcode eq "-");
+           $addsub = "add" if ($addsubcode eq "+");
+           $addsub = "set" if ($addsubcode eq "=");
+       }
+       my @okaytags = ();
+       my @badtags = ();
+       foreach my $t (split /[\s,]+/, $tags) {
+           if (!grep($_ eq $t, @gTags)) {
+               push @badtags, $t;
+           } else {
+               push @okaytags, $t;
+           }
+       }
+       if (@badtags) {
+            &transcript("Unknown tag/s: ".join(', ', @badtags).".\n".
+                       "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") {
+               $action= "Tags added: " . join(", ", @okaytags);
+           } elsif ($addsub eq "sub") {
+               $action= "Tags removed: " . join(", ", @okaytags);
+           }
+           do {
+                &addmaintainers($data);
+               $data->{keywords} = '' if ($addsub eq "set");
+               # Allow removing obsolete tags.
+               if ($addsub eq "sub") {
+                   foreach my $t (@badtags) {
+                       $data->{keywords} = join ' ', grep $_ ne $t, 
+                           split ' ', $data->{keywords};
+                   }
+               }
+               # Now process all other additions and subtractions.
+               foreach my $t (@okaytags) {
+                   $data->{keywords} = join ' ', grep $_ ne $t, 
+                       split ' ', $data->{keywords};
+                   $data->{keywords} = "$t $data->{keywords}" unless($addsub eq "sub");
+               }
+               $data->{keywords} =~ s/\s*$//;
+            } while (&getnextbug);
+       }
+    } elsif (m/^retitle\s+\#?(-?\d+)\s+(\S.*\S)\s*$/i) {
         $ok++;
         $ref= $1; $newtitle= $2;
+       $bug_affected{$ref}=1;
+       if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
+           $ref = $clonebugs{$ref};
+       }
         if (&getbug) {
-            &foundbug;
-            &addmaintainers($s_package);
-            $s_subject= $newtitle;
-            $action= "Changed $gBug title.";
-            &savebug;
-            &transcript("$action\n");
-            if (length($s_done)) {
-                &transcript("(By the way, that $gBug is currently marked as done.)\n");
+            if (&checkpkglimit) {
+                &foundbug;
+                &addmaintainers($data);
+                $data->{subject}= $newtitle;
+                $action= "Changed $gBug title.";
+                &savebug;
+                &transcript("$action\n");
+                if (length($data->{done})) {
+                    &transcript("(By the way, that $gBug is currently marked as done.)\n");
+                }
+                &transcript("\n");
+            } else {
+                &cancelbug;
             }
-            &transcript("\n");
         } else {
             &notfoundbug;
         }
-    } elsif (m/^unmerge\s+\#?(\d+)$/i) {
+    } elsif (m/^unmerge\s+\#?(-?\d+)$/i) {
        $ok++;
        $ref= $1;
+       $bug_affected{$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;
+               @bug_affected{@newmergelist} = 1 x @newmergelist;
                 do {
-                    &addmaintainers($s_package);
-                   $s_mergedwith= ($ref == $discref) ? ''
+                    &addmaintainers($data);
+                   $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);
+        @tomerge= sort { $a <=> $b } split(/\s+#?/,$1);
         @newmergelist= ();
+       my %tags = ();
+       my %found = ();
+       my %fixed = ();
         &getmerge;
         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 }
+            if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; }
             &foundbug;
-            &transcript("D| adding $ref ($s_mergewith)\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');
+           &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');
+           &checkmatch('owner','m_owner',$data->{owner});
+           foreach my $t (split /\s+/, $data->{keywords}) { $tags{$t} = 1; }
+           foreach my $f (@{$data->{found_versions}}) { $found{$f} = 1; }
+           foreach my $f (@{$data->{fixed_versions}}) { $fixed{$f} = 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) {
             @newmergelist= sort { $a <=> $b } @newmergelist;
             $action= "Merged @newmergelist.";
+           delete @fixed{keys %found};
            for $ref (@newmergelist) {
                &getbug || die "huh ?  $gBug $ref disappeared during merge";
-                &addmaintainers($s_package);
-               $s_mergedwith= join(' ',grep($_ ne $ref,@newmergelist));
+                &addmaintainers($data);
+               @bug_affected{@newmergelist} = 1 x @newmergelist;
+               $data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
+               $data->{keywords}= join(' ', keys %tags);
+               $data->{found_versions}= [sort keys %found];
+               $data->{fixed_versions}= [sort keys %fixed];
                &savebug;
            }
            &transcript("$action\n\n");
        }
         &endmerge;
+    } elsif (m/^clone\s+#?(\d+)\s+((-\d+\s+)*-\d+)\s*$/i) {
+       $ok++;
+
+       $origref = $1;
+       @newclonedids = split /\s+/, $2;
+       $newbugsneeded = scalar(@newclonedids);
+
+       $ref = $origref;
+       $bug_affected{$ref} = 1;
+       if (&setbug) {
+           if (length($data->{mergedwith})) {
+               &transcript("$gBug is marked as being merged with others.\n\n");
+               &nochangebug;
+           } else {
+               &filelock("nextnumber.lock");
+               open(N,"nextnumber") || &quit("nextnumber: read: $!");
+               $v=<N>; $v =~ s/\n$// || &quit("nextnumber bad format");
+               $firstref= $v+0;  $v += $newbugsneeded;
+               open(NN,">nextnumber"); print NN "$v\n"; close(NN);
+               &unfilelock;
+
+               $lastref = $firstref + $newbugsneeded - 1;
+
+               if ($newbugsneeded == 1) {
+                   $action= "$gBug $origref cloned as bug $firstref.";
+               } else {
+                   $action= "$gBug $origref cloned as bugs $firstref-$lastref.";
+               }
+               &getnextbug;
+               my $ohash = get_hashname($origref);
+               $ref = $firstref;
+               @bug_affected{@newclonedids} = 1 x @newclonedids;
+               for $newclonedid (@newclonedids) {
+                   $clonebugs{$newclonedid} = $ref;
+           
+                   my $hash = get_hashname($ref);
+                   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.summary", "db-h/$hash/$ref.summary");
+                   copy("db-h/$ohash/$origref.report", "db-h/$hash/$ref.report");
+                   &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");
+       }
+    } elsif (m/^owner\s+\#?(-?\d+)\s+!$/i ? ($newowner = $replyto, 1) :
+             m/^owner\s+\#?(-?\d+)\s+(\S.*\S)$/i ? ($newowner = $2, 1) : 0) {
+        $ok++;
+        $ref = $1;
+       $bug_affected{$ref} = 1;
+        if (&setbug) {
+            if (length $data->{owner}) {
+                $action = "Owner changed from $data->{owner} to $newowner.";
+            } else {
+                $action = "Owner recorded as $newowner.";
+            }
+            if (length $data->{done}) {
+                $extramessage = "(By the way, this $gBug is currently " .
+                                "marked as done.)\n";
+            }
+            do {
+                &addmaintainers($data);
+                $data->{owner} = $newowner;
+            } while (&getnextbug);
+        }
+    } elsif (m/^noowner\s+\#?(-?\d+)$/i) {
+        $ok++;
+        $ref = $1;
+       $bug_affected{$ref} = 1;
+        if (&setbug) {
+            if (length $data->{owner}) {
+                $action = "Removed annotation that $gBug was owned by " .
+                          "$data->{owner}.";
+                do {
+                    &addmaintainers($data);
+                    $data->{owner} = '';
+                } while (&getnextbug);
+            } else {
+                &transcript("$gBug is not marked as having an owner.\n\n");
+                &nochangebug;
+            }
+        }
     } else {
         &transcript("Unknown command or malformed arguments to command.\n\n");
         if (++$unknowns >= 5) {
@@ -431,10 +782,10 @@ END
         }
     }
 }
-if ($procline>$#msg) {
+if ($procline>$#bodylines) {
     &transcript(">\nEnd of message, stopping processing here.\n\n");
 }
-if (!$ok) {
+if (!$ok && !quickabort) {
     &transcript("No commands successfully parsed; sending the help text(s).\n");
     &sendhelp;
     &transcript("\n");
@@ -454,13 +805,26 @@ for $maint (keys %maintccreasons) {
         $reasonstring.= $p.' ' if length($p);
         $reasonstring.= join(' ',map("#$_",sort keys %{$$reasonsref{$p}}));
     }
+    if (length($reasonstring) > 40) {
+       (substr $reasonstring, 37) = "...";
+    }
+    $reasonstring = "" if (!defined($reasonstring));
     push(@maintccs,"$maint ($reasonstring)");
     push(@maintccaddrs,"$maint");
 }
+
+$maintccs = ""; 
 if (@maintccs) {
     &transcript("MC|@maintccs|\n") if $dl>2;
-    $maintccs= "Cc: ".join(",\n    ",@maintccs)."\n";
-} else { $maintccs = ""; }
+    $maintccs .= "Cc: " . join(",\n    ",@maintccs) . "\n";
+}
+
+# Add Bcc's to subscribed bugs
+push @bcc, map {"bugs=$_\@$gListDomain"} keys %bug_affected;
+
+if (!defined $header{'subject'} || $header{'subject'} eq "") {
+  $header{'subject'} = "your mail";
+}
 
 $reply= <<END;
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
@@ -469,6 +833,8 @@ ${maintccs}Subject: Processed: $header{'subject'}
 In-Reply-To: $header{'message-id'}
 References: $header{'message-id'}
 Message-ID: <handler.s.$nn.transcript\@$gEmailDomain>
+Precedence: bulk
+X-$gProject-PR-Message: transcript
 
 ${transcript}Please contact me if you need assistance.
 
@@ -479,7 +845,7 @@ END
 
 $repliedshow= join(', ',$replyto,@maintccaddrs);
 &filelock("lock/-1");
-open(AP,">>db/-1.log") || &quit("open db/-1.log: $!");
+open(AP,">>db-h/-1.log") || &quit("open db-h/-1.log: $!");
 print(AP
       "\2\n$repliedshow\n\5\n$reply\n\3\n".
       "\6\n".
@@ -487,28 +853,30 @@ print(AP
       &sani($header{'from'})."</code>\n".
       "to <code>".&sani($controlrequestaddr)."</code>\n".
       "\3\n".
-      "\7\n",@log,"\n\3\n") || &quit("writing db/-1.log: $!");
-close(AP) || &quit("open db/-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");
+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;
+    # The original message received is written out above, so before
+    # writing out the other messages we've sent out, we need to
+    # RFC1522 encode the header.
+    my ($header,$body) = split /\n\n/, $message, 2;
+    $header = encode_rfc1522($header);
+    $message = $header . qq(\n\n). $body;
+
     print "mailing to >@recips<\n" if $debug;
     $c= open(D,"|-");
     defined($c) || &quit("mailing forking for sendmail: $!");
     if (!$c) { # ie, we are the child process
-        exec '/usr/lib/sendmail','-f'."$gMaintainerEmail",'-odi','-oem','-oi',get_addresses(@recips);
+        exec '/usr/lib/sendmail','-f'."$gMaintainerEmail",'-odb','-oem','-oi',get_addresses(@recips);
         die $!;
     }
     print(D $message) || &quit("writing to sendmail process: $!");
@@ -545,6 +913,14 @@ sub checkmatch {
     }
 }
 
+sub checkpkglimit {
+    if (keys %limit_pkgs and not defined $limit_pkgs{$data->{package}}) {
+        &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n");
+        return 0;
+    }
+    return 1;
+}
+
 # High-level bug manipulation calls
 # Do announcements themselves
 #
@@ -572,13 +948,27 @@ sub nochangebug {
 
 sub setbug {
     &dlen("setbug $ref");
+    if ($ref =~ m/^-\d+/) {
+        if (!defined $clonebugs{$ref}) {
+            &notfoundbug;
+            &dlex("setbug => noclone");
+            return 0;
+        }
+        $ref = $clonebugs{$ref};
+    }
     $state eq 'idle' || die "$state ?";
     if (!&getbug) {
         &notfoundbug;
         &dlex("setbug => 0s");
         return 0;
     }
-    @thisbugmergelist= split(/ /,$s_mergedwith);
+
+    if (!&checkpkglimit) {
+        &cancelbug;
+        return 0;
+    }
+
+    @thisbugmergelist= split(/ /,$data->{mergedwith});
     if (!@thisbugmergelist) {
         &foundbug;
         $manybugs= 0;
@@ -640,7 +1030,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");
@@ -661,7 +1051,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");
@@ -686,31 +1076,17 @@ sub savebug {
     $lowstate eq 'open' || die "$lowstate ?";
     length($action) || die;
     $ref == $sref || die "read $sref but saving $ref ?";
-    open(L,">>db/$ref.log") || &quit("opening db/$ref.log: $!");
+    my $hash = get_hashname($ref);
+    open(L,">>db-h/$hash/$ref.log") || &quit("opening db-h/$hash/$ref.log: $!");
     print(L
           "\6\n".
           "<strong>".&sani($action)."</strong>\n".
           "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/$ref.log: $!");
-    close(L) || &quit("closing db/$ref.log: $!");
-    open(S,">db/$ref.status.new") || &quit("opening db/$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/$ref.status.new: $!");
-    close(S) || &quit("closing db/$ref.status.new: $!");
-    rename("db/$ref.status.new","db/$ref.status") ||
-        &quit("installing new db/$ref.status: $!");
-    &unfilelock;
+          "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log: $!");
+    close(L) || &quit("closing db-h/$hash/$ref.log: $!");
+    unlockwritebug($ref, $data);
     $lowstate= "idle";
     &dlex("savebug");
 }
@@ -730,6 +1106,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");
@@ -756,6 +1141,8 @@ 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
+X-$gProject-PR-Message: doc-text $relpath
 
 END
     $ok++;
@@ -764,7 +1151,7 @@ END
 sub sendlynxdocraw {
     local ($relpath,$description) = @_;
     $doc='';
-    open(L,"lynx -nolist -dump http://$gWebDomain/$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/) {
@@ -782,6 +1169,8 @@ 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
+X-$gProject-PR-Message: doc-html $relpath
 
 END
          $ok++;
@@ -793,21 +1182,47 @@ sub addccaddress {
     $maintccreasons{$cca}{''}{$ref}= 1;
 }
 
-sub addmaintainers 
-{      # Data structure is:
+sub addmaintainers {
+    # Data structure is:
     #   maintainer email address &c -> assoc of packages -> assoc of bug#'s
-    my ($p, $addmaint, $pshow);
+    my $data = shift;
+    my ($p, $addmaint);
     &ensuremaintainersloaded;
     $anymaintfound=0; $anymaintnotfound=0;
-    for $p (split(m/[ \t?,()]+/,$_[0])) 
-       {       $p =~ y/A-Z/a-z/;
-        $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : '');
-        if (defined($maintainerof{$p})) 
-               {       $addmaint= $maintainerof{$p};
-                       &transcript("MR|$addmaint|$p|$ref|\n") if $dl>2;
+    for $p (split(m/[ \t?,():]+/, $data->{package})) {
+       $p =~ y/A-Z/a-z/;
+       $p =~ /([a-z0-9.+-]+)/;
+       $p = $1;
+       next unless defined $p;
+       if (defined $gSubscriptionDomain) {
+           if (defined($pkgsrc{$p})) {
+               addbcc("$pkgsrc{$p}\@$gSubscriptionDomain");
+           } else {
+               addbcc("$p\@$gSubscriptionDomain");
+           }
+       }
+        if (defined $data->{severity} and defined $gStrongList and
+                isstrongseverity($data->{severity})) {
+            addbcc("$gStrongList\@$gListDomain");
+        }
+        if (defined($maintainerof{$p})) {
+           $addmaint= $maintainerof{$p};
+           &transcript("MR|$addmaint|$p|$ref|\n") if $dl>2;
             $maintccreasons{$addmaint}{$p}{$ref}= 1;
-                       print "maintainer add >$p|$addmaint<\n" if $debug;
-        } else { print "maintainer none >$p<\n" if $debug; }
+           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;
+       }
+    }
+
+    if (length $data->{owner}) {
+        $addmaint = $data->{owner};
+        &transcript("MO|$addmaint|$data->{package}|$ref|\n") if $dl>2;
+        $maintccreasons{$addmaint}{$data->{package}}{$ref} = 1;
+        print "owner add >$data->{package}|$addmaint<\n" if $debug;
     }
 }
 
@@ -818,9 +1233,63 @@ sub ensuremaintainersloaded {
     while (<MAINT>) {
        m/^\n$/ && next;
        m/^\s*$/ && next;
-        m/^(\S+)\s+(\S.*\S)\n$/ || &quit("maintainers bogus \`$_'");
+        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \`$_'");
         $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
         $maintainerof{$1}= $2;
     }
     close(MAINT);
+    open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!");
+    while (<MAINT>) {
+        m/^\n$/ && next;
+        m/^\s*$/ && next;
+        m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers.override bogus \`$_'");
+        $a= $1; $b= $2; $a =~ y/A-Z/a-z/;
+        $maintainerof{$1}= $2;
+    }
+
+    open(SOURCES, "$gPackageSource") || &quit("pkgsrc open: $!");
+    while (<SOURCES>) {
+       next unless m/^(\S+)\s+\S+\s+(\S.*\S)\s*$/;
+       my ($a, $b) = ($1, $2);
+       $pkgsrc{lc($a)} = $b;
+    }
+    close(SOURCES);
+}
+
+sub sendinfo {
+    local ($wherefrom,$path,$description) = @_;
+    if ($wherefrom eq "ftp.d.o") {
+      $doc = `lynx -nolist -dump http://ftp.debian.org/debian/indices/$path.gz 2>&1 | gunzip -cf` or &quit("fork for lynx/gunzip: $!");
+      $! = 0;
+      if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {
+          &transcript("$description is not available.\n");
+          $ok++; return;
+      } elsif ($?) {
+          &transcript("Error getting $description (code $? $!):\n$doc\n");
+          return;
+      }
+    } elsif ($wherefrom eq "local") {
+      open P, "$path";
+      $doc = do { local $/; <P> };
+      close P;
+    } else {
+      &transcript("internal errror: info files location unknown.\n");
+      $ok++; return;
+    }
+    &transcript("Sending $description.\n");
+    &sendmailmessage(<<END.$doc,$replyto);
+From: $gMaintainerEmail ($gProject $gBug Tracking System)
+To: $replyto
+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
+X-$gProject-PR-Message: getinfo
+
+$description follows:
+
+END
+    $ok++;
+    &transcript("\n");
 }