--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/20 19:46:42	1.14
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/04/22 21:23:33	1.17
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.13 2016/04/20 19:37:47 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.16 2016/04/22 08:38:15 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 14
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,6 +23,9 @@ Patch9: smeserver-qpsmtpd-2.6.0-change_r
 Patch10: smeserver-qpsmtpd-2.6.0-add_uribl_support.patch
 Patch11: smeserver-qpsmtpd-2.6.0-helo_default_to_rfc.patch
 Patch12: smeserver-qpsmtpd-2.6.0-use_naughty_plugin.patch
+Patch13: smeserver-qpsmtpd-2.6.0-karma_before_earlytalker.patch
+Patch14: smeserver-qpsmtpd-2.6.0-external_badrcptto.patch
+Patch15: smeserver-qpsmtpd-2.6.0-smtpd_to_qpsmtpd.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
@@ -55,6 +58,17 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-17.sme
+- Merge smtpd entry into qpsmtpd, same for ssmtpd into sqpsmtpd [SME: 9478]
+
+* Fri Apr 22 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-16.sme
+- Use an additional badrcptto file list for external connections so
+  local only pseudonymes work as expected [SME: 9460] [SME: 4597]
+
+* Thu Apr 21 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-15.sme
+- Call karma before earlytalker and add support for the new strikes param
+  [SME: 9462]
+
 * Wed Apr 20 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-14.sme
 - Use the naughty plugin to defer rejections, leaving users an opportunity
   to authenticate [SME: 5092]
@@ -796,6 +810,9 @@ SME Server qpsmtpd smtpd module
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks
@@ -806,15 +823,16 @@ mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
+09karma
 10earlytalker
 12count_unrecognized_commands
 15helo
 16resolvable_fromhost
-18karma
 19loadcheck
 20rhsbl
 22dnsbl
 23naughty
+34badrcptto_ext
 70spamassassin
 "
 
@@ -824,6 +842,7 @@ do
 done
 
 DISABLE_EXTERNAL="
+34badrcptto
 65disclaimer
 "