[Pgp-tools-commit] r699 - in trunk: caff debian

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-09-02 23:32:42 +0000 (Tue, 02 Sep 2014)
New Revision: 699

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Fix edge-case RFC 2822 violation in "From" and "Sender" email headers.

See RFC 2822, sections 3.2.4-3.2.6.

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2014-09-02 23:32:37 UTC (rev 698)
+++ trunk/caff/caff	2014-09-02 23:32:42 UTC (rev 699)
@@ -908,11 +908,11 @@
 			Data        => $message);
 	};
 
+	$message_entity->head->add("From", Encode::encode('MIME-Q', $CONFIG{'owner'}).' <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("Date", strftime("%a, %e %b %Y %H:%M:%S %z", localtime));
 	$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
 	$message_entity->head->add("To", email_to_ascii(Encode::decode('utf-8', $address)));
-	$message_entity->head->add("From", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
-	$message_entity->head->add("Sender", '"'.Encode::encode('MIME-Q', $CONFIG{'owner'}).'" <'.$CONFIG{'email'}.'>');
+	$message_entity->head->add("Sender", Encode::encode('MIME-Q', $CONFIG{'owner'}).' <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'};
 	$message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'};
 	$message_entity->head->add("User-Agent", $USER_AGENT);

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2014-09-02 23:32:37 UTC (rev 698)
+++ trunk/debian/changelog	2014-09-02 23:32:42 UTC (rev 699)
@@ -4,6 +4,7 @@
     + Upgrade packaging to debhelper level 9.
   * caff:
     + Add a "Date" email header. Patch from Clint Adams. (Closes: #760316)
+    + Fix edge-case RFC 2822 violation in "From" and "Sender" email headers.
 
  -- Guilhem Moulin <guilhem at guilhem.org>  Tue, 02 Sep 2014 19:27:28 +0200