test upstream patch to fix 533439

[software/mutt-debian.git] / debian / patches / features-old / patch-1.5.4.vk.pgp_verbose_mime

diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
index 0ea9b735341d6d8d6293ab926e54e5ad1dccf748..e3989f74027deb9a78cda6e465f3cab8de7064d6 100644 (file)
--- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
+++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
@@ -1,7 +1,8 @@
-diff -ruN mutt.orig/globals.h mutt/globals.h
---- mutt.orig/globals.h        2003-09-13 16:23:24.000000000 +0200
-+++ mutt/globals.h     2003-09-13 16:23:18.000000000 +0200
-@@ -195,6 +195,8 @@
+Enable pgp_mime_signature_filename and pgp_mime_signature_description
+
+--- a/globals.h
++++ b/globals.h
+@@ -242,6 +242,8 @@
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;
@@ -10,12 +11,11 @@ diff -ruN mutt.orig/globals.h mutt/globals.h
  
  /*-- formerly in smime.h --*/
  WHERE char *SmimeDefaultKey;
-diff -ruN mutt.orig/init.h mutt/init.h
---- mutt.orig/init.h   2003-09-13 16:23:24.000000000 +0200
-+++ mutt/init.h        2003-09-13 16:21:53.000000000 +0200
-@@ -1458,6 +1458,18 @@
-   ** This option overrides ``$$pgp_create_traditional''
-   ** (PGP only)
+--- a/init.h
++++ b/init.h
+@@ -2551,6 +2551,18 @@
+   ** a line quoted text if it also matches $$smileys. This mostly
+   ** happens at the beginning of a line.
    */
 +  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
 +  /*
@@ -30,12 +30,11 @@ diff -ruN mutt.orig/init.h mutt/init.h
 +  ** PGP/MIME signed messages.
 +  */
  
-   /* XXX Default values! */
-   
-diff -ruN mutt.orig/pgp.c mutt/pgp.c
---- mutt.orig/pgp.c    2003-09-13 16:23:24.000000000 +0200
-+++ mutt/pgp.c 2003-09-13 16:21:53.000000000 +0200
-@@ -998,6 +998,8 @@
+ 
+ 
+--- a/pgp.c
++++ b/pgp.c
+@@ -1131,6 +1131,8 @@
    t->disposition = DISPINLINE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */
@@ -44,7 +43,3 @@ diff -ruN mutt.orig/pgp.c mutt/pgp.c
  
    return (a);
  }
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.4.vk.pgp_verbose_mime