Hi Peter, Miquel van Smoorenburg wrote:
> This should go into stable too if possible. > > Description: Read reponse from smtp server up to crlf How about this patch? Patch is based against fc230da8, "Release dma-0.0.2010.06.17-6", 2010-10-17. -- >8 -- From: Peter Pentchev <r...@ringlet.net> Date: Sun, 25 Dec 2011 17:24:54 +0200 Subject: Add Miquel van Smoorenburg's fixes for #650265 and #650268. --- changelog | 10 ++++++++++ patches/45-received.patch | 25 +++++++++++++++++++++++++ patches/46-smtp-newline.patch | 22 ++++++++++++++++++++++ patches/series | 2 ++ 4 files changed, 59 insertions(+) create mode 100644 patches/45-received.patch create mode 100644 patches/46-smtp-newline.patch diff --git a/changelog b/changelog index adbf56d3..48422a84 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,13 @@ +dma (0.0.2010.06.17-6+squeeze0.1) stable; urgency=low + + [ Peter Pentchev ] + * Add the 45-received patch to fix the format of the Received header. + Closes: #650268 + * Add the 46-smtp-newline patch to deal with SMTP servers that may + send a response in more than one TCP packet. Closes: #650265 + + -- Jonathan Nieder <jrnie...@gmail.com> Sun, 21 Oct 2012 23:42:33 -0700 + dma (0.0.2010.06.17-6) unstable; urgency=low * Add the 37-gnu-hurd patch to really fix the FTBFS on GNU/Hurd. diff --git a/patches/45-received.patch b/patches/45-received.patch new file mode 100644 index 00000000..e6da7212 --- /dev/null +++ b/patches/45-received.patch @@ -0,0 +1,25 @@ +Description: Add semicolon before date in received: header +Author: Miquel van Smoorenburg <miqu...@cistron.nl> +Bug-Debian: http://bugs.debian.org/650268 +Last-Update: 2011-11-28 + +--- a/mail.c ++++ b/mail.c +@@ -174,7 +174,7 @@ + error = fprintf(bounceq.mailf, + "Received: from MAILER-DAEMON\n" + "\tid %s\n" +- "\tby %s (%s)\n" ++ "\tby %s (%s);\n" + "\t%s\n" + "X-Original-To: <%s>\n" + "From: MAILER-DAEMON <>\n" +@@ -452,7 +452,7 @@ + "Received: from %s (uid %d)\n" + "\t(envelope-from %s)\n" + "\tid %s\n" +- "\tby %s (%s)\n" ++ "\tby %s (%s);\n" + "\t%s\n", + username, getuid(), + queue->sender, diff --git a/patches/46-smtp-newline.patch b/patches/46-smtp-newline.patch new file mode 100644 index 00000000..3d8c87bd --- /dev/null +++ b/patches/46-smtp-newline.patch @@ -0,0 +1,22 @@ +Description: Read the response from an SMTP server all the way to CR/LF +Author: Miquel van Smoorenburg <miqu...@cistron.nl> +Bug-Debian: http://bugs.debian.org/650265 +Last-Update: 2011-11-28 + +--- a/net.c ++++ b/net.c +@@ -166,6 +166,14 @@ + } + len += rlen; + } ++ /* read up to \n */ ++ if (memchr(buff + pos, '\n', len - pos) == NULL) { ++ if (len < sizeof(buff)) ++ continue; ++ strcpy(neterr, "line too long in reply from server"); ++ return (-1); ++ } ++ + /* + * If there is an external buffer with a size bigger than zero + * and as long as there is space in the external buffer and diff --git a/patches/series b/patches/series index efed7421..62625007 100644 --- a/patches/series +++ b/patches/series @@ -20,3 +20,5 @@ 35-delivery-retry.patch 36-sa_nocldwait.patch 37-gnu-hurd.patch +45-received.patch +46-smtp-newline.patch -- 1.8.0.rc3 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
