Bump to fix two bugs fixed upstream: don't store header colors in header cache and fix off-by-one errors in mailcap parsing

Package-Manager: portage-2.2.00.15095-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

5 files changed, 68 insertions, 4 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 3af7e5562e37..200af38134c1 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.169 2009/12/08 13:36:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.170 2009/12/15 18:06:31 grobian Exp $
+
+*mutt-1.5.20-r9 (15 Dec 2009)
+
+  15 Dec 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.20-r8.ebuild,
+  +mutt-1.5.20-r9.ebuild,
+  +files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch,
+  +files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch:
+  Bump to fix two bugs fixed upstream: don't store header colors in header
+  cache and fix off-by-one errors in mailcap parsing
 
   08 Dec 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r8.ebuild,
   +files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1240d6164cf0..aedf9bfe66f7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -23,6 +23,8 @@ AUX mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch 2324 RMD160 a71d7fdebcb409947f6
 AUX mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch 1502 RMD160 bf7503b9c10fc903b31f85ee3f38efe57fa5489a SHA1 de44ba3e404bb44ea57a663938b91a0c9c51fb5b SHA256 701fd49be77c97ca53b1cfcf9e6a2c0afb37793a3827d453d45c4587cdd4ba41
 AUX mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch 436 RMD160 26a2be74db7ec3ac72ab579fe42709ecae9b28e1 SHA1 1a87cb97e744911bb862a7e12f0c00295a0a1666 SHA256 d27054521019fb938fadd0d292bc6c4be094823683ea4735bf4c43c238e919f4
 AUX mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch 791 RMD160 b4e91bb9b82be8768f738fbb0d7a8a49ef1d23b1 SHA1 4bb8b95dc810e6de81c2b80a1bf137015f29ab02 SHA256 a2ab67cf1ce9086e8ba1cc7c6fc674fee3992fb468f78712a066b98530a2dc4f
+AUX mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch 650 RMD160 881de8faf57ff714e0f8190f80a381d198aff698 SHA1 ce2fdb98108c9eb2e5722a2ee9bc6795603160e8 SHA256 7bd951ca19197ddea5b07ec39bfade83ade4bea67c5c47d9c07b1ce6e71dc028
+AUX mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch 807 RMD160 d86732756ed0c7ae3bb49625bec9f482e016c5e2 SHA1 268ae8d44099248dbe78225113333424b4e5ffa3 SHA256 cb44ce263b3bcf1f4687bfd7728958ec961f16f047e59bda7486e6228801588a
 AUX mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch 725 RMD160 9125bf147ba4be50821d38301af361844e176b2e SHA1 6f11d93ac397b15d01fe6ede010a29998743356f SHA256 633cbff8666d49e1a02c348e27f7cec1046460581d3af1f5c73905ba6ff4a564
 AUX mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch 634 RMD160 c7eb6d6977b8b43b5ef84cb5dede58bb5018a02c SHA1 381bca1965f0fe2a13429f68872901dfcfe5f07f SHA256 b25f814ec615e5240fc2d449b0b41e3d20d6c862d0131bcc1d0e3d876244470b
 AUX mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
@@ -36,6 +38,6 @@ DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80
 EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 f8df0550896b4ca3b6b81e06a2bb657c6fb429e3 SHA1 a8a7da268bcbb48384a4930eae472f08575a579f SHA256 86e66961cbef99cb844de77c0ea7177e24890a3830debe8caab5bfa4424e9d74
-EBUILD mutt-1.5.20-r8.ebuild 9340 RMD160 e85d61e43e0bea394acd1c917a14dd32df8ad0cf SHA1 8b46e61fc5500e8ca3e00a90e407f3f732a642f5 SHA256 aa27f553513524cb662a5efd4d12c87b916354efef4537532a8c2b15ff1979e4
-MISC ChangeLog 37285 RMD160 fb8e52986617229183ebd18a9b49dfb35496aad0 SHA1 471ead0702798a50eb36523b179abf2ddeaaf6d2 SHA256 aef75e5478c6ea37a13966e7d3ebc00e195d9220b4981aa35e02fb67730b1a7b
+EBUILD mutt-1.5.20-r9.ebuild 9485 RMD160 3dfa44d68987c104e8d64d2afa06ee0556234b63 SHA1 7dc470e4188b1ccdc9f4f511c77a3da5c80d47f2 SHA256 ca1516d6a591a6b235b23d487638491dad588c15fe1746cca18717013c83bce1
+MISC ChangeLog 37667 RMD160 31374b32f493f47669ef290945c26a3d167e158a SHA1 0aa08a089351ba688930ca0e18c7bbdf158be268 SHA256 ce841a8fb6050fa22302ecf30047280be7b4bbf74f9d2285f51c0f3a976049c0
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch b/mail-client/mutt/files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
new file mode 100644
index 000000000000..a75c434ee76f
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
@@ -0,0 +1,22 @@
+http://dev.mutt.org/hg/mutt/rev/b7d2cb7c7ce1
+
+# HG changeset patch
+# User Daniel Jacobowitz <dan@debian.org>
+# Date 1260514342 28800
+# Node ID b7d2cb7c7ce19e67444412d0bc840a4e7ddf303f
+# Parent  1cf34ea1f12864efa1c3f4481fc409ed6c8e11eb
+Do not store header color in hcache.
+If the color directive is removed from muttrc, the cached value from
+the last directive would otherwise still be in effect.
+
+--- a/hcache.c	Mon Dec 07 23:08:47 2009 -0800
++++ b/hcache.c	Thu Dec 10 22:52:22 2009 -0800
+@@ -624,6 +624,7 @@
+   nh.limited = 0;
+   nh.num_hidden = 0;
+   nh.recipient = 0;
++  nh.pair = 0;
+   nh.attach_valid = 0;
+   nh.path = NULL;
+   nh.tree = NULL;
+
diff --git a/mail-client/mutt/files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch b/mail-client/mutt/files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
new file mode 100644
index 000000000000..8b5e0f89159a
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
@@ -0,0 +1,29 @@
+http://dev.mutt.org/trac/changeset/736b6af3c5f1
+http://dev.mutt.org/trac/ticket/3362
+
+Fix off-by-one errors in mailcap parser. Closes #3362
+
+
+Index: rfc1524.c
+===================================================================
+--- rfc1524.c (revision 5827:776ef9dbe4d2)
++++ rfc1524.c (revision 6033:736b6af3c5f1)
+@@ -69,7 +69,8 @@
+     mutt_sanitize_filename (type, 0);
+ 
+-  while (command[x] && x<clen && y<sizeof(buf)) 
+-  {
+-    if (command[x] == '\\') {
++  while (x < clen && command[x] && y < sizeof (buf) - 1)
++  {
++    if (command[x] == '\\')
++    {
+       x++;
+       buf[y++] = command[x++];
+@@ -86,5 +87,5 @@
+ 
+ 	x++;
+-	while (command[x] && command[x] != '}' && z<sizeof(param))
++	while (command[x] && command[x] != '}' && z < sizeof (param) - 1)
+ 	  param[z++] = command[x++];
+ 	param[z] = '\0';
diff --git a/mail-client/mutt/mutt-1.5.20-r8.ebuild b/mail-client/mutt/mutt-1.5.20-r9.ebuild
index 38736b3a91bc..eb641a719dd1 100644
--- a/mail-client/mutt/mutt-1.5.20-r8.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r8.ebuild,v 1.7 2009/12/08 13:36:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r9.ebuild,v 1.1 2009/12/15 18:06:31 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -102,6 +102,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \