From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 18 Nov 2017 02:46:56 +0000 (-0800)
Subject: Use foo <bar@baz.com> instead of bar@baz.com (foo) for From: (Closes: #881903). Thank... 
X-Git-Tag: release/2.6.0~61
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=b9b2b049d3d341aea741e6048b6892b63363e213

Use foo <bar@baz.com> instead of bar@baz.com (foo) for From: (Closes: #881903). Thanks to Michael Stapelberg.
---

diff --git a/debian/changelog b/debian/changelog
index fc974f2..730a71c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
     Thanks to Julien Cristau
   * Use pass-through for rewrites of URLs to hide implementation (Closes:
     #871784) Thanks to Ridier 'OdyX' Raboud
+  * Use foo <bar@baz.com> instead of bar@baz.com (foo) for From: (Closes:
+    #881903). Thanks to Michael Stapelberg.
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)
diff --git a/scripts/process b/scripts/process
index 3eba1fc..09ff810 100755
--- a/scripts/process
+++ b/scripts/process
@@ -312,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" <$gMaintainer>),
 	   To            => $replyto,
 	   Subject       => "Unknown problem report $gBug#$tryref ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.unknown\@$gEmailDomain>",
@@ -403,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" <$gMaintainer>),
 	   To            => $replyto,
 	   Subject       => "Message with no $gBug number ignored by $receivedat ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.warnignore\@$gEmailDomain>",
@@ -495,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" <$gMaintainer>),
               To            => "$replyto",
               Subject       => "$gBug#$ref: marked as forwarded ($data->{subject})",
               "Message-ID"  => "<header.$ref.$nn.ackfwdd\@$gEmailDomain>",
@@ -520,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" <$gMaintainer>),
               To            => $replyto,
               Subject       => "$gBug#$ref: marked as done ($data->{subject})",
               "Message-ID"  => "<handler.$ref.$nn.ackdone\@$gEmailDomain>",
@@ -546,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" <$gMaintainer>),
               To            => "$data->{originator}",
               Subject       => "$gBug#$ref closed by $markedby ($header{'subject'})",
               "Message-ID"  => "<handler.$ref.$nn.notifdone\@$gEmailDomain>",
@@ -577,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" <$gMaintainer>),
 	   To            => $replyto,
 	   Subject       => "Message with no $gBug number cannot be sent to submitter! ($subject)",
 	   'Message-ID'  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
@@ -617,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" <$gMaintainer>),
                         To            => $replyto,
                         Subject       => "Message with no Package: tag cannot be processed! ($subject)",
                         "Message-ID"  => "<handler.x.$nn.nonumnosub\@$gEmailDomain>",
@@ -989,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" <$gMaintainer>),
 			To            => $replyto,
 			Subject       => $t_h{subject},
 			"Message-ID"  => $t_h{messageid},
@@ -1090,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" <$gMaintainer>),
 			     To            => $replyto,
 			     @maintccs ? (Cc => join(', ',@maintccs)):(),
 			     Subject       => "Processed${error_text}: $header{subject}",
diff --git a/scripts/service b/scripts/service
index c62e3d5..a14691a 100755
--- a/scripts/service
+++ b/scripts/service
@@ -518,7 +518,7 @@ eval{
     $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK);
 };
 my $reply =
-    create_mime_message([From          => "$gMaintainerEmail ($gProject $gBug Tracking System)",
+    create_mime_message([From          => qq("$gProject $gBug Tracking System" <$gMaintainerEmail>),
 			 To            => $replyto,
 			 @maintccs ? (Cc => join(', ',@maintccs)):(),
 			 Subject       => "Processed${error_text}: $header{subject}",
@@ -884,7 +884,7 @@ sub sendtxthelpraw {
     close(D);
     print {$transcript} "Sending $description in separate message.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBug help: $description
 References: $header{'message-id'}
@@ -912,7 +912,7 @@ sub sendlynxdocraw {
     } else {
         print {$transcript} "Sending $description.\n";
         &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}
@@ -949,7 +949,7 @@ sub sendinfo {
     }
     print {$transcript} "Sending $description.\n";
     &sendmailmessage(<<END.$doc,$replyto);
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
+From: "$gProject $gBug Tracking System" <$gMaintainerEmail>
 To: $replyto
 Subject: $gProject $gBugs information: $description
 References: $header{'message-id'}