diff options
| author | Chris Rees <crees@FreeBSD.org> | 2012-07-22 09:15:04 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2012-07-22 09:15:04 +0000 |
| commit | bb040dde3e08355fc3ff13644072333bff22f964 (patch) | |
| tree | 48afad7ae2c1b5fd6c866fadb03127860561cb60 /mail/mutt-devel/files/patch-smime-self | |
| parent | - Upgrade to 0.12.3.ja2. (diff) | |
Move mail/mutt to mail/mutt14
Move mail/mutt-lite to mail/mutt14-lite
Move mail/mutt-devel to mail/mutt
Moving mail/mutt-devel-lite to mail/mutt-lite will follow next to avoid
breaking the cvs exporter
PR: ports/169546
Suggested by: obrien
Approved by: maintainer
Diffstat (limited to 'mail/mutt-devel/files/patch-smime-self')
| -rw-r--r-- | mail/mutt-devel/files/patch-smime-self | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/mail/mutt-devel/files/patch-smime-self b/mail/mutt-devel/files/patch-smime-self deleted file mode 100644 index d8b0e7b8d336..000000000000 --- a/mail/mutt-devel/files/patch-smime-self +++ /dev/null @@ -1,66 +0,0 @@ -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 @@ - if ((WithCrypto & APPLICATION_SMIME) - && (msg->security & APPLICATION_SMIME)) - { -- if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, -- keylist))) -+ char *new_keylist = keylist; -+ -+ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == M_YES) -+ { -+ int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */ -+ new_keylist = safe_malloc(size); -+ snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey); -+ } -+ -+ tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist); -+ safe_free((void **)&new_keylist); -+ if (!tmp_pbody) - { - /* signed ? free it! */ - return (-1); ---- init.h.orig 2009-02-06 13:43:14.000000000 +0100 -+++ init.h 2009-02-06 13:46:53.000000000 +0100 -@@ -1957,6 +1957,11 @@ - ** not used. - ** (S/MIME only) - */ -+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, 1 }, -+ /* -+ ** .pp -+ ** Encrypt the message to smime_default_key too. -+ */ - { "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, 0 }, - /* - ** .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, - OPT_FORWEDIT, - OPT_INCLUDE, -+ OPT_SMIMEENCRYPTSELF, - OPT_MFUPTO, - OPT_MIMEFWD, - OPT_MIMEFWDREST, ---- contrib/smime.rc.orig Sat Mar 2 13:11:35 2002 -+++ contrib/smime.rc Sat Oct 25 17:56:28 2003 -@@ -23,9 +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 - --# Uncommen to make mutt ask what key to use when trying to decrypt a message. -+# 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 - |
