--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2014/01/29 07:24:48	1.5
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 20:49:32	1.16
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.4 2013/06/14 10:25:29 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.15 2016/05/06 20:44:30 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 5
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,8 +13,21 @@ Source: %{name}-%{version}.tar.xz
 Patch1: smeserver-qpsmtpd-2.4.0-spamassassin_size_limit.patch
 Patch2: smeserver-qpsmtpd-2.4.0-initialize_size.patch
 Patch3: smeserver-qpsmtpd-2.4.0-ciphers-update.patch
+Patch4: smeserver-qpsmtpd-2.4.0-RBLSBLupdate.patch
+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
 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
@@ -44,6 +57,45 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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]
+- Code from Stefano ZAmboni <zamboni@mind-at-work.it>
+- & Charlie Brady <charlieb-contribs-bugzilla@budge.apana.org.au>
+
+* Tue Dec 2 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-9.sme
+- allow IP relayclient stored by DB [SME: 8704]
+- Code from Stefano ZAmboni <zamboni@mind-at-work.it>
+
+* Tue May 6 2014 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Remove dnsbl.ahbl.org RBL List [SME: 8368]
+
+* Tue Apr 15 2014 Ian Wells <esmith@wellsi.com> 2.4.0-7.sme
+- Remove the databytes file from qpsmtpd config [SME: 8329]
+
+* Tue Apr 15 2014 Ian Wells <esmith@wellsi.com> 2.4.0-6.sme
+- Update SBL and RBL Lists [SME: 8236]
+
 * Tue Jan 28 2014 Ian Wells <esmith@wellsi.com> 2.4.0-5.sme
 - Remove insecure ciphers [SME: 8138]
 
@@ -699,6 +751,19 @@ SME Server qpsmtpd smtpd module
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 perl createlinks
@@ -708,9 +773,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
@@ -771,6 +839,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