[ssmtp] fix #970123,#962988,#895708
wolfy
wolfy at fedoraproject.org
Thu Jun 6 12:47:03 UTC 2013
commit 9f32dc1ab1e24af8d53d5452451c5a1410cd4beb
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date: Thu Jun 6 15:46:44 2013 +0300
fix #970123,#962988,#895708
ssmtp-authpass.patch | 13 +++++++++++++
ssmtp-defaultvalues.patch | 31 ++++++++++++++++++++++++++-----
ssmtp-validate-TLS-server-cert.patch | 2 --
ssmtp.spec | 20 +++++++++++++-------
4 files changed, 52 insertions(+), 14 deletions(-)
---
diff --git a/ssmtp-authpass.patch b/ssmtp-authpass.patch
new file mode 100644
index 0000000..8937df8
--- /dev/null
+++ b/ssmtp-authpass.patch
@@ -0,0 +1,13 @@
+diff -up ssmtp-2.61/ssmtp.c.orig ssmtp-2.61/ssmtp.c
+--- ssmtp-2.61/ssmtp.c.orig 2008-11-26 17:27:29.000000000 +0200
++++ ssmtp-2.61/ssmtp.c 2008-11-26 17:25:36.000000000 +0200
+@@ -1051,7 +1051,8 @@ bool_t read_config()
+ }
+ }
+ else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
+- if((auth_pass = strdup(q)) == (char *)NULL) {
++ auth_pass = firsttok(&rightside, " \n\t");
++ if(auth_pass == (char *)NULL) {
+ die("parse_config() -- strdup() failed");
+ }
+
diff --git a/ssmtp-defaultvalues.patch b/ssmtp-defaultvalues.patch
index bd0ed86..34eb69e 100644
--- a/ssmtp-defaultvalues.patch
+++ b/ssmtp-defaultvalues.patch
@@ -1,15 +1,36 @@
---- ssmtp-2.64/ssmtp.conf.orig 2012-07-01 00:11:04.417982082 +0300
-+++ ssmtp-2.64/ssmtp.conf 2012-07-01 00:11:14.985200360 +0300
-@@ -19,10 +19,10 @@ mailhub=mail
+--- 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
+@@ -1,7 +1,9 @@
+ #
+ # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
+ #
+-
++# See the ssmtp.conf(5) man page for a more verbose explanation of the
++# available options.
++#
+ # The person who gets all mail for userids < 1000
+ # Make this empty to disable rewriting.
+ root=postmaster
+@@ -19,10 +21,11 @@ mailhub=mail
# mailhub=mail.your.domain:465
# Where will the mail seem to come from?
-rewriteDomain=
-+#rewriteDomain=
++#RewriteDomain=
# The full hostname
-hostname=_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_
+ #UseTLSCert=YES
+
+ # Use this RSA certificate.
+-#TLSCert=/etc/ssl/certs/ssmtp.pem
++#TLSCert=/etc/pki/tls/private/ssmtp.pem
+
+ # Get enhanced (*really* enhanced) debugging information in the logs
+ # If you want to have debugging of the config file parsing, move this option
diff --git a/ssmtp-validate-TLS-server-cert.patch b/ssmtp-validate-TLS-server-cert.patch
index c1fd2d8..f10a30b 100644
--- a/ssmtp-validate-TLS-server-cert.patch
+++ b/ssmtp-validate-TLS-server-cert.patch
@@ -150,5 +150,3 @@ diff -up ssmtp-2.64/TLS.old ssmtp-2.64/TLS
+
+TLS_CA_Dir=<file>
+Optional directory of trusted certificates for validating the server.
-
-
diff --git a/ssmtp.spec b/ssmtp.spec
index 775a5a3..eede6dc 100644
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@ -1,6 +1,6 @@
Name: ssmtp
Version: 2.64
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Extremely simple MTA to get mail off the system to a Mailhub
Group: Applications/Internet
License: GPLv2+
@@ -14,6 +14,7 @@ Patch1: %{name}-md5auth-non-rsa.patch
#bug fixing patches
Patch2: %{name}-garbage_writes.patch
+Patch8: %{name}-authpass.patch
#enhancements
#enhancement not present in Debian
@@ -24,7 +25,6 @@ Patch11: %{name}-remote-addr.patch
Patch12: %{name}-validate-TLS-server-cert.patch
#fixes for Fedora PATHs
-#Patch20: %{name}-default-cert-path.patch // merged in validate-TLS-server-cert.patch
Patch21: %{name}-defaultvalues.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,10 +57,11 @@ or manage a queue. That belongs on a mail hub with a system administrator.
%setup -q
%patch1 -p1 -b .gplmd5
%patch2 -p1 -b .garbage
+%patch8 -p1 -b .authpass
%patch10 -p1 -b .aliases
%patch11 -p1 -b .remote-ip
%patch12 -p1 -b .tls
-# %patch20 -p1 -b .pki
+
%patch21 -p1 -b .saneconf
%build
@@ -69,7 +70,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
-install -p -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
+install -p -D -m 2750 %{name} %{buildroot}%{_sbindir}/%{name}
#install -p -D -m 755 generate_config_alt %{buildroot}%{_bindir}/generate_config_alt
mkdir %{buildroot}%{_bindir}/
install -p -D -m 644 revaliases %{buildroot}%{_sysconfdir}/ssmtp/revaliases
@@ -119,7 +120,7 @@ fi
%doc COPYING INSTALL README TLS CHANGELOG_OLD ChangeLog COPYRIGHT
%{_mandir}/man5/*
%{_mandir}/man8/*
-%{_sbindir}/%{name}
+%attr(2755, root, mail) %{_sbindir}/%{name}
%ghost %{_sbindir}/sendmail
%ghost %{_bindir}/mailq
@@ -131,12 +132,17 @@ fi
%{_sbindir}/sendmail.ssmtp
%{_bindir}/newaliases.ssmtp
%{_bindir}/mailq.ssmtp
-%dir %{_sysconfdir}/ssmtp/
+%attr(2750, root, mail) %dir %{_sysconfdir}/ssmtp/
%config(noreplace) %{_sysconfdir}/ssmtp/revaliases
-%config(noreplace) %{_sysconfdir}/ssmtp/ssmtp.conf
+%attr(2750, root, mail) %config(noreplace) %{_sysconfdir}/ssmtp/ssmtp.conf
%changelog
+* Wed Jun 5 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.64-7
+- remove world readable permissions of the config file (#962988)
+- revive the authpass patch (#970123)
+- revive improved default config settings which were lost during rebase (#895708)
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.64-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list