Revision bump for some new fixes from upstream.

Package-Manager: portage-2.2.00.13849-prefix/cvs/Darwin powerpc

6 files changed, 94 insertions, 4 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index ef55ecb0deed..811a620285e8 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.141 2009/07/21 17:31:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.142 2009/07/23 13:50:19 grobian Exp $
+
+*mutt-1.5.20-r3 (23 Jul 2009)
+
+  23 Jul 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.20-r2.ebuild,
+  +mutt-1.5.20-r3.ebuild, +files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch,
+  +files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch,
+  +files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch:
+  Revision bump for some new fixes from upstream.
 
   21 Jul 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r2.ebuild,
   +files/mutt-1.5.20-gpgme-1.2.0.patch:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 36751bc0160e..faaf9aa8a12f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -11,12 +11,15 @@ AUX mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch 12414 RMD160 6759b26
 AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d78d2790bfbfbb9a5d2499e179c8ae1 SHA1 d23cab55003763d79475ef4eb95c10504dad323f SHA256 54da63a9ce41c3704a3b96288de7b8d24ef1305a9b27306c8178e900a81f196b
 AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
 AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
+AUX mutt-1.5.20-gpgme-keys-d41e043fa775.patch 589 RMD160 99b4b44459952afa55db43c5e30f204b3cae797e SHA1 432938b1876fdb95c1bfbd0ab79f6ae8430fe5e9 SHA256 9ea0850343eb54be14f58532bf4bf2a6e5ad970c43ece56e185d693eb50966e8
+AUX mutt-1.5.20-hcache-restore-address-848f08512bf3.patch 1150 RMD160 2df8927ac9b470fa6be814a66ef1dcfcb8cbdf9c SHA1 1423af5422eda09c7c7d5590f19318f7721d9e1d SHA256 86d983f4b61a4449ae148a24dc7ba1749a4b0b5848556dee5de87589a6e39cc3
 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-leave-mailbox-no-new-mail-118b8fef8aae.patch 2209 RMD160 e5cd50a5b7c981851f1e742af4f5cdd7db39b43b SHA1 4c95287f7be617fd8a33759869cc01a5aded266c SHA256 e3893f10940789c9d85646f35af989509ce6f35e49bed21e1cdee92ae7fc827d
 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-mhs-flags-leak-9f3053f75f27.patch 436 RMD160 26a2be74db7ec3ac72ab579fe42709ecae9b28e1 SHA1 1a87cb97e744911bb862a7e12f0c00295a0a1666 SHA256 d27054521019fb938fadd0d292bc6c4be094823683ea4735bf4c43c238e919f4
 AUX mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
 AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch 1131 RMD160 5286dc8809747291e31e1c1a3801ad5efbdc285b SHA1 fe3cc48c0592b5f7775db8f46a5fccfff4a68895 SHA256 8cec9af4bc073faacfec09331fc928ddb9c0b98be11da5c5022fc1af2bdece5f
 AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch 920 RMD160 7d34f480255b232c06cb3487cda2c9d0379107c1 SHA1 f4ab33bc6737ff39a8cdd3d1ee1fd597ec0f9c2a SHA256 89a176154634ee5c8278d553e62da6c244078454da04772c90149ef2e57868ea
@@ -37,6 +40,6 @@ EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed
 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-r1.ebuild 7031 RMD160 fc5bbe19395e6bc0036960ec2ce806b72d02d539 SHA1 646babb8c9b3e293b3e1262543bdf35a4a83b145 SHA256 e537a4334aa9b2f722df8ce3527337ed74cce55121a35aab8d1921061cf90a5b
-EBUILD mutt-1.5.20-r2.ebuild 7679 RMD160 812867af90c911cbc1a4c362de6b176c5a8953de SHA1 820c6abee330239997c08977c9b9b7a3cfae755f SHA256 d182512e4b4cec84a28818883f6ea883639adad7406f3bbc93d3a5ccae8e40d3
-MISC ChangeLog 32333 RMD160 9487f236aa3194d3424a989c1449a71051fd1e01 SHA1 632876df7cec8cbf8d1d066f4c3c8d5efee73f71 SHA256 78262118e6ac150b85ac66e204820b108f9e0f1b4938cf05d3064e11df04d12c
+EBUILD mutt-1.5.20-r3.ebuild 7887 RMD160 4ed6e308f477e85fb8ecb43755f2a22f47baa978 SHA1 4528d73b0bc47157654d585100f5e644f8e44315 SHA256 46cbd711230df4e0ad66c2b0c18c2206b1a0f4fdd2d02d700f9f8619fccbf6ac
+MISC ChangeLog 32686 RMD160 595620b8c62c1b2fd2b203bb2e4b0838106c24a2 SHA1 7342ddf5e9dd83e0c901c564961b250b41469acb SHA256 0ab2f638d13337e875e6c16e7f432f1412908d0aff3927be48658ce259ae2d14
 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b
diff --git a/mail-client/mutt/files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch b/mail-client/mutt/files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
new file mode 100644
index 000000000000..f3e7f1f7666c
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Fabian Groffen <grobian@gentoo.org>
+# Date 1248269159 -7200
+# Node ID d41e043fa7751bc0c82ecb767d756aa228f56db9
+# Parent  848f08512bf303292a8068d3fa074fda73edacd6
+Use CRYPT_BACKEND_GPGME instead of non-existent HAVE_GPGME
+
+--- a/keymap.c	Wed Jul 22 14:43:48 2009 +0200
++++ b/keymap.c	Wed Jul 22 15:25:59 2009 +0200
+@@ -47,7 +47,7 @@
+  { "postpone",	MENU_POST },
+  { "pgp",	MENU_PGP },
+  { "smime",	MENU_SMIME },
+-#ifdef HAVE_GPGME
++#ifdef CRYPT_BACKEND_GPGME
+  { "key_select_pgp",	MENU_KEY_SELECT_PGP },
+  { "key_select_smime",	MENU_KEY_SELECT_SMIME },
+ #endif
+
diff --git a/mail-client/mutt/files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch b/mail-client/mutt/files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
new file mode 100644
index 000000000000..ce4af462d92f
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
@@ -0,0 +1,41 @@
+http://dev.mutt.org/trac/changeset/848f08512bf3
+http://dev.mutt.org/trac/ticket/3302
+
+Properly restore addresses from hcache using rfc822_new_address().
+Closes #3302. (valgrind complaining about ADDRESS.idn_checked)
+
+Index: hcache.c
+===================================================================
+--- hcache.c (revision 5977:f161c2f00d84)
++++ hcache.c (revision 5986:848f08512bf3)
+@@ -46,4 +46,5 @@
+ #include "lib.h"
+ #include "md5.h"
++#include "rfc822.h"
+ 
+ #if HAVE_QDBM
+@@ -232,5 +233,5 @@
+   while (counter)
+   {
+-    *a = safe_malloc(sizeof (ADDRESS));
++    *a = rfc822_new_address();
+ #ifdef EXACT_ADDRESS
+     restore_char(&(*a)->val, d, off, convert);
+Index: rfc822.h
+===================================================================
+--- rfc822.h (revision 5801:19e62bd1549b)
++++ rfc822.h (revision 5986:848f08512bf3)
+@@ -19,4 +19,6 @@
+ #ifndef rfc822_h
+ #define rfc822_h
++
++#include "lib.h"
+ 
+ /* possible values for RFC822Error */
+@@ -61,5 +63,5 @@
+ 
+ #define rfc822_error(x) RFC822Errors[x]
+-#define rfc822_new_address() calloc(1,sizeof(ADDRESS))
++#define rfc822_new_address() safe_calloc(1,sizeof(ADDRESS))
+ 
+ #endif /* rfc822_h */
diff --git a/mail-client/mutt/files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch b/mail-client/mutt/files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
new file mode 100644
index 000000000000..e89dfd5cd2d8
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
@@ -0,0 +1,16 @@
+http://dev.mutt.org/trac/changeset/9f3053f75f27

+http://dev.mutt.org/trac/ticket/3303

+

+Don't leak mhs flags in mh_buffy(). Closes #3303.

+

+

+Index: mh.c

+===================================================================

+--- mh.c (revision 5847:82a581c24f1a)

++++ mh.c (revision 5985:9f3053f75f27)

+@@ -239,4 +239,5 @@

+     if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN)

+       r = 1;

++  mhs_free_sequences (&mhs);

+   return r;

+ }

diff --git a/mail-client/mutt/mutt-1.5.20-r2.ebuild b/mail-client/mutt/mutt-1.5.20-r3.ebuild
index 933358230736..9d780fc1f04b 100644
--- a/mail-client/mutt/mutt-1.5.20-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r3.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-r2.ebuild,v 1.4 2009/07/21 17:31:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r3.ebuild,v 1.1 2009/07/23 13:50:19 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -86,6 +86,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \