From 60ca0dfbd7d169a474cfcc51f90b2106a4452f2f Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 23 Jul 2009 13:50:19 +0000
Subject: Revision bump for some new fixes from upstream. (Portage version:
 2.2.00.13849-prefix/cvs/Darwin powerpc)

---
 .../mutt-1.5.20-gpgme-keys-d41e043fa775.patch      | 19 ++++++++++
 ....5.20-hcache-restore-address-848f08512bf3.patch | 41 ++++++++++++++++++++++
 .../mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch  | 16 +++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 mail-client/mutt/files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
 create mode 100644 mail-client/mutt/files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
 create mode 100644 mail-client/mutt/files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch

(limited to 'mail-client/mutt/files')

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;
+ }
-- 
cgit v1.2.3-65-gdbad