1 files changed, 34 insertions, 33 deletions
diff --git a/mail/mutt-devel/files/extra-patch-pgp-outlook b/mail/mutt-devel/files/extra-patch-pgp-outlook
index f18d58aab7d6..a6f589ddb59d 100644
--- a/mail/mutt-devel/files/extra-patch-pgp-outlook
+++ b/mail/mutt-devel/files/extra-patch-pgp-outlook
@@ -20,17 +20,16 @@
    OPT_PGPTRADITIONAL, /* create old-style PGP messages */
 +  OPT_PGPOUTLOOK,     /* Create even older broken outlook compatible messages */
  #endif
---- pgp.c.orig	Mon Feb 12 08:55:21 2001
-+++ pgp.c	Sat Feb 24 18:11:40 2001
-@@ -1501,12 +1501,20 @@
+--- pgp.c.orig	Thu Apr  4 08:49:50 2002
++++ pgp.c	Sun May  5 13:57:57 2002
+@@ -1399,11 +1399,20 @@
    
    b->encoding = ENC7BIT;
  
--  b->type = TYPEAPPLICATION;
--  b->subtype = safe_strdup ("pgp");
--
--  mutt_set_parameter ("format", "text", &b->parameter);
--  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
+-  b->type = TYPETEXT;
+-  b->subtype = safe_strdup ("plain");
+-  
+-  mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
 -		      &b->parameter);
 +  /* Outlook seems to work by scanning the message itself for PGP information, */
 +  /* not the headers.  If the headers are anything but text/plain, it will */
@@ -43,34 +42,36 @@
 +    b->subtype = safe_strdup ("pgp");
 +
 +    mutt_set_parameter ("format", "text", &b->parameter);
-+    mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
++    mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
 +		        &b->parameter);
 +  }
- 
-   b->filename = safe_strdup (pgpoutfile);
+   mutt_set_parameter ("charset", send_charset, &b->parameter);
    
-@@ -1559,8 +1567,13 @@
-   {
-     if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)
-       return -1;
--    else if (i == M_YES)
-+    else if (i == M_YES) {
-       traditional = 1;
-+    if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
-+      return -1;
-+    else if (i == M_YES)
-+      flags |= PGPOUTLOOK;
-+    }
-   }
- 
-   mutt_message _("Invoking PGP...");
---- pgplib.h.orig	Mon Feb 12 08:56:00 2001
-+++ pgplib.h	Sat Feb 24 18:12:25 2001
-@@ -23,6 +23,7 @@
- #define PGPSIGN     (1 << 1)
- #define PGPKEY      (1 << 2)
- #define PGPGOODSIGN (1 << 3)
-+#define PGPOUTLOOK   (1 << 4)
+   b->filename = safe_strdup (pgpoutfile);
+--- pgplib.h.orig	Sun Feb  3 10:34:23 2002
++++ pgplib.h	Sun May  5 14:01:30 2002
+@@ -25,6 +25,7 @@
+ #define PGPSIGN     (APPLICATION_PGP | SIGN)
+ #define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
+ #define PGPKEY      (APPLICATION_PGP | (1 << 3))
++#define PGPOUTLOOK  (APPLICATION_PGP | (1 << 4))
  
  #define KEYFLAG_CANSIGN 		(1 <<  0)
  #define KEYFLAG_CANENCRYPT 		(1 <<  1)
+--- crypt.c.orig	Tue Mar 26 23:23:11 2002
++++ crypt.c	Sun May  5 13:53:52 2002
+@@ -184,8 +184,13 @@
+     {
+       if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an inline PGP message?"))) == -1)
+ 	return -1;
+-      else if (i == M_YES)
++      else if (i == M_YES) {
+ 	traditional = 1;
++	if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
++	  return -1;
++	else if (i == M_YES)
++	  flags |= PGPOUTLOOK;
++      }
+     }
+     if (traditional)
+     {