Hi all, (disclaimer, not the maintainer here, just proposing a possible debdiff).
On Mon, Dec 01, 2014 at 03:27:40PM +0100, Jakub Wilk wrote: > Package: mutt > Version: 1.5.23-2 > > Mutt displays: > > From: Jakub Wilk <[email protected]>, > > even though there is no comma in the mail headers. > This is a regression: mutt_1.5.23-2 didn't show this trailing comma. Attached is debdiff reverting one part of the fix for unstable, and use the same approach as for the wheezy-security upload for skipping spaces and tabs in write_one_header. Should the fix for #771674 in any case also go to jessie? Regards, Salvatore
diff -Nru mutt-1.5.23/debian/changelog mutt-1.5.23/debian/changelog --- mutt-1.5.23/debian/changelog 2014-11-29 19:40:59.000000000 +0100 +++ mutt-1.5.23/debian/changelog 2014-12-02 18:50:55.000000000 +0100 @@ -1,3 +1,12 @@ +mutt (1.5.23-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update upstream/771125-CVE-2014-9116-jessie.patch patch. + Skip only space and tab in write_one_header(). + Fixes: "spurious comma in From header". (Closes: #771674) + + -- Salvatore Bonaccorso <[email protected]> Tue, 02 Dec 2014 18:50:51 +0100 + mutt (1.5.23-2) unstable; urgency=medium * Created upstream/771125-CVE-2014-9116-jessie.patch to address diff -Nru mutt-1.5.23/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch mutt-1.5.23/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch --- mutt-1.5.23/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch 2014-11-29 19:40:59.000000000 +0100 +++ mutt-1.5.23/debian/patches/upstream/771125-CVE-2014-9116-jessie.patch 2014-12-02 18:50:55.000000000 +0100 @@ -10,10 +10,8 @@ The wheezy version of this patch is slightly different, therefore this patch has -jessie prefixed in its name. -Index: mutt/lib.c -=================================================================== ---- mutt.orig/lib.c -+++ mutt/lib.c +--- a/lib.c ++++ b/lib.c @@ -815,6 +815,9 @@ char *mutt_substrdup (const char *begin, size_t len; char *p; @@ -24,16 +22,19 @@ if (end) len = end - begin; else -Index: mutt/lib.h -=================================================================== ---- mutt.orig/lib.h -+++ mutt/lib.h -@@ -98,7 +98,7 @@ - on some systems */ - # define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++; - --#define EMAIL_WSP " \t\r\n" -+#define EMAIL_WSP " \t\r" - - /* skip over WSP as defined by RFC5322. This is used primarily for parsing - * header fields. */ +--- a/sendlib.c ++++ b/sendlib.c +@@ -1814,7 +1814,12 @@ static int write_one_header (FILE *fp, i + { + tagbuf = mutt_substrdup (start, t); + /* skip over the colon separating the header field name and value */ +- t = skip_email_wsp(t + 1); ++ ++t; ++ ++ /* skip over any leading whitespace (WSP, as defined in RFC5322) */ ++ while (*t == ' ' || *t == '\t') ++ t++; ++ + valbuf = mutt_substrdup (t, end); + } + dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
