diff options
author | Niclas Zeising <zeising@FreeBSD.org> | 2020-06-29 14:58:48 +0000 |
---|---|---|
committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-06-29 14:58:48 +0000 |
commit | 2cbbd49ac627ee683bfeb3aa4834934b9871bfbd (patch) | |
tree | 3fa27a3162f7f6dbb4d60084e05096378577a7e9 /mail/mutt/files/extra-smime-sender | |
parent | 155f180f89a3593a17c385b6071c9e592c984125 (diff) | |
download | ports-2cbbd49ac627ee683bfeb3aa4834934b9871bfbd.tar.gz ports-2cbbd49ac627ee683bfeb3aa4834934b9871bfbd.zip |
MFH: r530651 r534246 r535833 r536629 r538859 r540343
This updates mail/mutt to 1.14.5
This merges all changes to mail/mutt that have been done to FreeBSD ports
head branch during the 2020Q2 period. This is needed in order to update
mail/mutt to 1.14.5 in order to fix security issues.
mail/mutt: upgrade 1.13.4 -> 1.13.5
- Bring back vvv quote/initials patches
- Remove NNTP option (XML as well)
- Update default option patches context
PR: 245175
Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=158542977114051&w=2
mail/mutt: update 1.13.5 -> 1.14.0
- Default DEBUG option
(very small performance impact and ~4% binary size increase)
PR: 246270
Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes: http://www.mutt.org/relnotes/1.14/
mail/mutt: update 1.14.0 -> 1.14.1
- Rename DEBUG option to DEBUG_LOGS
- Add lang/perl5 deps that triggers a Muttrc rebuild
- Make smime patch optional due to perl build deps.
- Remove unnecessary doc patches and REINPLACE_CMD
- Move build changing patches to make targets
- ASPELL updates the (pre)built Muttrc to not require a rebuild
PR: 246559
Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=158965668315387&w=2
mail/mutt: Update to 1.14.2
ChangeLog: http://www.mutt.org/
PR: 246731
Submitted by: dereks@lifeofadishwasher.com (maintainer)
mail/mutt: Update to 1.14.3
- Update to 1.14.3
- Muttrc removed from dist. making perl a BUILD_DEPENDS
- manual.txt removed from dist. making lynx a DOCS_BUILD_DEPENDS
- Remove MASTER_SITES not updated or can't connect
PR: 247266
Submitted by: Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes: https://marc.info/?l=mutt-users&m=159217236324614&w=2
mail/mutt: Update to 1.14.5
Update mail/mutt to 1.14.5, this is a security fix release, with fixes for
CVE-2020-14093 and CVE-2020-14954
PR: 247400
Submitted by: Derek Schrock
Security: 5b397852-b1d0-11ea-a11c-4437e6ad11c4
29b13a34-b1d2-11ea-a11c-4437e6ad11c4
Approved by: ports-secteam (joenum)
Notes
Notes:
svn path=/branches/2020Q2/; revision=540778
Diffstat (limited to 'mail/mutt/files/extra-smime-sender')
-rw-r--r-- | mail/mutt/files/extra-smime-sender | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/mail/mutt/files/extra-smime-sender b/mail/mutt/files/extra-smime-sender new file mode 100644 index 000000000000..351bba964cc6 --- /dev/null +++ b/mail/mutt/files/extra-smime-sender @@ -0,0 +1,39 @@ +--- commands.c.orig 2020-05-02 21:08:56 UTC ++++ commands.c +@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur) + { + if (cur->security & GOODSIGN) + { +- if (!crypt_smime_verify_sender(cur)) ++ if (option(OPTSMIMENOSENDER) || !crypt_smime_verify_sender(cur)) + mutt_message ( _("S/MIME signature successfully verified.")); + else + mutt_error ( _("S/MIME certificate owner does not match sender.")); +--- init.h.orig 2020-05-05 02:09:33 UTC ++++ init.h +@@ -3608,6 +3608,15 @@ struct option_t MuttVars[] = { + ** to determine the key to use. It will ask you to supply a key, if it can't find one. + ** (S/MIME only) + */ ++ { "smime_dont_check_sender", DT_BOOL, R_NONE, {.l=OPTSMIMENOSENDER}, {.l=0} }, ++ /* ++ ** .pp ++ ** This flag controls wether you want the skip the check for the sender's ++ ** email address against the email address stored in the certificate. ++ ** This can be useful if most of your email senders use SMIMEv3 which no ++ ** longer needs email-addresses as part of the certificates. ++ ** It is not set by default. ++ */ + { "smime_self_encrypt_as", DT_SYN, R_NONE, {.p="smime_default_key"}, {.p=0} }, + { "smime_default_key", DT_STR, R_NONE, {.p=&SmimeDefaultKey}, {.p=0} }, + /* +--- mutt.h.orig 2020-05-05 02:09:33 UTC ++++ mutt.h +@@ -596,6 +596,7 @@ enum + OPTSMIMEISDEFAULT, + OPTSMIMESELFENCRYPT, + OPTASKCERTLABEL, ++ OPTSMIMENOSENDER, + OPTSDEFAULTDECRYPTKEY, + OPTPGPIGNORESUB, + OPTPGPCHECKEXIT, |