--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 20:15:18	1.14
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 21:28:42	1.22
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.13 2016/01/13 17:47:36 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.21 2016/05/06 21:24:46 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 15
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -24,8 +24,17 @@ Patch11: smeserver-qpsmtpd-2.4.0-compat_
 Patch12: smeserver-qpsmtpd-2.4.0-helo_default_to_rfc.patch
 Patch13: smeserver-qpsmtpd-2.4.0-remove_obsolete_badrcptto_pattern_conf.patch
 Patch14: smeserver-qpsmtpd-2.4.0-dhparam.patch
+Patch15: smeserver-qpsmtpd-2.4.0-karma.patch
+Patch16: smeserver-qpsmtpd-2.4.0-loadcheck.patch
+Patch17: smeserver-qpsmtpd-2.4.0-use_clamdscan_plugin.patch
+Patch18: smeserver-qpsmtpd-2.4.0-change_rbl_sbl_list_separator.patch
+Patch19: smeserver-qpsmtpd-2.4.0-add_uribl_support.patch
+Patch20: smeserver-qpsmtpd-2.4.0-use_naughty_plugin.patch
+Patch21: smeserver-qpsmtpd-2.4.0-bogus_bounce.patch
+Patch22: smeserver-qpsmtpd-2.4.0-external_badrcptto.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
+Requires: perl(ClamAV::Client)
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: daemontools
@@ -55,6 +64,32 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-23.sme
+- Use an additional badrcptto file list for external connections so
+  local only pseudonymes work as expected [SME: 9503]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-22.sme
+- Enable the bogus_bounce plugin [SME: 9501]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-21.sme
+- Use the naughty plugin to defer rejections, leaving users an opportunity
+  to authenticate [SME: 9500]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-20.sme
+- Add support for the uribl plugin [SME: 9499]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-19.sme
+- Change separator for SBList and RBLlist from : to , [SME: 9498]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-18.sme
+- Switch to the clamdscan plugin [SME: 9497]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-17.sme
+- Enabe the loadcheck plugin [SME: 9508]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-16.sme
+- Add support for the karma plugin [SME: 9502]
+
 * Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-15.sme
 - Work with qpsmtpd 0.96 [SME: 8861]
 
@@ -754,6 +789,14 @@ SME Server qpsmtpd smtpd module
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %build
 perl createlinks
@@ -763,12 +806,15 @@ mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
+09karma
 10earlytalker
 12count_unrecognized_commands
 15helo
 16resolvable_fromhost
+19loadcheck
 20rhsbl
 22dnsbl
+34badrcptto_ext
 70spamassassin
 "
 
@@ -778,6 +824,7 @@ do
 done
 
 DISABLE_EXTERNAL="
+34badrcptto
 65disclaimer
 "
 
@@ -827,6 +874,7 @@ rm -f %{name}-%{version}-%{release}-file
 	\
     --file /var/service/sqpsmtpd/sqpsmtpd "attr(0755,root,root)" \
     --dir /var/spool/qpsmtpd "attr(2750,qpsmtpd,clamav)" \
+    --dir /var/lib/qpsmtpd/karma "attr(2750,qpsmtpd,qpsmtpd)" \
         \
     --file /usr/local/bin/qplogsumm.pl "attr(0755,root,root)" \
     > %{name}-%{version}-%{release}-filelist