diff --git a/mutt-1.5.23-system_certs.patch b/mutt-1.5.23-system_certs.patch new file mode 100644 index 0000000..41d7840 --- /dev/null +++ b/mutt-1.5.23-system_certs.patch @@ -0,0 +1,12 @@ +diff -rup mutt-17a4f92e4a95-orig/init.h mutt-17a4f92e4a95-new/init.h +--- mutt-17a4f92e4a95-orig/init.h 2015-06-07 22:59:32.000000000 +0200 ++++ mutt-17a4f92e4a95-new/init.h 2015-06-25 15:28:56.095570332 +0200 +@@ -2989,7 +2989,7 @@ struct option_t MuttVars[] = { + */ + #if defined(USE_SSL) + #ifdef USE_SSL_GNUTLS +- { "ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, 0 }, ++ { "ssl_ca_certificates_file", DT_PATH, R_NONE, UL &SslCACertFile, "/etc/ssl/certs/ca-bundle.crt" }, + /* + ** .pp + ** This variable specifies a file containing trusted CA certificates. diff --git a/mutt.spec b/mutt.spec index cdc3b1c..e626f93 100644 --- a/mutt.spec +++ b/mutt.spec @@ -20,7 +20,7 @@ Summary: A text mode mail user agent Name: mutt Version: 1.5.23 -Release: 9.%{?snapver}%{?dist} +Release: 10.%{?snapver}%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -36,6 +36,7 @@ Patch3: mutt-1.5.21-syncdebug.patch # FIXME make it to upstream Patch4: mutt-1.5.23-add_debug_option.patch Patch7: mutt-1.5.23-domainname.patch +Patch8: mutt-1.5.23-system_certs.patch Url: http://www.mutt.org/ Requires: mailcap, urlview BuildRequires: ncurses-devel, gettext, automake @@ -84,7 +85,7 @@ autoreconf --install %patch3 -p1 -b .syncdebug %patch4 -p1 -b .add_debug_option %patch7 -p1 -b .domainname - +%patch8 -p1 -b .system_certs sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure # disable mutt_dotlock program - remove support from mutt binary @@ -189,6 +190,10 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5 %changelog +* Thu Jun 25 2015 Matej Muzila - 5:1.5.23-10.20150609hg17a4f92e4a95 +- Make system CA bundle default in mutt +- Resolves: #1069778 + * Wed Jun 17 2015 Fedora Release Engineering - 5:1.5.23-9.20150609hg17a4f92e4a95 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild