--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/01/13 17:47:36	1.13
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 20:56:26	1.17
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.12 2016/01/12 21:11:12 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.16 2016/05/06 20:49:32 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 14
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,8 +20,16 @@ Patch7: smeserver-qpsmtpd-2.4.0-allow_re
 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
 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
@@ -51,6 +59,18 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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]
 
@@ -743,6 +763,13 @@ SME Server qpsmtpd smtpd module
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 perl createlinks
@@ -752,9 +779,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
@@ -815,6 +845,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