diff options
Diffstat (limited to 'mail/mutt/files/patch-smime-self')
| -rw-r--r-- | mail/mutt/files/patch-smime-self | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/mail/mutt/files/patch-smime-self b/mail/mutt/files/patch-smime-self index 3d656129104b..c6fc5121d30b 100644 --- a/mail/mutt/files/patch-smime-self +++ b/mail/mutt/files/patch-smime-self @@ -1,7 +1,22 @@ -Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2 ---- crypt.c 7 Mar 2003 08:23:27 -0000 3.17 -+++ crypt.c 7 May 2003 14:57:00 -0000 -@@ -246,8 +246,18 @@ +--- contrib/smime.rc.orig 2016-10-08 19:30:21 UTC ++++ contrib/smime.rc +@@ -23,8 +23,12 @@ set crypt_verify_sig = yes + + # The (default) keyfile for signing/decrypting. Uncomment the following + # line and replace the keyid with your own. +-set smime_default_key="12345678.0" ++# set smime_default_key="12345678.0" + ++# Uncomment the following line in addition to the one above, if you want that ++# all encrypted messages are also encrypted with your default key. ++# set smime_encrypt_self = yes ++ + # Uncomment to make mutt ask what key to use when trying to decrypt a message. + # It will use the default key above (if that was set) else. + # unset smime_decrypt_use_default_key +--- crypt.c.orig 2016-10-08 19:35:50 UTC ++++ crypt.c +@@ -231,8 +231,18 @@ int mutt_protect (HEADER *msg, char *key if ((WithCrypto & APPLICATION_SMIME) && (msg->security & APPLICATION_SMIME)) { @@ -22,9 +37,9 @@ Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2 { /* signed ? free it! */ return (-1); ---- init.h.orig 2015-09-10 09:06:48.000000000 +0200 -+++ init.h 2015-09-10 09:08:24.000000000 +0200 -@@ -2748,6 +2748,11 @@ +--- init.h.orig 2016-10-08 19:35:50 UTC ++++ init.h +@@ -2971,6 +2971,11 @@ struct option_t MuttVars[] = { ** possible \fCprintf(3)\fP-like sequences. ** (S/MIME only) */ @@ -36,30 +51,13 @@ Base: http://descolada.dartmouth.edu/mutt/patch-1.5.4+-ow.smime-encrypt-self.2 { "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" }, /* ** .pp -diff -u -d -b -B -r3.18 mutt.h ---- mutt.h.orig Thu Nov 6 08:15:51 2003 -+++ mutt.h Thu Nov 6 08:16:43 2003 -@@ -275,6 +275,7 @@ - OPT_DELETE, +--- mutt.h.orig 2016-10-08 19:30:21 UTC ++++ mutt.h +@@ -263,6 +263,7 @@ enum OPT_FORWEDIT, + OPT_FCCATTACH, OPT_INCLUDE, + OPT_SMIMEENCRYPTSELF, OPT_MFUPTO, OPT_MIMEFWD, OPT_MIMEFWDREST, ---- contrib/smime.rc.orig 2015-08-30 19:06:38.000000000 +0200 -+++ contrib/smime.rc 2015-09-10 09:14:20.000000000 +0200 -@@ -23,8 +23,12 @@ - - # The (default) keyfile for signing/decrypting. Uncomment the following - # line and replace the keyid with your own. --set smime_default_key="12345678.0" -+# set smime_default_key="12345678.0" - -+# Uncomment the following line in addition to the one above, if you want that -+# all encrypted messages are also encrypted with your default key. -+# set smime_encrypt_self = yes -+ - # Uncomment to make mutt ask what key to use when trying to decrypt a message. - # It will use the default key above (if that was set) else. - # unset smime_decrypt_use_default_key |