upstream/533370-pgp-inline.patch: inline pgp messages now displayed correctly even...

diff --git a/debian/changelog b/debian/changelog
index 83adfd9809a2431a5b1b3f3f3184e04a76166ebb..722580a8f3646cb34111b138e78ef2825e461e19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
       headers (Closes: 474194)
     + upstream/542910-search-segfault.patch: fixes a bug in search which caused
       a segfault (Closes: 542910)
+    + upstream/533370-pgp-inline.patch: inline pgp messages now displayed
+      correctly even if pgp_auto_decode is set (Closes: 533370)
   * debian/control:
     + Standards-Version bumped to 3.8.3
   * debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the

diff --git a/debian/patches/upstream/533370-pgp-inline.patch b/debian/patches/upstream/533370-pgp-inline.patch
new file mode 100644 (file)
index 0000000..a928e7a
--- /dev/null
+++ b/debian/patches/upstream/533370-pgp-inline.patch
@@ -0,0 +1,23 @@
+inline pgp messages were displayed incorrectly when pgp_auto_decode=yes, see
+upstream http://bugs.mutt.org/3269
+
+--- a/crypt-gpgme.c
++++ b/crypt-gpgme.c
+@@ -2371,16 +2371,14 @@
+               safe_fclose (&pgpout);
+             }
+         }
+-#if 0
+       else
+       {
+-        /* why would we want to display this at all? */
++        /* A traditional PGP part may mix signed and unsigned content */
+         /* XXX - we may wish to recode here */
+         if (s->prefix)
+           state_puts (s->prefix, s);
+         state_puts (buf, s);
+       }
+-#endif
+     }
+ 
+   m->goodsig = (maybe_goodsig && have_any_sigs);