[ssmtp] change default config to load CAs automatically, if so specified
wolfy
wolfy at fedoraproject.org
Wed Sep 25 22:12:23 UTC 2013
commit 999dce90599cad18f1d6fc4bd05ae31fc85db581
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date: Thu Sep 26 01:12:00 2013 +0300
change default config to load CAs automatically, if so specified
ssmtp-defaultvalues.patch | 16 +++++++++++-----
ssmtp.spec | 5 ++++-
2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/ssmtp-defaultvalues.patch b/ssmtp-defaultvalues.patch
index 34eb69e..2952870 100644
--- a/ssmtp-defaultvalues.patch
+++ b/ssmtp-defaultvalues.patch
@@ -1,5 +1,5 @@
---- ssmtp-2.64/ssmtp.conf.orig 2008-02-29 04:50:15.000000000 +0200
-+++ ssmtp-2.64/ssmtp.conf 2013-06-06 14:24:24.384129608 +0300
+--- ssmtp-2.64/ssmtp.conf.orig 2013-09-26 00:29:04.953690875 +0300
++++ ssmtp-2.64/ssmtp.conf 2013-09-26 00:53:53.627236000 +0300
@@ -1,7 +1,9 @@
#
# /etc/ssmtp.conf -- a config file for sSMTP sendmail.
@@ -11,7 +11,7 @@
# The person who gets all mail for userids < 1000
# Make this empty to disable rewriting.
root=postmaster
-@@ -19,10 +21,11 @@ mailhub=mail
+@@ -19,10 +21,10 @@ mailhub=mail
# mailhub=mail.your.domain:465
# Where will the mail seem to come from?
@@ -21,11 +21,17 @@
# The full hostname
-hostname=_HOSTNAME_
+#Hostname=
-+
# Set this to never rewrite the "From:" line (unless not given) and to
# use that address in the "from line" of the envelope.
-@@ -35,7 +38,7 @@ hostname=_HOSTNAME_
+@@ -30,12 +32,14 @@ hostname=_HOSTNAME_
+
+ # Use SSL/TLS to send secure messages to server.
+ #UseTLS=YES
++#IMPORTANT: Uncomment the following line if you use TLS authentication
++#TLS_CA_File=/etc/pki/tls/certs/ca-bundle.crt
+
+ # Use SSL/TLS certificate to authenticate against smtp host.
#UseTLSCert=YES
# Use this RSA certificate.
diff --git a/ssmtp.spec b/ssmtp.spec
index cf38ec1..5e700fc 100644
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@ -1,6 +1,6 @@
Name: ssmtp
Version: 2.64
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Extremely simple MTA to get mail off the system to a Mailhub
Group: Applications/Internet
License: GPLv2+
@@ -138,6 +138,9 @@ fi
%changelog
+* Wed Sep 26 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.64-10
+- Force loading of the CA bundle via the config file; should fix #1004998
+
* Wed Aug 20 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.64-9
- replace TLS patch with a corrected one. thanks Till Maas for the fix
More information about the scm-commits
mailing list