Fix bug 54177: Increase range of pgp_timeout setting with patch from http://www.woolridge.ca/mutt/

4 files changed, 16 insertions, 8 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 93c72bc9d81e..67967c252676 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.10 2004/07/23 11:32:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.11 2004/07/29 13:37:41 agriffis Exp $
+
+  29 Jul 2004; Aron Griffis <agriffis@gentoo.org> mutt-1.5.6-r2.ebuild:
+  Fix bug 54177: Increase range of pgp_timeout setting with patch from
+  http://www.woolridge.ca/mutt/
 
   23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> mutt-1.5.6-r2.ebuild:
   Added to macos, closing bug #57947
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2eae39034689..9923cbfaea99 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,12 @@
-MD5 db3444e89fdc969c3544867070e2a844 ChangeLog 10690
-MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
+MD5 61f33a5355c3994d052bc47ebdf55e5b mutt-1.5.6-r2.ebuild 4607
 MD5 3bc11a07cdaa6226928c752afc138409 mutt-1.4.2.1.ebuild 3367
-MD5 f274e0de2d93a432a06caf86548e8b0f mutt-1.5.6-r2.ebuild 4454
 MD5 dd65ccffaac6cf0b0058daf1f95d0cec mutt-1.5.6.ebuild 4224
-MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
+MD5 416e6be2dccd3efdc3017fd451f9443f ChangeLog 10869
+MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 b2b515e96b060771a00646405c620755 files/Muttrc 678
+MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
+MD5 e08df5d4149c013ae822ece39ecf6d5d files/digest-mutt-1.5.6-r2 517
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
-MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
-MD5 7c84826c8250c278a094d039bb91c6b1 files/digest-mutt-1.5.6-r2 446
+MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r2 b/mail-client/mutt/files/digest-mutt-1.5.6-r2
index 9f44628eedf0..15dbc4309d7c 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r2
+++ b/mail-client/mutt/files/digest-mutt-1.5.6-r2
@@ -4,3 +4,4 @@ MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
 MD5 fa7dae5a50ecb9e79c20cb3c5f695478 patch-1.5.6.vvv.nntp-gentoo-r1.bz2 83418
 MD5 b901329a115d23ff8e6db8cfd1a0d39e mutt-cvs-maildir-header-cache.16 23431
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
index 6875bdfb8a1e..b7aa262ba925 100644
--- a/mail-client/mutt/mutt-1.5.6-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.8 2004/07/23 11:32:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.6-r2.ebuild,v 1.9 2004/07/29 13:37:41 agriffis Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
@@ -10,6 +10,7 @@ compressed_patch="patch-${PV}.rr.compressed.gz"
 nntp_patch="patch-${PV}.vvv.nntp-gentoo-r1.bz2"
 mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
 maildir_header_cache_patch="mutt-cvs-maildir-header-cache.16"
+pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
 
 DESCRIPTION="a small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org"
@@ -20,6 +21,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
 		nntp? ( mirror://gentoo/${nntp_patch} )
 		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${maildir_header_cache_patch}
+		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
 	)"
 #	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
 #	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
@@ -58,6 +60,7 @@ src_unpack() {
 		epatch ${DISTDIR}/${edit_threads_patch}
 		epatch ${DISTDIR}/${mbox_hook_patch}
 		epatch ${DISTDIR}/${maildir_header_cache_patch}
+		epatch ${DISTDIR}/${pgp_timeout_patch}
 		use nntp && epatch ${DISTDIR}/${nntp_patch}
 
 		# The following steps are necessary for the nntp patch and the