--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/01/12 21:11:12	1.12
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 20:44:30	1.15
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.11 2016/01/07 18:09:43 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.14 2016/05/06 20:15:18 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 13
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,8 +20,13 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-Requires: qpsmtpd >= 0.83
+Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: daemontools
@@ -51,6 +56,15 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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]
 
@@ -740,6 +754,11 @@ SME Server qpsmtpd smtpd module
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks
@@ -749,9 +768,11 @@ 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
 20rhsbl
 22dnsbl
 70spamassassin
@@ -812,6 +833,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