From 75960b41ab9c9d6bffa136571851482b45fb1f49 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 14 2014 11:32:45 +0000
Subject: import mutt-1.5.21-26.el7.src.rpm


---

diff --git a/SOURCES/mutt-1.5.20-cve-2014-0467.patch b/SOURCES/mutt-1.5.20-cve-2014-0467.patch
new file mode 100644
index 0000000..1ea2906
--- /dev/null
+++ b/SOURCES/mutt-1.5.20-cve-2014-0467.patch
@@ -0,0 +1,11 @@
+diff -up mutt/copy.c.cve-2014-0467 mutt/copy.c
+--- mutt/copy.c.cve-2014-0467	2009-12-14 19:24:59.000000000 +0100
++++ mutt/copy.c	2014-03-13 10:29:13.844051152 +0100
+@@ -254,6 +254,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF
+     {
+       if (!address_header_decode (&this_one))
+ 	rfc2047_decode (&this_one);
++	this_one_len = mutt_strlen (this_one);
+     }
+     
+     if (!headers[x])
diff --git a/SPECS/mutt.spec b/SPECS/mutt.spec
index d0c882a..720a573 100644
--- a/SPECS/mutt.spec
+++ b/SPECS/mutt.spec
@@ -16,7 +16,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.21
-Release: 23%{?dist}
+Release: 26%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -41,6 +41,7 @@ Patch15: mutt-1.5.21-tmpdir.patch
 Patch16: mutt-1.5.21-verpeers.patch
 Patch17: mutt-1.5.21-manhelp.patch
 Patch18: mutt-1.5.21-tlsv1v2.patch
+Patch19: mutt-1.5.20-cve-2014-0467.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRequires: ncurses-devel
@@ -93,6 +94,7 @@ for selecting groups of messages.
 %patch16 -p1 -b .verpeers
 %patch17 -p1 -b .manhelp
 %patch18 -p1 -b .tlsv1v2
+%patch19 -p1 -b .cve-2014-0467
 
 sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
 
@@ -179,6 +181,16 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Fri Mar 14 2014 Jan Pacner <jpacner@redhat.com> - 5:1.5.21-26
+- Resolves: #1075866 (CVE-2014-0467 heap-based buffer overflow when parsing
+  certain headers)
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 5:1.5.21-25
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 5:1.5.21-24
+- Mass rebuild 2013-12-27
+
 * Mon Nov 04 2013 Jan Pacner <jpacner@redhat.com> - 5:1.5.21-23
 - fix #1021464 (Improper fix for SIGSEGV Crash while parsing certificates file)