X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice.in;h=4d0b4645451074c64484a1ee0e6af84e149ba5b1;hb=3497c056fedd69c6d9ca238729efb043bf37f327;hp=61dde9ddd28a324ee47a2d872563936357b4d5fb;hpb=f45bcdd71adfd8b13b874216bdec43958e439f96;p=debbugs.git diff --git a/scripts/service.in b/scripts/service.in index 61dde9d..4d0b464 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,15 +1,17 @@ #!/usr/bin/perl -# $Id: service.in,v 1.52 2002/09/25 17:19:34 cjwatson Exp $ -# ^ more or less ^ +# $Id: service.in,v 1.118 2005/10/19 01:22:14 don Exp $ # # Usage: service .nn # Temps: incoming/P.nn -use Mail::Address; use File::Copy; +use MIME::Parser; +use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522); +use Debbugs::Mail qw(send_mail_message); +use Debbugs::User; -$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 +38,74 @@ 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= <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); -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]; +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*//) { - $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'}; } @@ -79,6 +121,8 @@ if ( defined($header{'reply-to'}) && $header{'reply-to'} ne "" ) { $replyto = $header{'from'}; } +# This is an error counter which should be incremented every time there is an error. +my $errors = 0; $controlrequestaddr= $control ? "control\@$gEmailDomain" : "request\@$gEmailDomain"; $transcript=''; &transcript("Processing commands for $controlrequestaddr:\n\n"); @@ -90,8 +134,12 @@ $mergelowstate= 'idle'; $midix=0; $extras=""; -#strip blank line(s) after header -while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; } +my $user = $replyto; +$user =~ s/,.*//; +$user =~ s/^.*<(.*)>.*$/$1/; +$user =~ s/[(].*[)]//; +$user =~ s/^\s*(\S+)\s+.*$/$1/; +$user = "" unless (Debbugs::User::is_valid_user($user)); my $quickabort = 0; @@ -101,24 +149,15 @@ 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++) { +sub addbcc { + push @bcc, $_[0] unless grep { $_ eq $_[0] } @bcc; +} + +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,11 +165,12 @@ 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) { + if (m/^stop\s*$/i || m/^quit\s*$/i || m/^--\s*$/ || m/^thank(?:s|\s*you)?\s*$/i || m/^kthxbye\s*$/i) { &transcript("Stopping processing here.\n\n"); last; } elsif (m/^debug\s+(\d+)$/i && $1 >= 0 && $1 <= 1000) { @@ -138,115 +178,51 @@ 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"); + $errors++; $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"); + $errors++; $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"); + $errors++; $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"); + $errors++; $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"); + $errors++; $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"); + $errors++; $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"); @@ -276,44 +252,194 @@ END soon: UNSUBSCRIBE_TEXT soon: MAILINGLISTS_TEXT END + } elsif (m/^user\s+(\S+)\s*$/i) { + my $newuser = $1; + if (Debbugs::User::is_valid_user($newuser)) { + my $olduser = ($user ne "" ? " (was $user)" : ""); + &transcript("Setting user to $newuser$olduser.\n"); + $user = $newuser; + } else { + &transcript("Selected user id ($newuser) invalid, sorry\n"); + $errors++; + $user = ""; + } + } elsif (m/^usercategory\s+(\S+)(\s+\[hidden\])?\s*$/i) { + $ok++; + my $catname = $1; + my $hidden = ($2 ne ""); + + my $prefix = ""; + my @cats; + my $bad = 0; + my $catsec = 0; + while (++$procline <= $#bodylines) { + unless ($bodylines[$procline] =~ m/^\s*([*+])\s*(\S.*)$/) { + $procline--; + last; + } + &transcript("> $bodylines[$procline]\n"); + next if $bad; + my ($o, $txt) = ($1, $2); + if ($#cats == -1 && $o eq "+") { + &transcript("User defined category specification must start with a category name. Skipping.\n\n"); + $errors++; + $bad = 1; + next; + } + if ($o eq "+") { + unless (ref($cats[-1]) eq "HASH") { + $cats[-1] = { "nam" => $cats[-1], + "pri" => [], "ttl" => [] }; + } + $catsec++; + my ($desc, $ord, $op); + if ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?\]\s*$/) { + $desc = $1; $ord = $3; $op = ""; + } elsif ($txt =~ m/^(.*\S)\s*\[((\d+):\s*)?(\S+)\]\s*$/) { + $desc = $1; $ord = $3; $op = $4; + } elsif ($txt =~ m/^([^[\s]+)\s*$/) { + $desc = ""; $op = $1; + } else { + &transcript("Unrecognised syntax for category section. Skipping.\n\n"); + $errors++; + $bad = 1; + next; + } + $ord = 999 unless defined $ord; + + if ($op) { + push @{$cats[-1]->{"pri"}}, $prefix . $op; + push @{$cats[-1]->{"ttl"}}, $desc; + push @ords, "$ord $catsec"; + } else { + @cats[-1]->{"def"} = $desc; + push @ords, "$ord DEF"; + $catsec--; + } + @ords = sort { my ($a1, $a2, $b1, $b2) = split / /, "$a $b"; + $a1 <=> $b1 || $a2 <=> $b2; } @ords; + $cats[-1]->{"ord"} = [map { m/^.* (\S+)/; $1 eq "DEF" ? $catsec + 1 : $1 } @ords]; + } elsif ($o eq "*") { + $catsec = 0; + my ($name); + if ($txt =~ m/^(.*\S)(\s*\[(\S+)\])\s*$/) { + $name = $1; $prefix = $3; + } else { + $name = $txt; $prefix = ""; + } + push @cats, $name; + } + } + # XXX: got @cats, now do something with it + my $u = Debbugs::User::get_user($user); + if (@cats) { + &transcript("Added usercategory $catname.\n\n"); + $u->{"categories"}->{$catname} = [ @cats ]; + } else { + &transcript("Removed usercategory $catname.\n\n"); + delete $u->{"categories"}->{$catname}; + } + $u->write(); + } elsif (m/^usertags?\s+\#?(-?\d+)\s+(([=+-])\s*)?(\S.*)?$/i) { + $ok++; + $ref = $1; $addsubcode = $3 || "+"; $tags = $4; + if ($user eq "") { + &transcript("No valid user selected\n"); + $errors++; + } elsif (&setbug) { + &nochangebug; + my %ut; + Debbugs::User::read_usertags(\%ut, $user); + my @oldtags = (); my @newtags = (); my @badtags = (); + my %chtags; + for my $t (split /[,\s]+/, $tags) { + if ($t =~ m/^[a-zA-Z0-9.+\@-]+$/) { + $chtags{$t} = 1; + } else { + push @badtags, $t; + } + } + if (@badtags) { + &transcript("Ignoring illegal tag/s: ".join(', ', @badtags).".\nPlease use only alphanumerics, at, dot, plus and dash.\n"); + $errors++; + } + for my $t (keys %chtags) { + $ut{$t} = [] unless defined $ut{$t}; + } + for my $t (keys %ut) { + my %res = map { ($_, 1) } @{$ut{$t}}; + push @oldtags, $t if defined $res{$ref}; + my $addop = ($addsubcode eq "+" or $addsubcode eq "="); + my $del = (defined $chtags{$t} ? $addsubcode eq "-" + : $addsubcode eq "="); + $res{$ref} = 1 if ($addop && defined $chtags{$t}); + delete $res{$ref} if ($del); + push @newtags, $t if defined $res{$ref}; + $ut{$t} = [ sort { $a <=> $b } (keys %res) ]; + } + if (@oldtags == 0) { + &transcript("There were no usertags set.\n"); + } else { + &transcript("Usertags were: " . join(" ", @oldtags) . ".\n"); + } + &transcript("Usertags are now: " . join(" ", @newtags) . ".\n"); + Debbugs::User::write_usertags(\%ut, $user); + } } elsif (!$control) { &transcript(<= 3) { &transcript("Too many unknown commands, stopping here.\n\n"); last; } -#### interesting ones start here - } elsif (m/^close\s+\#?(-?\d+)$/i) { +#### "developer only" 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= <{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 +X-$gProject-PR-Message: they-closed-control $ref 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,25 +451,31 @@ $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) : @@ -352,8 +484,12 @@ END 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 { @@ -361,44 +497,157 @@ 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"); + $errors++; + &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 = $data->{fixed_versions}[-1]; + # 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/^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= <{msgid} +In-Reply-To: $data->{msgid} +Message-ID: +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 { + ¬foundbug; + } } 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"); + &addmaintainers($data); + if (length($gForwardList)>0 && length($gListDomain)>0 ) { + &addccaddress("$gForwardList\@$gListDomain"); } - $s_forwarded= $whereto; + $data->{forwarded}= $whereto; } while (&getnextbug); } } 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); } } @@ -406,22 +655,32 @@ END m/^priority\s+\#?(-?\d+)\s+([-0-9a-z]+)$/i) { $ok++; $ref= $1; + $bug_affected{$ref}=1; $newseverity= $2; if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) { &transcript("Severity level \`$newseverity' is not known.\n". "Recognized are: $gShowSeverities.\n\n"); + $errors++; + } elsif (exists $gObsoleteSeverities{$newseverity}) { + &transcript("Severity level \`$newseverity' is obsolete. " . + "Use $gObsoleteSeverities{$newseverity} instead.\n\n"); + $errors++; } 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/^tags?\s+\#?(-?\d+)\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 "-"); @@ -440,8 +699,14 @@ END if (@badtags) { &transcript("Unknown tag/s: ".join(', ', @badtags).".\n". "Recognized are: ".join(' ', @gTags).".\n\n"); + $errors++; } 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,98 +715,289 @@ END $action= "Tags removed: " . join(", ", @okaytags); } do { - &addmaintainers($s_package); - $s_keywords = '' if ($addsub eq "set"); + &addmaintainers($data); + $data->{keywords} = '' if ($addsub eq "set"); + # Allow removing obsolete tags. 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}; } } + # Now process all other additions and subtractions. 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"); + } + $data->{keywords} =~ s/\s*$//; + } while (&getnextbug); + } + } elsif (m/^(un)?block\s+\#?(-?\d+)\s+(by|with)\s+\s*(\S.*)?$/i) { + $ok++; + my $bugnum = $2; my $blockers = $4; + $addsub = "add"; + $addsub = "sub" if ($1 eq "un"); + if ($bugnum =~ m/^-\d+$/ && defined $clonebugs{$bugnum}) { + $bugnum = $clonebugs{$bugnum}; + } + + my @okayblockers; + my @badblockers; + foreach my $b (split /[\s,]+/, $blockers) { + $b=~s/^\#//; + if ($b=~/[0-9]+/) { + $ref=$b; + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + if (&getbug) { + push @okayblockers, $ref; + + # add to the list all bugs that are merged with $b, + # because all of their data must be kept in sync + @thisbugmergelist= split(/ /,$data->{mergedwith}); + &cancelbug; + + foreach $ref (@thisbugmergelist) { + if (&getbug) { + push @okayblockers, $ref; + &cancelbug; + } + } + } + else { + ¬foundbug; + push @badblockers, $ref; + } + } + else { + push @badblockers, $b; + } + } + if (@badblockers) { + &transcript("Unknown blocking bug/s: ".join(', ', @badblockers).".\n"); + $errors++; + } + + $ref=$bugnum; + if (&setbug) { + if ($data->{blockedby} eq '') { + &transcript("Was not blocked by any bugs.\n"); + } else { + &transcript("Was blocked by: $data->{blockedby}\n"); + } + if ($addsub eq "set") { + $action= "Blocking bugs of $bugnum set to: " . join(", ", @okayblockers); + } elsif ($addsub eq "add") { + $action= "Blocking bugs of $bugnum added: " . join(", ", @okayblockers); + } elsif ($addsub eq "sub") { + $action= "Blocking bugs of $bugnum removed: " . join(", ", @okayblockers); + } + my %removedblocks; + my %addedblocks; + do { + &addmaintainers($data); + my @oldblockerlist = split ' ', $data->{blockedby}; + $data->{blockedby} = '' if ($addsub eq "set"); + foreach my $b (@okayblockers) { + $data->{blockedby} = manipset($data->{blockedby}, $b, + ($addsub ne "sub")); } - $s_keywords =~ s/\s*$//; + + foreach my $b (@oldblockerlist) { + if (! grep { $_ eq $b } split ' ', $data->{blockedby}) { + push @{$removedblocks{$b}}, $ref; + } + } + foreach my $b (split ' ', $data->{blockedby}) { + if (! grep { $_ eq $b } @oldblockerlist) { + push @{$addedblocks{$b}}, $ref; + } + } } while (&getnextbug); + + # Now that the blockedby data is updated, change blocks data + # to match the changes. + foreach $ref (keys %addedblocks) { + if (&getbug) { + foreach my $b (@{$addedblocks{$ref}}) { + $data->{blocks} = manipset($data->{blocks}, $b, 1); + } + &savebug; + } + } + foreach $ref (keys %removedblocks) { + if (&getbug) { + foreach my $b (@{$removedblocks{$ref}}) { + $data->{blocks} = manipset($data->{blocks}, $b, 0); + } + &savebug; + } + } } } 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 { ¬foundbug; } } 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); - @newmergelist= (); + my @tomerge= sort { $a <=> $b } split(/\s+#?/,$1); + my @newmergelist= (); my %tags = (); + my %found = (); + my %fixed = (); &getmerge; while (defined($ref= shift(@tomerge))) { &transcript("D| checking merge $ref\n") if $dl; $ref+= 0; - next if grep($_ eq $ref,@newmergelist); + if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) { + $ref = $clonebugs{$ref}; + } + next if grep($_ == $ref,@newmergelist); if (!&getbug) { ¬foundbug; @newmergelist=(); last } + if (!&checkpkglimit) { &cancelbug; @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},@newmergelist); + &checkmatch('forwarded addr','m_forwarded',$data->{forwarded},@newmergelist); + $data->{severity} = '$gDefaultSeverity' if $data->{severity} eq ''; + &checkmatch('severity','m_severity',$data->{severity},@newmergelist); + &checkmatch('blocks','m_blocks',$data->{blocks},@newmergelist); + &checkmatch('blocked-by','m_blockedby',$data->{blockedby},@newmergelist); + &checkmatch('done mark','m_done',length($data->{done}) ? 'done' : 'open',@newmergelist); + &checkmatch('owner','m_owner',$data->{owner},@newmergelist); + 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"); + $errors++; &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($data); + @bug_affected{@newmergelist} = 1 x @newmergelist; + $data->{mergedwith}= join(' ',grep($_ != $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/^forcemerge\s+\#?(-?\d+(?:\s+\#?-?\d+)+)\s*$/i) { + $ok++; + my @temp = split /\s+\#?/,$1; + my $master_bug = shift @temp; + my $master_bug_data; + my @tomerge = sort { $a <=> $b } @temp; + unshift @tomerge,$master_bug; + &transcript("D| force merging ".join(',',@tomerge)."\n") if $dl; + my @newmergelist= (); + my %tags = (); + my %found = (); + my %fixed = (); + # Here we try to do the right thing. + # First, if the bugs are in the same package, we merge all of the found, fixed, and tags. + # If not, we discard the found and fixed. + # Everything else we set to the values of the first bug. + &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($_ == $ref,@newmergelist); + if (!&getbug) { ¬foundbug; @newmergelist=(); last } + if (!&checkpkglimit) { &cancelbug; @newmergelist=(); last; } + &foundbug; + &transcript("D| adding $ref ($data->{mergedwith})\n") if $dl; + $master_bug_data = $data if not defined $master_bug_data; + if ($data->{package} ne $master_bug_data->{package}) { + &transcript("Mismatch - only $gBugs in the same package can be forcibly merged:\n". + "$gBug $ref is not in the same package as $master_bug\n"); + $errors++; + &cancelbug; @newmergelist=(); last; + } + for my $t (split /\s+/,$data->{keywords}) { + $tags{$t} = 1; + } + @found{@{$data->{found_versions}}} = (1) x @{$data->{found_versions}}; + @fixed{@{$data->{fixed_versions}}} = (1) x @{$data->{fixed_versions}}; + push(@newmergelist,$ref); + push(@tomerge,split(/ /,$data->{mergedwith})); + &cancelbug; + } + if (@newmergelist) { + @newmergelist= sort { $a <=> $b } @newmergelist; + $action= "Forcibly 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)); - $s_keywords= join(' ', keys %tags); + &addmaintainers($data); + @bug_affected{@newmergelist} = 1 x @newmergelist; + $data->{mergedwith}= join(' ',grep($_ != $ref,@newmergelist)); + $data->{keywords}= join(' ', keys %tags); + $data->{found_versions}= [sort keys %found]; + $data->{fixed_versions}= [sort keys %fixed]; + my @field_list = qw(forwarded package severity blocks blockedby owner done); + @{$data}{@field_list} = @{$master_bug_data}{@field_list}; &savebug; } &transcript("$action\n\n"); @@ -555,9 +1011,11 @@ END $newbugsneeded = scalar(@newclonedids); $ref = $origref; + $bug_affected{$ref} = 1; if (&setbug) { - if (length($s_mergedwith)) { - &transcript("$gBug is marked as being merged with others.\n\n"); + if (length($data->{mergedwith})) { + &transcript("$gBug is marked as being merged with others. Use an existing clone.\n\n"); + $errors++; &nochangebug; } else { &filelock("nextnumber.lock"); @@ -574,34 +1032,103 @@ END } else { $action= "$gBug $origref cloned as bugs $firstref-$lastref."; } + + my $blocks = $data->{blocks}; + my $blockedby = $data->{blockedby}; + &getnextbug; my $ohash = get_hashname($origref); - $ref = $firstref; + my $clone = $firstref; + @bug_affected{@newclonedids} = 1 x @newclonedids; for $newclonedid (@newclonedids) { - $clonebugs{$newclonedid} = $ref; + $clonebugs{$newclonedid} = $clone; - 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.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"); + my $hash = get_hashname($clone); + copy("db-h/$ohash/$origref.log", "db-h/$hash/$clone.log"); + copy("db-h/$ohash/$origref.status", "db-h/$hash/$clone.status"); + copy("db-h/$ohash/$origref.summary", "db-h/$hash/$clone.summary"); + copy("db-h/$ohash/$origref.report", "db-h/$hash/$clone.report"); + &bughook('new', $clone, $data); + + # Update blocking info of bugs blocked by or blocking the + # cloned bug. + foreach $ref (split ' ', $blocks) { + &getbug; + $data->{blockedby} = manipset($data->{blockedby}, $clone, 1); + &savebug; + } + foreach $ref (split ' ', $blockedby) { + &getbug; + $data->{blocks} = manipset($data->{blocks}, $clone, 1); + &savebug; + } - $ref++; + $clone++; } } } + } 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"); + $errors++; if (++$unknowns >= 5) { &transcript("Too many unknown commands, stopping here.\n\n"); last; } } } -if ($procline>$#msg) { +if ($procline>$#bodylines) { &transcript(">\nEnd of message, stopping processing here.\n\n"); } if (!$ok && !quickabort) { + $errors++; &transcript("No commands successfully parsed; sending the help text(s).\n"); &sendhelp; &transcript("\n"); @@ -634,22 +1161,26 @@ 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"; -} + +# 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"; } +# Error text here advertises how many errors there were +my $error_text = $errors > 0 ? " (with $errors errors)":''; + $reply= < +Precedence: bulk +X-$gProject-PR-Message: transcript ${transcript}Please contact me if you need assistance. @@ -668,32 +1199,21 @@ print(AP &sani($header{'from'})."\n". "to ".&sani($controlrequestaddr)."\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,exists $header{'x-debbugs-no-ack'}?():$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) = @_; - 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",'-odb','-oem','-oi',get_addresses(@recips); - die $!; - } - print(D $message) || &quit("writing to sendmail process: $!"); - $!=0; close(D); $? && &quit("sendmail gave exit status $? ($!)"); + $message = "X-Loop: $gMaintainerEmail\n" . $message; + send_mail_message(message => $message, + recipients => \@recips, + ); $midix++; } @@ -708,7 +1228,7 @@ sub sendhelp { #} sub checkmatch { - local ($string,$mvarname,$svarvalue) = @_; + local ($string,$mvarname,$svarvalue,@newmergelist) = @_; local ($mvarvalue); if (@newmergelist) { eval "\$mvarvalue= \$$mvarname"; @@ -726,6 +1246,30 @@ 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"); + $errors++; + return 0; + } + return 1; +} + +sub manipset { + my $list = shift; + my $elt = shift; + my $add = shift; + + my %h = map { $_ => 1 } split ' ', $list; + if ($add) { + $h{$elt}=1; + } + else { + delete $h{$elt}; + } + return join ' ', sort keys %h; +} + # High-level bug manipulation calls # Do announcements themselves # @@ -767,7 +1311,13 @@ sub setbug { &dlex("setbug => 0s"); return 0; } - @thisbugmergelist= split(/ /,$s_mergedwith); + + if (!&checkpkglimit) { + &cancelbug; + return 0; + } + + @thisbugmergelist= split(/ /,$data->{mergedwith}); if (!@thisbugmergelist) { &foundbug; $manybugs= 0; @@ -828,8 +1378,8 @@ sub getnextbug { # &transcript("$action\n\n") # endmerge -sub notfoundbug { &transcript("$gBug number $ref not found.\n\n"); } -sub foundbug { &transcript("$gBug#$ref: $s_subject\n"); } +sub notfoundbug { &transcript("$gBug number $ref not found. (Is it archived?)\n\n"); } +sub foundbug { &transcript("$gBug#$ref: $data->{subject}\n"); } sub getmerge { &dlen("getmerge"); @@ -850,7 +1400,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 +1433,9 @@ sub savebug { "Request was from ".&sani($header{'from'})."\n". "to ".&sani($controlrequestaddr).". \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 +1455,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 +1490,8 @@ Subject: $gProject $gBug help: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk +X-$gProject-PR-Message: doc-text $relpath END $ok++; @@ -965,8 +1500,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/) { @@ -984,6 +1518,8 @@ Subject: $gProject $gBugs information: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk +X-$gProject-PR-Message: doc-html $relpath END $ok++; @@ -998,17 +1534,26 @@ sub addccaddress { 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])) { + for $p (split(m/[ \t?,():]+/, $data->{package})) { $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"; + $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; @@ -1016,10 +1561,18 @@ 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; } } + + 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; + } } sub ensuremaintainersloaded { @@ -1031,7 +1584,7 @@ sub ensuremaintainersloaded { m/^\s*$/ && next; m/^(\S+)\s+(\S.*\S)\s*\n$/ || &quit("maintainers bogus \`$_'"); $a= $1; $b= $2; $a =~ y/A-Z/a-z/; - $maintainerof{$1}= $2; + $maintainerof{$a}= $2; } close(MAINT); open(MAINT,"$gMaintainerFileOverride") || die &quit("maintainers.override open: $!"); @@ -1040,12 +1593,12 @@ sub ensuremaintainersloaded { 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; + $maintainerof{$a}= $2; } 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; } @@ -1080,6 +1633,8 @@ Subject: $gProject $gBugs information: $description References: $header{'message-id'} In-Reply-To: $header{'message-id'} Message-ID: +Precedence: bulk +X-$gProject-PR-Message: getinfo $description follows: