--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2014/12/03 23:53:41	1.9
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 21:21:02	1.20
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.8 2014/12/02 21:28:06 stephdl Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.19 2016/05/06 21:06:12 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 10
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,8 +17,22 @@ Patch4: smeserver-qpsmtpd-2.4.0-RBLSBLup
 Patch5: smeserver-qpsmtpd-2.4.0-remove_databytes.patch
 Patch6: smeserver-qpsmtpd-2.4.0-ahbl-patch
 Patch7: smeserver-qpsmtpd-2.4.0-allow_relayclients_wo_authentications.patch
+Patch8: smeserver-qpsmtpd-2.4.0-add_domain_to_bcc_user.patch
+Patch9: smeserver-qpsmtpd-2.4.0-ssl_proto_from_db.patch
+Patch10: smeserver-qpsmtpd-2.4.0-ssl_update.patch
+Patch11: smeserver-qpsmtpd-2.4.0-compat_with_0.96.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: qpsmtpd >= 0.83
+Requires: qpsmtpd >= 0.96
+Requires: perl(ClamAV::Client)
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: daemontools
@@ -48,6 +62,39 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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]
+
+* Wed Jan 13 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-14.sme
+- Expand all ssl related conf in ssl-update [SME: 9152]
+
+* Tue Jan 12 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-13.sme
+- Hook into a new ssl-update event [SME: 9152]
+
+* Thu Jan 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-12.sme
+- Allow setting SSL protocols from DB [SME: 9162]
+
+* Thu Aug 6 2015 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-11.sme
+- Add domain part to bcc user if missing [SME: 8990]
 
 * Wed Dec 3 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-10.sme
 - allow IP relayclient stored by DB [SME: 8704]
@@ -726,6 +773,19 @@ SME Server qpsmtpd smtpd module
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 perl createlinks
@@ -735,9 +795,12 @@ mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
-10check_earlytalker
+09karma
+10earlytalker
 12count_unrecognized_commands
-16require_resolvable_fromhost
+15helo
+16resolvable_fromhost
+19loadcheck
 20rhsbl
 22dnsbl
 70spamassassin
@@ -798,6 +861,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