X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fprocess;h=91b68613c2d01e27155db9852d838aae245b1345;hb=64267ddd252ea24e5aeb4bb999a22a1b1f0f2d85;hp=38e4f90c8c1a1e326b5530d8bed341ba29f9a109;hpb=579e7989241accf28828f218679da2131e449900;p=debbugs.git

diff --git a/scripts/process b/scripts/process
index 38e4f90..91b6861 100755
--- a/scripts/process
+++ b/scripts/process
@@ -7,7 +7,6 @@
 use warnings;
 use strict;
 
-use locale;
 use POSIX qw(strftime locale_h);
 setlocale(LC_TIME, "C");
 
@@ -180,7 +179,9 @@ for my $hdr (@headerlines) {
     $_ = $hdr;
     s/\n\s/ /g;
     finish() if m/^x-loop: (\S+)$/i && $1 eq "$gMaintainerEmail";
-    my $ins = !m/^(?:(?:subject|reply-to|return-path|mail-followup-to):
+    my $ins = !m/^(?:(?:subject|reply-to|return-path|
+			 mail-followup-to|
+			 references):
 		 |From\s|X-Debbugs-)/xi;
     $fwd .= encode_utf8($hdr)."\n" if $ins;
     # print {$debugfh} ">$_<\n";
@@ -311,7 +312,7 @@ if (defined $tryref) {
         $ref= $tryref;
     } else {
         &sendmessage(create_mime_message(
-          [From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+          [From          =>  qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 	   To            => $replyto,
 	   Subject       => "Unknown problem report $gBug#$tryref ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.unknown\@$gEmailDomain>",
@@ -402,7 +403,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
     }
     if ($ref<0) {
 	&sendmessage(create_mime_message(
-          [From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+          [From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 	   To            => $replyto,
 	   Subject       => "Message with no $gBug number ignored by $receivedat ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.warnignore\@$gEmailDomain>",
@@ -494,7 +495,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 	    &htmllog("Reply","sent",$replyto,"You have marked $gBug as forwarded.");
             &sendmessage(create_mime_message(
 	     [@common_headers,
-	      From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+	      From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
               To            => "$replyto",
               Subject       => "$gBug#$ref: marked as forwarded ($data->{subject})",
               "Message-ID"  => "<header.$ref.$nn.ackfwdd\@$gEmailDomain>",
@@ -519,7 +520,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 	    &htmllog("Reply","sent",$replyto,"You have taken responsibility.");
             &sendmessage(create_mime_message(
 	     [@common_headers,
-	      From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+	      From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
               To            => $replyto,
               Subject       => "$gBug#$ref: marked as done ($data->{subject})",
               "Message-ID"  => "<handler.$ref.$nn.ackdone\@$gEmailDomain>",
@@ -545,7 +546,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
 		"$gBug acknowledged by developer.");
             &sendmessage(create_mime_message(
 	     [@common_headers,
-	      From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+	      From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
               To            => "$data->{originator}",
               Subject       => "$gBug#$ref closed by $markedby ($header{'subject'})",
               "Message-ID"  => "<handler.$ref.$nn.notifdone\@$gEmailDomain>",
@@ -576,7 +577,7 @@ if ($ref<0) { # new bug report
     if ($codeletter eq 'U') { # -submitter
 	&sendmessage(create_mime_message(
           [@common_headers,
-	   From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+	   From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 	   To            => $replyto,
 	   Subject       => "Message with no $gBug number cannot be sent to submitter! ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
@@ -616,7 +617,7 @@ if ($ref<0) { # new bug report
 					);
         &sendmessage(create_mime_message(
                        [@common_headers,
-			From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+			From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
                         To            => $replyto,
                         Subject       => "Message with no Package: tag cannot be processed! ($subject)",
                         "Message-ID"  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
@@ -812,6 +813,12 @@ if (length($resentccval)) {
     $resentcc= "Resent-CC: $resentccval\n"; 
 }
 
+my $referencesval = join(' ',grep {defined $_} $header{'references'},$data->{msgid});
+my $references = '';
+if (!$newref && length($referencesval)) {
+    $references = "References: $referencesval\n";
+}
+
 my $common_headers='';
 {
     my @tmp = @common_headers;
@@ -831,7 +838,7 @@ Resent-Sender: $gMaintainerEmail
 X-$gProject-PR-Message: report $ref
 X-$gProject-PR-Package: $data->{package}
 X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
 END
     chomp $enc_msg;
     $enc_msg = encode_utf8($enc_msg).$fwd."\n";
@@ -854,7 +861,7 @@ Resent-Sender: $gMaintainerEmail
 X-$gProject-PR-Message: $report_followup $ref
 X-$gProject-PR-Package: $data->{package}
 X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
 END
     chomp $enc_msg;
     $enc_msg = encode_utf8($enc_msg).$fwd."\n";
@@ -888,7 +895,7 @@ Resent-Sender: $gMaintainerEmail
 ${common_headers}X-$gProject-PR-Message: $report_followup $ref
 X-$gProject-PR-Package: $data->{package}
 X-$gProject-PR-Keywords: $data->{keywords}
-${source_pr_header}
+${references}${source_pr_header}
 END
     chomp $enc_msg;
     $enc_msg = encode_utf8($enc_msg).$fwd."\n";
@@ -982,7 +989,7 @@ if (not exists $header{'x-debbugs-no-ack'} and
 				     );
      &sendmessage(create_mime_message(
 		       [@common_headers,
-			From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+			From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 			To            => $replyto,
 			Subject       => $t_h{subject},
 			"Message-ID"  => $t_h{messageid},
@@ -1083,7 +1090,7 @@ if (@control_bits) {
     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)",
+			     From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 			     To            => $replyto,
 			     @maintccs ? (Cc => join(', ',@maintccs)):(),
 			     Subject       => "Processed${error_text}: $header{subject}",