--- rpms/qpsmtpd/sme7/qpsmtpd.spec	2009/10/29 17:01:20	1.20
+++ rpms/qpsmtpd/sme7/qpsmtpd.spec	2012/06/30 16:05:32	1.28
@@ -1,8 +1,8 @@
-# $Id: qpsmtpd.spec,v 1.19 2009/10/27 17:53:32 filippocarletti Exp $
+# $Id: qpsmtpd.spec,v 1.27 2012/05/09 19:05:21 charliebrady Exp $
 
 Name: qpsmtpd
 Version: 0.83
-Release: 0.3%{?dist}
+Release: 0.8%{?dist}
 Summary: qpsmtpd + qpsmtpd-apache + qpsmtpd-async
 License: distributable
 Group: System Environment/Daemons
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: perl >= 0:5.00503
 BuildArchitectures: noarch
 Requires: perl(Mail::Header), perl(Net::DNS) perl(Net::IP)
+Requires(pre): coreutils, shadow-utils, perl
 
 Source0: %{name}-%{version}.tar.gz
 Source1: qpsmtpd-forkserver.rc
@@ -21,10 +22,17 @@ Source5: in.qpsmtpd
 Source6: qpsmtpd.conf
 Source7: README.selinux
 
+Patch10: qpsmtpd-0.83-loginit.patch
+Patch11: qpsmtpd-48d1a5b9febc96d2d3c4110500759e36fb4eabb6.patch
+Patch12: qpsmtpd-de3fbb565f711bc27e7bfa061e83c3020710dc16.patch
+
+Patch21: 0021-ignore-search-path-in-DNS-lookups.patch
+
 Patch100: qpsmtpd-0.40-badrcptto_allowrelay.patch
 Patch101: qpsmtpd-0.83-peer_hooks.patch
 Patch102: qpsmtpd-0.83-clamd_conf.patch
 Patch103: qpsmtpd-0.83-clamav-headers.patch
+Patch104: qpsmtpd-forkserver-keepalive.patch
 
 %description
 qpsmtpd is a flexible smtpd daemon written in Perl. Apart from the core
@@ -55,10 +63,15 @@ qpsmpd-async which uses it.
 
 %prep
 %setup -q
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch21 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p0
 
 
 %build
@@ -168,17 +181,37 @@ then
 fi
 
 %changelog
-* Thu Oct 29 2009 <slords@lordsfam.net> 0.83-0.3.sme
+* Sat Jun 30 2012 Ian Wells <esmith@wellsi.com> 0.83-0.8.sme
+- Ignore search path in DNS lookups [SME: 5808]
+
+* Fri May 04 2012 Charlie Brady <charlie_brady@mitel.com> 0.83-0.7.sme
+- Set SO_KEEPALIVE option on client socket - to detect dead
+  connections. [SME: 6916]
+
+* Thu Nov 5 2009 <smeserver-contribs@snetram.nl> 0.83-0.6.sme
+- Apply qpsmtpd git changesets to implement custom SPAM
+  subject prefix [SME: 5567]
+
+* Tue Nov 3 2009 <slords@mail.com> 0.83-0.5.sme
+- Update pre requires so scripts don't fail on install [SME: 5557]
+
+* Sat Oct 31 2009 <slords@mail.com> 0.83-0.4.sme
+- Rebase bad_rcptto patch to remove orig file [SME: 5549]
+- Change logging in tls init to prevent warnings [SME: 5550]
+
+* Thu Oct 29 2009 <slords@mail.com> 0.83-0.3.sme
 - Only run/initialize plugins once [SME: 5533]
 
 * Mon Oct 26 2009 <filippo.carletti@gmail.com> 0.83-0.2.sme
 - Change spool dir permissions and owner to qpsmtpd:clamav
 - Change log dir permissions and owner to smelog:smelog
 
-* Fri Sep 18 2009 <rpmbuild@robinbowes.com> 0.83-0.1.sme
-- Update to 0.83
+* Tue Sep 22 2009 <filippo.carletti@gmail.com> 0.83-0.1.sme
 - add sme specific patches
 
+* Fri Sep 18 2009 <rpmbuild@robinbowes.com> 0.83-0.1
+- Update to 0.83
+
 * Sun Jul 12 2009 <rpmbuild@robinbowes.com> 0.82-0.1
 - Update to latest release
 - don't add qpsmtpd to start-up by default