Bug#698833: unblock: rss2email/1:2.71-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package rss2email
This version fixes important bug #638994, which was reopened lately.
I believe that the patch is quite straightforward ; here is the
debdiff to the version in testing.
unblock rss2email/1:2.71-2
Thanks for your hard work!
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (900, 'testing')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--
Etienne Millon
diff -Nru rss2email-2.71/debian/changelog rss2email-2.71/debian/changelog
--- rss2email-2.71/debian/changelog 2012-06-12 14:18:59.000000000 +0200
+++ rss2email-2.71/debian/changelog 2013-01-23 16:37:26.000000000 +0100
@@ -1,3 +1,10 @@
+rss2email (1:2.71-2) unstable; urgency=low
+
+ * Fix encoding of From and To headers.
+ Thanks to Thorsten Glaser (Closes: #638994)
+
+ -- Etienne Millon <etienne.millon@gmail.com> Wed, 23 Jan 2013 16:37:22 +0100
+
rss2email (1:2.71-1) unstable; urgency=low
* New maintainer.
diff -Nru rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch
--- rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 1970-01-01 01:00:00.000000000 +0100
+++ rss2email-2.71/debian/patches/0008-Fix-encoding-of-From-and-To-headers.patch 2013-01-23 16:37:07.000000000 +0100
@@ -0,0 +1,44 @@
+From: Thorsten Glaser <t.glaser@tarent.de>
+Date: Wed, 23 Jan 2013 15:25:35 +0100
+Subject: Fix encoding of From and To headers
+
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638994
+---
+ rss2email.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/rss2email.py b/rss2email.py
+index a6c3cbe..bdfb41a 100755
+--- a/rss2email.py
++++ b/rss2email.py
+@@ -114,6 +114,12 @@ from email.MIMEText import MIMEText
+ from email.Header import Header as _Header
+ from email.Utils import parseaddr, formataddr
+
++def name_format(realname, mailaddress):
++ if not realname:
++ return mailaddress
++ foo = formataddr(("." + realname, mailaddress))
++ return foo.replace(".", "", 1)
++
+ class Header(_Header):
+ # Work-around for <http://bugs.python.org/issue5871>
+ def append(self, s=None, *args, **kwargs):
+@@ -166,7 +172,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps
+
+ # Create the message ('plain' stands for Content-Type: text/plain)
+ msg = MIMEText(body.encode(body_charset), contenttype, body_charset)
+- msg['To'] = formataddr((recipient_name, recipient_addr))
++ msg['To'] = name_format(recipient_name, recipient_addr)
+ msg['Subject'] = Header(unicode(subject), header_charset)
+ for hdr in extraheaders.keys():
+ try:
+@@ -174,7 +180,7 @@ def send(sender, recipient, subject, body, contenttype, extraheaders=None, smtps
+ except:
+ msg[hdr] = Header(extraheaders[hdr])
+
+- fromhdr = formataddr((sender_name, sender_addr))
++ fromhdr = name_format(sender_name, sender_addr)
+ msg['From'] = fromhdr
+
+ msg_as_string = msg.as_string()
diff -Nru rss2email-2.71/debian/patches/series rss2email-2.71/debian/patches/series
--- rss2email-2.71/debian/patches/series 2012-05-25 18:49:01.000000000 +0200
+++ rss2email-2.71/debian/patches/series 2013-01-23 16:37:07.000000000 +0100
@@ -5,3 +5,4 @@
0005-Use-a-simpler-default-email-address.patch
0006-Prefer-utf8-in-CHARSET_LIST.patch
0007-Fix-email-header-injection.patch
+0008-Fix-encoding-of-From-and-To-headers.patch
Reply to: