From 9fc6519a8e6f355a34b141f42f67f99bb5968ecc Mon Sep 17 00:00:00 2001 From: gecko <> Date: Thu, 16 Sep 1999 06:16:47 -0800 Subject: [PATCH] [project @ 1999-09-16 07:16:47 by gecko] Mime / PGP accepting set one... --- scripts/expire.in | 9 ++- scripts/process.in | 191 +++++++++++++++++++++++++-------------------- scripts/service.in | 11 ++- 3 files changed, 120 insertions(+), 91 deletions(-) diff --git a/scripts/expire.in b/scripts/expire.in index 21b5eb6..83378c3 100755 --- a/scripts/expire.in +++ b/scripts/expire.in @@ -1,5 +1,5 @@ -#!/usr/bin/perl -w -# $Id: expire.in,v 1.3 1999/09/14 02:08:31 gecko Exp $ +#!/usr/bin/perl +# $Id: expire.in,v 1.4 1999/09/16 07:16:47 gecko Exp $ # Load modules and set envirnment require('/etc/debbugs/config'); @@ -16,7 +16,8 @@ sub get_archivename { my $bugnum = shift; my $archivename = ""; - while( $bugnum > 99 ) { $bugnum = int $bugnum/10; } +# while( $bugnum > 99 ) { $bugnum = int $bugnum/10; } + $bugnum = $bugnum % 100; $archivename = sprintf "%02d", $bugnum; return $archivename; } @@ -69,10 +70,10 @@ while (length($ref=shift(@list))) my $dir; $dir = "archive/" . get_archivename $mref; `mkdir -p "$dir"`; - print( "archiving $mref (from $ref)\n" ); copy( "db/$mref.log", "$dir/$mref.log" ); copy( "db/$mref.status", "$dir/$mref.status" ); copy( "db/$mref.report", "$dir/$mref.report" ); + print("archived $mref to $dir (from $ref)\n") || &quit("output old: $!"); } unlink("db/$mref.log", "db/$mref.status", "db/$mref.report"); print("deleted $mref (from $ref)\n") || &quit("output old: $!"); diff --git a/scripts/process.in b/scripts/process.in index a18a4e9..c83eb51 100755 --- a/scripts/process.in +++ b/scripts/process.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: process.in,v 1.2 1999/09/02 22:27:29 gecko Exp $ +# $Id: process.in,v 1.3 1999/09/16 07:16:47 gecko Exp $ # # Usage: process nn # Temps: incoming/Pnn @@ -20,8 +20,8 @@ $codeletter= $1; $tryref= length($2) ? $2+0 : -1; $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: $!"); } @@ -44,7 +44,7 @@ grep(s/\n+$//,@msg); print DEBUG "###\n",join("##\n",@msg),"\n###\n"; -chop($tdate= `date -u '+%a, %d %h 19%y %T GMT'`); +chop($tdate= `date -u '+%a, %d %h %Y %T GMT'`); $fwd= <$_<\n"; if (s/^(\S+):\s*//) { $v= $1; $v =~ y/A-Z/a-z/; -print DEBUG ">$v=$_<\n"; + print DEBUG ">$v=$_<\n"; $header{$v}= $_; } else { -print DEBUG "!>$_<\n"; + print DEBUG "!>$_<\n"; } } +#remove blank lines while ($i <= $#msg && !length($msg[$i])) { $fwd .= "\n"; $i++; } - -while ($msg[$i] =~ m/^(\w+):\s*/) { - $fn=$1; $fv = $'; -print DEBUG ">$fn|$'|\n"; +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++; } +} + +while (defined ($msg[$i] ) ) +{ + last if ( $msg[$i] !~ m/^([\w]+):\s*(\S+)/ ); + $i++; + $fn = $1; $fv = $2; + print DEBUG ">$fn|$'|\n"; $fwd .= $fn.': '.$fv."\n"; - while ($msg[++$i] =~ m/^\s/) { $fwd .= $msg[$i]."\n"; $fv .= ' '.$msg[$i]; } $fn =~ y/A-Z/a-z/; $pheader{$fn}= $fv; -print DEBUG ">$fn~$fv<\n"; + print DEBUG ">$fn~$fv<\n"; } + $fwd .= join("\n",@msg[$i..$#msg]); print DEBUG "***\n$fwd\n***\n"; @@ -97,8 +106,8 @@ $_= "$2 <$1>" if m/^([^\<\> \t\n\(\)]+) \(([^\(\)\<\>]+)\)$/; $replytocompare= $_; print DEBUG "replytocompare >$replytocompare<\n"; -if (!defined($header{'subject'})) { - $brokenness.= <= 0) { - $bfound= &lockreadbugmerge($tryref); - if ($bfound) { - $ref= $tryref; - } else { - &htmllog("Reply","sent", $replyto,"Unknown problem report number $tryref."); +if ($tryref < 0 && m/^Bug ?\#(\d+)\D/i) { $tryref= $1+0; } + +if ($tryref >= 0) +{ $bfound= &lockreadbugmerge($tryref); + if ($bfound) { $ref= $tryref; } + else + { &htmllog("Reply","sent", $replyto,"Unknown problem report number $tryref."); &sendmessage(< @@ -160,42 +165,35 @@ END &appendlog; &finish; } -} else { - &filelock('lock/-1'); -} +} else { &filelock('lock/-1'); } -if ($codeletter eq 'D' || $codeletter eq 'F') { - if ($replyto =~ m/$gBounceFroms/o || - $header{'from'} =~ m/$gBounceFroms/o) { - &quit("bounce detected ! Mwaap! Mwaap!"); - } +if ($codeletter eq 'D' || $codeletter eq 'F') +{ if ($replyto =~ m/$gBounceFroms/o || + $header{'from'} =~ m/$gBounceFroms/o) + { &quit("bounce detected ! Mwaap! Mwaap!"); } $markedby= $header{'from'} eq $replyto ? $replyto : "$header{'from'} (reply to $replyto)"; - if ($codeletter eq 'F') { - (&appendlog,&finish) if length($s_forwarded); + if ($codeletter eq 'F') + { (&appendlog,&finish) if length($s_forwarded); $receivedat= "forwarded\@$gEmailDomain"; $markaswhat= 'forwarded'; $set_forwarded= $header{'to'}; - if ( length( $gListDomain ) > 0 && length( $gFowardList ) > 0 ) { - $generalcc= "$gFowardList\@$gListDomain"; - } else { - $generalcc=''; - } - } else { - (&appendlog,&finish) if length($s_done); + if ( length( $gListDomain ) > 0 && length( $gFowardList ) > 0 ) + { $generalcc= "$gFowardList\@$gListDomain"; } + else { $generalcc=''; } + } else + { (&appendlog,&finish) if length($s_done); $receivedat= "done\@$gEmailDomain"; $markaswhat= 'done'; $set_done= $header{'from'}; - if ( length( $gListDomain ) > 0 && length( $gDoneList ) > 0 ) { - $generalcc= "$gDoneList\@$gListDomain"; - } else { - $generalcc=''; - } + if ( length( $gListDomain ) > 0 && length( $gDoneList ) > 0 ) + { $generalcc= "$gDoneList\@$gListDomain"; } + else { $generalcc=''; } } - if ($ref<0) { - &htmllog("Warning","sent",$replyto,"Message ignored."); + if ($ref<0) + { &htmllog("Warning","sent",$replyto,"Message ignored."); &sendmessage(<); close(O); - if ($codeletter eq 'F') { - &htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded."); + if ($codeletter eq 'F') + { &htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded."); &sendmessage(< @@ -281,10 +279,10 @@ $gMaintainer (administrator, $gProject $gBugs database) END - } else { - &htmllog("Reply","sent",$replyto,"You have taken responsibility."); + } else + { &htmllog("Reply","sent",$replyto,"You have taken responsibility."); &sendmessage(< @@ -309,10 +307,10 @@ $gMaintainer (administrator, $gProject $gBugs database) END - &htmllog("Notification","sent",$s_originator, - "$gBug acknowledged by developer."); + &htmllog("Notification","sent",$s_originator, + "$gBug acknowledged by developer."); &sendmessage(< @@ -335,16 +333,16 @@ $gMaintainer END } - &appendlog; + &appendlog; } &finish; } -if ($ref<0) { - if ($codeletter eq 'U') { - &htmllog("Warning","sent",$replyto,"Message not forwarded."); +if ($ref<0) +{ if ($codeletter eq 'U') + { &htmllog("Warning","sent",$replyto,"Message not forwarded."); &sendmessage(< +In-Reply-To: $header{'message-id'} +References: $header{'message-id'} $s_msgid +X-$gProject-PR-Message: error Your message didn't have a Package: line at the start (in the pseudo-header following the real mail header), or didn't have a psuedo-header at all. This makes it much harder for us to categorise and deal with your -problem report; please ensure that you say which package(s) and -version(s) the problem is with next time. Some time in the future the -problem reports system may start rejecting such messages. +problem report. Please resubmit your report and tell us which package the +report is on. For help, check out http://$gWebDomain/Reporting.html. + +Your message was dated $header{'date'} and had +message-id $header{'message-id'} +and subject $subject. + +If you need any assistance or explanation please contact me. + +$gMaintainer +(administrator, $gProject $gBugs database) + END + &appendlog; + &finish; } else { $s_package= $pheader{'package'}; + print "Package: $s_package\n"; } if (defined($pheader{'keywords'})) { $s_keywords= $pheader{'keywords'}; @@ -438,12 +457,12 @@ print DEBUG "maintainers >@maintaddrs<\n"; $orgsender= defined($header{'sender'}) ? "Orignal-Sender: $header{'sender'}\n" : ''; $newsubject= $subject; $newsubject =~ s/^$gBug#$ref\W*\s*//; -$xcchdr= $header{dbc_xcc_hdr}; +$xcchdr= $header{X-Debbugs-CC}; if ($xcchdr =~ m/\S/) { push(@resentccs,$xcchdr); $resentccexplain.= < @@ -628,7 +647,7 @@ END $codeletter eq 'M' ? "Extra info received and forwarded to maintainer." : "Extra info received and forwarded to list."). $htmlbreak); &sendmessage($veryquiet ? < diff --git a/scripts/service.in b/scripts/service.in index 4a82a51..28a4f78 100755 --- a/scripts/service.in +++ b/scripts/service.in @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $Id: service.in,v 1.3 1999/09/14 02:08:31 gecko Exp $ +# $Id: service.in,v 1.4 1999/09/16 07:16:47 gecko Exp $ # # Usage: service .nn # Temps: incoming/P.nn @@ -72,6 +72,15 @@ $mergelowstate= 'idle'; $midix=0; $extras=""; +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++; } +} + + for ($procline=$i; $procline<=$#msg; $procline++) { $state eq 'idle' || "$state ?"; $lowstate eq 'idle' || "$lowstate ?"; -- 2.39.2