[ssmtp/f10/master] * Tue Jul 27 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-15 - fix regressio

[Manuel Wolfshant]

commit b52ab99e00413131e69a05430f9fc6310330b34d
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Fri Jul 30 10:02:20 2010 +0300

    * Tue Jul 27 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-15
    - fix regression created by the patch for standardise() -- Buffer overflow

 ssmtp.spec |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 59 insertions(+), 8 deletions(-)
---
diff --git a/ssmtp.spec b/ssmtp.spec
index 1442d51..b106f48 100644
--- a/ssmtp.spec
+++ b/ssmtp.spec
@@ -1,6 +1,6 @@
 Name:		ssmtp
 Version:	2.61
-Release:	11.8%{?dist}
+Release:	15%{?dist}
 Summary:	Extremely simple MTA to get mail off the system to a Mailhub
 Group:		Applications/Internet
 License:	GPLv2+
@@ -19,6 +19,8 @@ Patch6:		%{name}-md5auth-non-rsa
 Patch7:		%{name}-unitialized-strdup.patch
 Patch8:		%{name}-authpass.patch
 Patch9:		%{name}-aliases.patch
+Patch10:	%{name}-default-cert-path.patch
+Patch11:	%{name}-standardise.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #hack around wrong requires for mutt and mdadm
@@ -28,7 +30,8 @@ Provides:	MTA smtpdaemon
 %if 0%{?fedora} < 8
 Provides:	MTA smtpdaemon
 %endif
-Provides:	%{_sbindir}/sendmail 
+#Provides:	%{_sbindir}/sendmail 
+#Provides:	%{_bindir}/mailq
 Requires(post):	%{_sbindir}/alternatives
 Requires(preun):	%{_sbindir}/alternatives
 BuildRequires:	openssl-devel
@@ -56,7 +59,13 @@ or manage a queue. That belongs on a mail hub with a system administrator.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
+#add missing libs in orderto fix FTBFS due to changes in implicit DSO linking
+%if "0%{?dist}" >= "0.fc13" 
+sed -i "s/LIBS -lssl/LIBS -lssl -lcrypto/" configure 
+%endif
 
 %build
 #on RHEL3 krb5 is somewhere else
@@ -65,6 +74,7 @@ or manage a queue. That belongs on a mail hub with a system administrator.
 %if "0%{?dist}" == "0.el3" 
 	%define cppflags -I/usr/kerberos/include
 %endif
+
 %configure --enable-ssl --enable-md5auth --enable-inet6
 %if "0%{?dist}" == "0.el3" 
 	make %{?_smp_mflags} CPPFLAGS=%{cppflags}
@@ -85,7 +95,12 @@ install -p -D -m 644 ssmtp.conf.5 %{buildroot}%{_mandir}/man5/ssmtp.conf.5
 ln -s %{_sbindir}/%{name} %{buildroot}%{_sbindir}/sendmail.ssmtp
 ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/newaliases.ssmtp
 ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/mailq.ssmtp
-
+touch %{buildroot}%{_sbindir}/sendmail
+touch %{buildroot}%{_bindir}/mailq
+touch %{buildroot}%{_bindir}/newaliases
+touch %{buildroot}%{_mandir}/man1/mailq.1.gz
+touch %{buildroot}%{_mandir}/man1/newaliases.1.gz
+touch %{buildroot}%{_mandir}/man8/sendmail.8.gz
 
 %clean
 rm -rf %{buildroot}
@@ -106,11 +121,12 @@ if [ $1 -eq 0 ] ; then
 fi
 exit 0
 
-#%postun
-#if [ $1 -eq 0 ] ; then
-#	/usr/sbin/alternatives --auto mta
-#fi
-#exit 0
+%postun
+if [ "$1" -ge "1" ]; then
+	if [ "`readlink %{_sysconfdir}/alternatives/mta`" == "%{_sbindir}/sendmail.ssmtp" ]; then
+		%{_sbindir}/alternatives --set mta %{_sbindir}/sendmail.ssmtp
+	fi
+fi
 
 %files
 %defattr(-,root,root,-)
@@ -120,6 +136,14 @@ exit 0
 %{_mandir}/man1/*
 %{_sbindir}/%{name}
 #%{_bindir}/generate_config_alt
+
+%ghost %{_sbindir}/sendmail
+%ghost %{_bindir}/mailq
+%ghost %{_bindir}/newaliases
+%ghost %{_mandir}/man1/mailq.1.gz 
+%ghost %{_mandir}/man1/newaliases.1.gz
+%ghost %{_mandir}/man8/sendmail.8.gz
+
 %{_sbindir}/sendmail.ssmtp
 %{_bindir}/newaliases.ssmtp
 %{_bindir}/mailq.ssmtp
@@ -129,6 +153,33 @@ exit 0
 
 
 %changelog
+* Tue Jul 27 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.61-15
+- fix regression created by the patch for standardise() -- Buffer overflow
+
+* Tue Apr 20 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 2.61-14
+- use Fedora's default TLS cert path (close #553734)
+- add Debian's patch for "send-mail: standardise() -- Buffer overflow"
+  (close #582236)
+
+* Mon Mar 08 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 2.61-13
+- Use %ghost instead of explicit-provides according to Packaging Guidelines for
+  Alternatives.
+- close #570799
+
+* Tue Feb 16 2010 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> 2.61-12
+- fix FTBFS due to ImplicitDSOLinking
+- close #564967
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> 2.61-11.10
+- rebuild for new openssl
+
+* Wed Feb 17 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.9
+- add Provides for mailq; this should make ssmtp dissapear from the "bad" list
+  from https://fedoraproject.org/wiki/PackagingDrafts/UsingAlternatives
+
+* Fri Jan 16 2009 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.8.1
+- rebuild for newer openssl
+
 * Fri Dec 26 2008 Manuel "lonely wolf" Wolfshant <wolfy at nobugconsulting.ro> 2.61-11.8
 - integrate patch adding support for aliases; initial version received from Tako 
   Schotanus <tako at codejive.org>, who adapted it from "eatnumber1"