--- rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2009/10/30 00:32:03	1.25
+++ rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2010/10/01 13:32:47	1.33
@@ -1,16 +1,23 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.24 2009/10/30 00:31:46 slords Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.32 2010/09/26 17:27:14 slords Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.2.0
-%define release 3
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-qpsmtpd-2.2.0-qpsmtpd83.patch
+Patch2: smeserver-qpsmtpd-2.2.0-spamsubject.patch
+Patch3: smeserver-qpsmtpd-2.2.0-expand-template.patch
+Patch4: smeserver-qpsmtpd-2.2.0-RequireResolvableFromHost-default-enabled.patch
+Patch5: smeserver-qpsmtpd-2.2.0-tls_before_auth.patch
+Patch6: smeserver-qpsmtpd-2.2.0-require_auth.patch
+Patch7: smeserver-qpsmtpd-2.2.0-ciphers.patch
+Patch8: smeserver-qpsmtpd-2.2.0-fix_relay_auth_for_local_net.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.83
 Requires: perl(Mail::DKIM)
@@ -41,6 +48,28 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri Oct 1 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-10.sme
+- Fix RelayRequiresAuth for local network [SME: 5575]
+
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 2.2.0-9.sme
+- Make tls ciphers configurable [SME: 6141]
+
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 2.2.0-8.sme
+- Require auth for all relays (local too) [SME: 5575]
+
+* Sat Jun 5 2010 Ian Wells <esmith@wellsi.com> 2.2.0-7.sme
+- Add qpsmtpd template fragment for tls_before_auth [SME: 6004]
+
+* Sun Dec 27 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Enable qpsmtpd RequireResolvableFromHost plugin by default, remove 
+  database entry and the database default value [SME: 5617]
+
+* Sat Nov 7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Tie template fragment into event system to have it expanded [SME: 5031]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Add qpsmtpd template fragment for custom SPAM subject prefix [SME: 5031]
+
 * Thu Oct 29 2009 Shad L. Lords <slords@mail.com> 2.0.0-3.sme
 - Add hooks cleanout back in in so auth works.
 
@@ -641,6 +670,13 @@ SME Server qpsmtpd smtpd module
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks