--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/02/05 23:28:48	1.1
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/16 11:50:32	1.5
@@ -1,17 +1,22 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.13 2016/01/13 17:47:36 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.4 2016/04/16 11:44:08 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: smeserver-qpsmtpd-2.6.0-PERMS.patch
+Patch1: smeserver-qpsmtpd-2.6.0-compat_with_0.96.patch
+Patch2: smeserver-qpsmtpd-2.6.0-remove_obsolete_badrcptto_pattern_conf.patch
+Patch3: smeserver-qpsmtpd-2.6.0-dhparam.patch
+Patch4: smeserver-qpsmtpd-2.6.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
@@ -41,6 +46,20 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Sat Apr 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-5.sme
+- Add support for the karma plugin, but keep it disabled by default
+  [SME: 9462]
+
+* Sat Apr 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-4.sme
+- Create a dhparam for qpsmtpd [SME: 9461]
+
+* Sat Apr 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Adapt for qpsmtpd-0.96 (mainly plugin renamed) [SME: 9460]
+
+* Tue Mar 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- fix warning on spool_dir perms  [SME: 9408]
+- smeserver-qpsmtpd-2.6.0-PERMS.patch
+
 * Sat Feb 06 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -726,18 +745,25 @@ SME Server qpsmtpd smtpd module
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
+mkdir -p root/var/lib/qpsmtpd/karma
 
 PEERS_CONFIG=root/etc/e-smith/templates/var/service/qpsmtpd/config/peers
 mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
-10check_earlytalker
+10earlytalker
 12count_unrecognized_commands
-16require_resolvable_fromhost
+16resolvable_fromhost
+18karma
 20rhsbl
 22dnsbl
 70spamassassin
@@ -798,6 +824,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