[arch-commits] Commit in mutt/trunk (PKGBUILD cve-2014-9116.patch)

[Gaetan Bisson]

    Date: Monday, March 9, 2015 @ 17:41:57
  Author: bisson
Revision: 233142

fix FS#44110

Added:
  mutt/trunk/cve-2014-9116.patch
Modified:
  mutt/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   13 ++++++++++---
 cve-2014-9116.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-09 16:36:07 UTC (rev 233141)
+++ PKGBUILD	2015-03-09 16:41:57 UTC (rev 233142)
@@ -4,7 +4,7 @@
 
 pkgname=mutt
 pkgver=1.5.23
-pkgrel=1
+pkgrel=2
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
@@ -12,9 +12,16 @@
 arch=('i686' 'x86_64')
 optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
-source=("ftp://ftp.mutt.org/mutt/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8ac821d8b1e25504a31bf5fda9c08d93a4acc862')
+source=("ftp://ftp.mutt.org/mutt/${pkgname}-${pkgver}.tar.gz"
+        'cve-2014-9116.patch')
+sha1sums=('8ac821d8b1e25504a31bf5fda9c08d93a4acc862'
+          '776e3e00fcf8a325e7b9c2bb456d3e9ba2c82307')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../cve-2014-9116.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \

Added: cve-2014-9116.patch
===================================================================
--- cve-2014-9116.patch	                        (rev 0)
+++ cve-2014-9116.patch	2015-03-09 16:41:57 UTC (rev 233142)
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Kevin McCarthy <kevin at 8t8.us>
+# Date 1417472364 28800
+# Node ID 0aebf1df43598b442ac75ae4fe17875351854db0
+# Parent  5a86319adad0d17e4acaf8a580bfc9eb247547d0
+Revert write_one_header() to skip space and tab.  (closes #3716)
+
+This patch fixes CVE-2014-9116 in the stable branch.  It reverts
+write_one_header() to the pre [f251d523ca5a] code for skipping
+whitespace.
+
+Thanks to Antonio Radici and Tomas Hoger for their analysis and patches
+to mutt, which this patch is based off of.
+
+diff -r 5a86319adad0 -r 0aebf1df4359 sendlib.c
+--- a/sendlib.c	Mon Jan 05 18:28:59 2015 -0800
++++ b/sendlib.c	Mon Dec 01 14:19:24 2014 -0800
+@@ -1814,7 +1814,14 @@
+     {
+       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)
++       * NOTE: skip_email_wsp() does the wrong thing here.
++       *       See tickets 3609 and 3716. */
++      while (*t == ' ' || *t == '\t')
++        t++;
++
+       valbuf = mutt_substrdup (t, end);
+     }
+     dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
+