X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4988a192dab00d86203bd44995b53284abfa1474..0ca86972afbf27082baed26631273e0fc78e8c6b:/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime?ds=sidebyside

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 07feee8..de5a7ac 100644
--- 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,12 +1,8 @@
-diff -ruN mutt.orig/PATCHES mutt/PATCHES
---- mutt.orig/PATCHES	2003-09-13 16:23:24.000000000 +0200
-+++ mutt/PATCHES	2003-09-13 16:21:53.000000000 +0200
-@@ -1,0 +1 @@
-+patch-1.5.4.vk.pgp_verbose_mime
-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
+@@ -241,6 +241,8 @@
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;
@@ -15,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
+@@ -1790,6 +1790,18 @@
+   ** checked with the \fC$<check-traditional-pgp>\fP function, mutt will automatically
+   ** check the message for traditional pgp.
    */
 +  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
 +  /*
@@ -36,11 +31,10 @@ diff -ruN mutt.orig/init.h mutt/init.h
 +  */
  
    /* 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
+@@ -1113,6 +1113,8 @@
    t->disposition = DISPINLINE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */