X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=38e4f90c8c1a1e326b5530d8bed341ba29f9a109;hb=01657bf61b205931f9e263f626f80f5b34682b0c;hp=17aa15be7b297939a66e8ea97e1eff656fbf4645;hpb=92cee710a2cd7e31a89dad4d9d6bc3d12614a584;p=debbugs.git

diff --git a/scripts/process b/scripts/process
index 17aa15b..38e4f90 100755
--- a/scripts/process
+++ b/scripts/process
@@ -180,8 +180,8 @@ for my $hdr (@headerlines) {
     $_ = $hdr;
     s/\n\s/ /g;
     finish() if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
-    my $ins = !m/^subject:/i && !m/^reply-to:/i && !m/^return-path:/i
-           && !m/^From / && !m/^X-Debbugs-/i;
+    my $ins = !m/^(?:(?:subject|reply-to|return-path|mail-followup-to):
+		 |From\s|X-Debbugs-)/xi;
     $fwd .= encode_utf8($hdr)."\n" if $ins;
     # print {$debugfh} ">$_<\n";
     if (s/^(\S+):\s*//) {
@@ -224,9 +224,15 @@ for my $phline (@bodylines)
     # Remove BOM markers from UTF-8 strings
     # Fixes #488554
     $phline =~ s/\xef\xbb\xbf//g;
-    last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
+    $phline =~ s/\N{U+FEFF}//g;
+    last if $phline !~ m/^([\w-]+): # psuedoheader
+			 (?:\s|\N{U+00A0})* # zero or more spaces, including
+                                            # non-breaking space
+			 (\S.*)/x; # pseudoheader value
     my ($fn, $fv) = ($1, $2);
     $fv =~ s/\s*$//;
+    # pluralize tag/usertag
+    $fn = $fn.'s' if $fn =~ /^(?:tag|usertag)$/;
     print {$debugfh} ">$fn|$fv|\n";
     $fn = lc $fn;
     if ($fn =~ /^control$/) {
@@ -247,7 +253,7 @@ for my $key (grep /X-Debbugs-.*/i, keys %pheader) {
 # set $i to beginning of encoded body data, so we can dump it out
 # verbatim later
 my $i = 0;
-++$i while $msg[$i] =~ /./;
+++$i while $i <= $#msg and $msg[$i] =~ /./;
 $fwd .= join("\n",@msg[$i..$#msg]);
 
 binmode($debugfh,':raw');
@@ -500,6 +506,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               "X-$gProject-PR-Keywords" => $data->{keywords},
 	      # Only have a X-$gProject-PR-Source when we know the source package
 	      (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+              "Reply-To"                => "$ref\@$gEmailDomain",
+              "Content-Type"            => 'text/plain; charset="utf-8"',
              ],message_body_template('mail/process_mark_as_forwarded',
 				     {date => $header{date},
 				      messageid => $header{'message-id'},
@@ -523,6 +531,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               "X-$gProject-PR-Keywords" => $data->{keywords},
 	      # Only have a X-$gProject-PR-Source when we know the source package
 	      (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+              "Reply-To"                => "$ref\@$gEmailDomain",
+              "Content-Type"            => 'text/plain; charset="utf-8"',
              ],message_body_template('mail/process_mark_as_done',
 				     {date => $header{date},
 				      messageid => $header{'message-id'},
@@ -540,10 +550,10 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
               Subject       => "$gBug#$ref closed by $markedby ($header{'subject'})",
               "Message-ID"  => "<handler.$ref.$nn.notifdone\@$gEmailDomain>",
               (defined $data->{msgid})?("In-Reply-To" => $data->{msgid}):(),
-              References    => join(' ',grep {defined $_} ($header{'message-id'},$data->{msgid})),
+              References    => join(' ',grep {defined $_} ($header{'message-id'},$data->{msgid},'')),
               "X-$gProject-PR-Message"  => "they-closed $ref",
-              "X-$gProject-PR-Package"  => "$data->{package}",
-              "X-$gProject-PR-Keywords" => "$data->{keywords}",
+              (defined $data->{package})?("X-$gProject-PR-Package"  => $data->{package}):(),
+              (defined $data->{keywords})?("X-$gProject-PR-Keywords" => $data->{keywords}):(),
 	      # Only have a X-$gProject-PR-Source when we know the source package
 	      (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
               "Reply-To"                => "$ref\@$gEmailDomain",
@@ -591,7 +601,8 @@ if ($ref<0) { # new bug report
 
     if (defined $pheader{source}) {
 	# source packages are identified by the src: prefix
-        $data->{package} = 'src:'.$pheader{source};
+        $data->{package} = $pheader{source};
+        $data->{package} =~ s/(^|,\s*)/${1}src:/g;
     } elsif (defined $pheader{package}) {
         $data->{package} = $pheader{package};
 	if ($data->{package} =~ /^src:(.+)/) {
@@ -1014,7 +1025,7 @@ if (@control_bits) {
 	 request_subject   => $header{subject},
 	 request_nn        => $nn,
 	 request_replyto   => $replyto,
-	 message           => $msg,
+	 message           => [$msg],
 	 affected_bugs     => \%bug_affected,
 	 affected_packages => \%affected_packages,
 	 recipients        => \%recipients,
@@ -1069,7 +1080,7 @@ if (@control_bits) {
 					address_only => 1,
 					cc => 1,
 				       );
-    my $error_text = $errors > 0 ? " (with $errors errors)":'';
+    my $error_text = $errors > 0 ? " (with $errors error" . ($errors > 1 ? "s" : "") . ")" : "";
     my $reply =
 	create_mime_message(['X-Loop'      => $gMaintainerEmail,
 			     From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
@@ -1260,7 +1271,7 @@ sub fill_template{
 		     };
      my $hole_var = {'&bugurl' =>
 		     sub{"$_[0]: ".
-			      'http://'.$config{cgi_domain}.'/'.
+			      $config{cgi_domain}.'/'.
 				   Debbugs::CGI::bug_links(bug=>$_[0],
 							   links_only => 1,
 							  );