From f195b1a4874c2cd4c624c1b8e2f3bc8044e8a4ae Mon Sep 17 00:00:00 2001
From: Matej Muzila <mmuzila@redhat.com>
Date: Thu, 25 Jun 2015 16:36:53 +0200
Subject: [PATCH] Make system CA bundle default in mutt

- Resolves: #1069778
---
 mutt-1.5.23-system_certs.patch | 12 ++++++++++++
 mutt.spec                      |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 mutt-1.5.23-system_certs.patch

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 87a143f..5219f33 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -18,7 +18,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.23
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -34,6 +34,7 @@ Patch3: mutt-1.5.21-syncdebug.patch
 Patch4: mutt-1.5.23-add_debug_option.patch
 Patch5: mutt-1.5.23-sendlib.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
@@ -83,6 +84,7 @@ autoreconf --install
 %patch4 -p1 -b .add_debug_option
 %patch5 -p1 -b .sendlib
 %patch7 -p1 -b .domainname
+%patch8 -p1 -b .system_certs
 
 
 sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
@@ -188,6 +190,10 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Thu Jun 25 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-9
+- Make system CA bundle default in mutt
+- Resolves: #1069778
+
 * Tue Jun 02 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-8
 - Resolves #1227288
 - Do not send "From" header without the host part (eg. <foo@>)