mutt/mutt-1.7.1-cabundle.patch

29 lines
1.4 KiB
Diff
Raw Normal View History

2016-10-09 11:15:36 +00:00
diff -ur mutt-1.7.1.orig/contrib/Makefile.am mutt-1.7.1/contrib/Makefile.am
--- mutt-1.7.1.orig/contrib/Makefile.am 2016-10-09 12:08:41.081976100 +0100
+++ mutt-1.7.1/contrib/Makefile.am 2016-10-09 12:10:16.019451571 +0100
@@ -5,7 +5,7 @@
SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
2016-10-09 11:15:36 +00:00
sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
sample.vimrc-sidebar colors.default colors.linux smime.rc \
- ca-bundle.crt smime_keys_test.pl mutt_xtitle
+ smime_keys_test.pl mutt_xtitle
EXTRA_DIST = language.txt language50.txt \
patch.slang-1.2.2.keypad.1 \
2016-10-09 11:15:36 +00:00
diff -ur mutt-1.7.1.orig/doc/smime-notes.txt mutt-1.7.1/doc/smime-notes.txt
--- mutt-1.7.1.orig/doc/smime-notes.txt 2016-10-09 12:08:41.071976366 +0100
+++ mutt-1.7.1/doc/smime-notes.txt 2016-10-09 12:11:11.964963896 +0100
@@ -40,8 +40,10 @@
- Edit the smime_sign_as line in your muttrc, replacing the keyid with your
own.
-- You probably want to import the trusted roots in
- contrib/ca-bundle.crt. This makes you trust anything that was ultimately
+- There is no more ca-bundle.crt file with the trusted roots to import shipped
+ in mutt. The upstream file is out-dated and user is encouraged to use
+ ca-bundle.crt from ca-certificate package.
+ This makes you trust anything that was ultimately
signed by one of them. You can use "smime_keys add_root" to do so, or
just copy ca-bundle.crt into the place you point mutt's smime_ca_location
variable to.