--- rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec	2007/06/14 21:22:22	1.2
+++ rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec	2008/01/07 18:49:37	1.12
@@ -2,7 +2,7 @@ Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 1.2.1
-%define release 40
+%define release 49
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -37,8 +37,18 @@ Patch25: smeserver-qpsmtpd-1.2.1-logters
 Patch26: smeserver-qpsmtpd-1.2.1-logterse_stats.patch
 Patch27: smeserver-qpsmtpd-1.2.1-qplogsumm.patch
 Patch28: smeserver-qpsmtpd-1.2.1-logterse.patch2
+Patch29: smeserver-qpsmtpd-1.2.1-qpsmtpd40.patch
+Patch30: smeserver-qpsmtpd-1.2.1-qpsmtpd40.patch2
+Patch31: smeserver-qpsmtpd-1.2.1-disclaimer.patch
+Patch32: smeserver-qpsmtpd-1.2.1-disclaimer.patch2
+Patch33: smeserver-qpsmtpd-1.2.1-rblsbl.patch2
+Patch34: smeserver-qpsmtpd-1.2.1-hosts_allow.patch
+Patch35: smeserver-qpsmtpd-1.2.1-dnsbl_disconnect.patch
+Patch36: smeserver-qpsmtpd-1.2.1-timeouts.patch
+Patch37: smeserver-qpsmtpd-1.2.1-badrcptto_empty_local.patch
+Patch38: smeserver-qpsmtpd-1.2.1-templatebegin.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: qpsmtpd >= 0.32-4.el4.sme
+Requires: qpsmtpd >= 0.40
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: daemontools
@@ -67,6 +77,38 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.1-49
+- rename template-begin fragments [SME: 2333]
+
+* Mon Oct 29 2007 Charlie Brady <charlie_brady@mitel.com>
+- Add badrcptto_pattern rule to block "null" recipient addresses.
+  [SME: 3476]
+
+* Thu Sep  6 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.1-47
+- Add configurable timeouts during SMTP command parsing and message
+  body receipt. [SME: 3377]
+
+* Thu Sep  6 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.1-46
+- Disconnect immediately if dnsbl plugin rejects recipient addresses
+  (and therefore would never accept the message). [SME: 3352]
+
+* Thu Sep  6 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.1-45
+- Configure hosts_allow plugin, which use the pre_connection hook
+  and therefore needs to be done before the 'peers' plugin.
+  [SME: 3352]
+
+* Fri Aug 03 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.1-44
+- Fix rbl migrate fragment (thanks, Mike McCarn). [SME: 3229]
+
+* Sun Jun 17 2007 Shad L. Lords <slords@mail.com> 1.2.1-43
+- Updates for disclaimer plugin [SME: 2648]
+
+* Sat Jun 16 2007 Shad L. Lords <slords@mail.com> 1.2.1-42
+- Add disclaimer plugin disabled by default [SME: 2648]
+
+* Thu Jun 14 2007 Shad L. Lords <slords@mail.com> 1.2.1-41
+- Update for new features in qpsmtpd v0.40
+
 * Thu Jun 14 2007 Shad L. Lords <slords@mail.com> 1.2.1-40
 - Remove conflicts qpsmtpd >= 0.33
 
@@ -627,6 +669,16 @@ SME Server qpsmtpd smtpd module
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
 
 %build
 perl createlinks
@@ -674,6 +726,15 @@ do
     echo "# $file disabled for local connections" > $PEERS_CONFIG/local/$file
 done
 
+DISABLE_EXTERNAL="
+65disclaimer
+"
+
+for file in $DISABLE_EXTERNAL
+do
+    echo "# $file disabled for external connections" > $PEERS_CONFIG/0/$file
+done
+
 (
     cd root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins
     for file in *