--- rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2007/06/15 01:27:52	1.5
+++ rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2007/09/06 22:27:24	1.9
@@ -2,7 +2,7 @@ Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 1.2.1
-%define release 41
+%define release 45
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -39,6 +39,10 @@ Patch27: smeserver-qpsmtpd-1.2.1-qplogsu
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.40
 Requires: perl(Mail::DKIM)
@@ -69,6 +73,20 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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
 
@@ -634,6 +652,10 @@ SME Server qpsmtpd smtpd module
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 
 %build
 perl createlinks
@@ -681,6 +703,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 *