Add another upstream patch. Solve a partial hang on IMAP connection errors.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 28 insertions, 4 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 6f1128ce1fa3..c50075b0da76 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.135 2009/06/28 10:44:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.136 2009/06/29 09:04:52 grobian Exp $
+
+  29 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch,
+  mutt-1.5.20.ebuild:
+  Add another upstream patch.  Solve a partial hang on IMAP connection errors.
 
 *mutt-1.5.20 (28 Jun 2009)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a3e6e6ac2f10..74dd965c0c8d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -12,6 +12,7 @@ AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d7
 AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
 AUX mutt-1.5.20-header-weeding-f40de578e8ed.patch 619 RMD160 3f6e4b734f6857d0ccef60df0a1b3d21e86584ae SHA1 76487cf18f0d7ff43441e70a6902298990c2cd3a SHA256 f06b539879b4bf7cf511f7ca03d02bb4ff8dd28a864ad7dc7cf498416c20d17c
 AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e1675dca18f1f5a7baeb2c9dbaa SHA1 422621d233b5414987b2153ea81037622ed3158c SHA256 d2042d4b7ba37bfcf3173af243368a2b05f5db51a09cdbe11c3f225491d84fd0
+AUX mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch 451 RMD160 ce68b1841fa9b05cf2e30a7cb53d3475c674081a SHA1 92e8f2bbcfeb9812f727364759f58a0e3656b4fc SHA256 ed7e9295959fad0c0702550e36d83e786bec5a041a74680c3289d1698d0c8435
 AUX mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch 2324 RMD160 a71d7fdebcb409947f664b96f1e7d808974f5101 SHA1 035cfaa9290121b3c6c7e57fbda94495239162d3 SHA256 adc78114cc72efb181f20050b24358d2b3959bd78b8795c8245d6049e00ab5fa
 AUX mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch 1502 RMD160 bf7503b9c10fc903b31f85ee3f38efe57fa5489a SHA1 de44ba3e404bb44ea57a663938b91a0c9c51fb5b SHA256 701fd49be77c97ca53b1cfcf9e6a2c0afb37793a3827d453d45c4587cdd4ba41
 AUX mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch 455 RMD160 63b73ed21d42d0849f38ef1098029c64933c47a5 SHA1 9da6a6914d3ae276887efd1a30ed3ea55bc57bcb SHA256 7d44b98e8f7538ce85ddb80877a0caabd1edcfd5e558258896d50691c51a3d0e
@@ -30,6 +31,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 SHA1 9a34328905989c05c7ebc5892c0e8151433897b0 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 3317bb5ee6c7d076c141fc1dc4998116872a32f8 SHA1 c9786de58bfa87b6ed392fb6190cc0bf69df8464 SHA256 d5c91dc2f7c620a36f690b56560ba8f5122b21c65259310366e245d3a660a692
-EBUILD mutt-1.5.20.ebuild 6798 RMD160 46170854b0d4405b51b2964cfdc5ca5975d87848 SHA1 5793760b162937dea54829cc672cbc1ea27583ef SHA256 06f11da54bbd07367eaba8921a0899eb07ce15b20f95907cd5192eaca6de9814
-MISC ChangeLog 30808 RMD160 126eb2d1e0ec27988b3b7a8ad60b4b5de8151606 SHA1 f256db33a9dca18c44aee1ff05e4d28784009927 SHA256 8ff856e32ae0920ca9a6f7a4e65e96fa1726802d006a6ddf1147cd65deac7b9f
+EBUILD mutt-1.5.20.ebuild 6868 RMD160 a97f1732ef08cba484825195b6cc93dd5576c5b2 SHA1 5676db909e3dd83eed94d45c2a92f76a3c294e3c SHA256 efc6f81634ff40cdd56c64dd9e055519092464a4521fbe4ae6112fa37ab60e51
+MISC ChangeLog 31019 RMD160 47e417146dee8a42cb02e44e4a1b0980b89d8b37 SHA1 106826e19fd37f88f8d41b3d4e5698036f786300 SHA256 4429bda914835b755c662620a08e89c1d0a5b7995293900103ae015685412bee
 MISC metadata.xml 553 RMD160 39ed7b190e5bf898f53b3ab6e071593ae3327eb8 SHA1 9cd6777e4563f035716b15fcb62dd95393ae7772 SHA256 91c70bd34eda2e3e33dfebd4a92bff235704d9b256f8b84815fdc4e6607c8069
diff --git a/mail-client/mutt/files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch b/mail-client/mutt/files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
new file mode 100644
index 000000000000..2bb44517b218
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
@@ -0,0 +1,17 @@
+http://dev.mutt.org/trac/changeset/fe30f394cbe6
+
+Not being able to start an IMAP command is a fatal error.
+Closes #3155.
+
+Index: imap/command.c
+===================================================================
+--- imap/command.c (revision 5651:aac0c04727c0)
++++ imap/command.c (revision 5955:fe30f394cbe6)
+@@ -234,7 +234,4 @@
+ 
+   if ((rc = cmd_start (idata, cmdstr, flags)) < 0)
+-    return rc;
+-
+-  if (rc < 0)
+   {
+     cmd_handle_fatal (idata);
diff --git a/mail-client/mutt/mutt-1.5.20.ebuild b/mail-client/mutt/mutt-1.5.20.ebuild
index 395e6d4eada1..de6665f97a59 100644
--- a/mail-client/mutt/mutt-1.5.20.ebuild
+++ b/mail-client/mutt/mutt-1.5.20.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.ebuild,v 1.1 2009/06/28 10:44:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20.ebuild,v 1.2 2009/06/29 09:04:52 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -81,6 +81,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
 
 	if use !vanilla && use !sidebar ; then
 		use nntp || rm "${PATCHDIR}"/06-nntp.patch