Resurrect the 20-parse-recipient patch to fix a small bug.

diff --git a/changelog b/changelog
index e4b7b6e2f1586057fe3678aafea0076f0f68477c..a007473d55cf2154fe58a9b1fe7b3f9e2f81cdb8 100644 (file)
--- a/changelog
+++ b/changelog
@@ -16,8 +16,8 @@ dma (0.0.2010.06.17-1) UNRELEASED; urgency=low
       - document the Debian default for DBOUNCEPROG in the manual page
     - resurrect the 13-hardening patch, correcting a couple of
       unchecked asprintf(3) and vasprintf(3) invocations
-    - remove the 20-parse-recipient patch, implemented upstream in
-      a different way
+    - the functionality of the 20-parse-recipient patch was implemented
+      upstream in a different way, so replace it with a small bugfix
     - remove the 22-openfiles patch, overtaken by upstream changes
     - in the 24-random-message-id patch, change the GNU Makefile, too
     - add the 27-int-size patch to cast a variable to the correct type

diff --git a/patches/20-parse-recipient.patch b/patches/20-parse-recipient.patch
new file mode 100644 (file)
index 0000000..86439ad
--- /dev/null
+++ b/patches/20-parse-recipient.patch
@@ -0,0 +1,16 @@
+Description: Fix the parsing of recipient addresses.
+Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
+Forwarded: no
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-06-28
+
+--- a/mail.c
++++ b/mail.c
+@@ -375,6 +375,7 @@
+ 
+               case '<':
+                       ps->brackets = 1;
++                      ps->pos = 0;
+                       goto skip;
+ 
+               case '>':

diff --git a/patches/series b/patches/series
index a52e4e4a5cb97e8aba535b2f57a48a887b773cd4..75f10385fd1aa23267e6b607345c48ad619327f2 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -5,6 +5,7 @@
 11-double-bounce.patch
 13-hardening.patch
 17-mailname.patch
+20-parse-recipient.patch
 23-dirent-d_type.patch
 24-random-message-id.patch
 25-unsupported-starttls.patch