29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
|
diff -up mutt-1.5.21/contrib/Makefile.am.cabundle mutt-1.5.21/contrib/Makefile.am
|
||
|
|
--- mutt-1.5.21/contrib/Makefile.am.cabundle 2008-03-19 21:07:06.000000000 +0100
|
||
|
|
+++ mutt-1.5.21/contrib/Makefile.am 2011-11-02 12:47:34.143534053 +0100
|
||
|
|
@@ -5,7 +5,7 @@ subdir = contrib
|
||
|
|
SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
|
||
|
|
sample.muttrc sample.mailcap sample.muttrc-tlr \
|
||
|
|
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 \
|
||
|
|
diff -up mutt-1.5.21/doc/smime-notes.txt.cabundle mutt-1.5.21/doc/smime-notes.txt
|
||
|
|
--- mutt-1.5.21/doc/smime-notes.txt.cabundle 2011-11-02 12:53:56.808750080 +0100
|
||
|
|
+++ mutt-1.5.21/doc/smime-notes.txt 2011-11-02 12:57:46.225881970 +0100
|
||
|
|
@@ -40,8 +40,10 @@ How to add use mutt's S/MIME capabilitie
|
||
|
|
- 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 pacakge.
|
||
|
|
+ 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.
|