From a45f532ad81e7bb6f370cd20e5f02d666d88b352 Mon Sep 17 00:00:00 2001
From: Antonio Radici <antonio@dyne.org>
Date: Wed, 2 Dec 2009 22:38:59 +0000
Subject: [PATCH] upstream/548577-gpgme-1.2.patch: do not fail to open pgp
 signed message with libgpgme >= 1.2 (Closes: 548577)

---
 debian/changelog                              |  4 ++-
 debian/patches/series                         |  2 ++
 .../patches/upstream/548577-gpgme-1.2.patch   | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/upstream/548577-gpgme-1.2.patch

diff --git a/debian/changelog b/debian/changelog
index 1d3f90b..27ceeef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ mutt (1.5.20-5) unstable; urgency=low
       server sends additional headers and mutt segfaults (Closes: 537694)
     + upstream/393926-internal-viewer.patch: revert the patch and add the
       auto_view of text/x-diff (Closes: 546760, 549158)
+    + upstream/548577-gpgme-1.2.patch: do not fail to open pgp signed message
+      with libgpgme >= 1.2 (Closes: 548577)
 
- -- Antonio Radici <antonio@dyne.org>  Wed, 16 Sep 2009 22:31:22 +0100
+ -- Antonio Radici <antonio@dyne.org>  Wed, 02 Dec 2009 22:38:00 +0000
 
 mutt (1.5.20-4) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index badc36f..b5e3544 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,6 +48,8 @@ upstream/544180-italian-yesorno.patch
 upstream/542817-smimekeys-tmpdir.patch
 upstream/544794-smtp-batch.patch
 upstream/537694-segv-imap-headers.patch
+upstream/548577-gpgme-1.2.patch
+
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
diff --git a/debian/patches/upstream/548577-gpgme-1.2.patch b/debian/patches/upstream/548577-gpgme-1.2.patch
new file mode 100644
index 0000000..14dfba8
--- /dev/null
+++ b/debian/patches/upstream/548577-gpgme-1.2.patch
@@ -0,0 +1,27 @@
+this patch fixes upstream bug http://bugs.mutt.org/3300 so that
+mutt will be able to open pgp crypted/signed message with gpgme
+
+--- a/init.c
++++ b/init.c
+@@ -51,6 +51,10 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ 
++#if defined(CRYPT_BACKEND_GPGME)
++#include <gpgme.h>
++#endif
++
+ #define CHECK_PAGER \
+   if ((CurrentMenu == MENU_PAGER) && (idx >= 0) &&	\
+ 	    (MuttVars[idx].flags & R_RESORT)) \
+@@ -3266,6 +3270,10 @@
+ 
+   mutt_read_histfile ();
+ 
++#ifdef CRYPT_BACKEND_GPGME
++  gpgme_check_version (NULL);
++#endif
++
+ #if 0
+   set_option (OPTWEED); /* turn weeding on by default */
+ #endif
-- 
2.43.0