summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-06-29 09:04:53 +0000
committerFabian Groffen <grobian@gentoo.org>2009-06-29 09:04:53 +0000
commit4dcb8166ec167e0a6ff69626d4d6ffc3b8d2a364 (patch)
tree2b082d3119f2e549dadc458ff7b30f578782756b /mail-client
parentVersion bump. (diff)
downloadgentoo-2-4dcb8166ec167e0a6ff69626d4d6ffc3b8d2a364.tar.gz
gentoo-2-4dcb8166ec167e0a6ff69626d4d6ffc3b8d2a364.tar.bz2
gentoo-2-4dcb8166ec167e0a6ff69626d4d6ffc3b8d2a364.zip
Add another upstream patch. Solve a partial hang on IMAP connection errors.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/mutt/ChangeLog7
-rw-r--r--mail-client/mutt/files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch17
-rw-r--r--mail-client/mutt/mutt-1.5.20.ebuild3
3 files changed, 25 insertions, 2 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/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