--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 21:02:01	1.18
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 22:50:10	1.24
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.17 2016/05/06 20:56:26 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.23 2016/05/06 22:12:06 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 19
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,11 +28,24 @@ Patch15: smeserver-qpsmtpd-2.4.0-karma.p
 Patch16: smeserver-qpsmtpd-2.4.0-loadcheck.patch
 Patch17: smeserver-qpsmtpd-2.4.0-use_clamdscan_plugin.patch
 Patch18: smeserver-qpsmtpd-2.4.0-change_rbl_sbl_list_separator.patch
+Patch19: smeserver-qpsmtpd-2.4.0-add_uribl_support.patch
+Patch20: smeserver-qpsmtpd-2.4.0-use_naughty_plugin.patch
+Patch21: smeserver-qpsmtpd-2.4.0-bogus_bounce.patch
+Patch22: smeserver-qpsmtpd-2.4.0-external_badrcptto.patch
+Patch23: smeserver-qpsmtpd-2.4.0-inbound_spf.patch
+Patch24: smeserver-qpsmtpd-2.4.0-inbound_dkim.patch
+Patch25: smeserver-qpsmtpd-2.4.0-inbound_dmarc.patch
+Patch26: smeserver-qpsmtpd-2.4.0-dkim_signing.patch
+Patch27: smeserver-qpsmtpd-2.4.0-init_dmarc_report_db.patch
+Patch28: smeserver-qpsmtpd-2.4.0-dmarc_settings_bool.patch
+Patch29: smeserver-qpsmtpd-2.4.0-dmarc_reporting.patch
+Patch30: smeserver-qpsmtpd-2.4.0-spf_reject_policy.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(ClamAV::Client)
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
+Requires: perl(Mail::DMARC)
 Requires: daemontools
 Requires: qpsmtpd-plugins >= 0.0.1-sme04
 Requires: ipsvd
@@ -60,6 +73,31 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-25.sme
+- Add missing patch for DKIM signing [SME: 9506]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-24.sme
+- Check SPF for inbound emails [SME: 9505]
+- Check DKIM for inbound emails [SME: 9504]
+- Check DMARC for inbound emails (based on the previous SPF and DKIM checks)
+  [SME: 9507]
+- Store and send DMARC aggregate reports [SME: 9507]
+- Support DKIM signing for outbound emails [SME: 9506]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-23.sme
+- Use an additional badrcptto file list for external connections so
+  local only pseudonymes work as expected [SME: 9503]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-22.sme
+- Enable the bogus_bounce plugin [SME: 9501]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-21.sme
+- Use the naughty plugin to defer rejections, leaving users an opportunity
+  to authenticate [SME: 9500]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-20.sme
+- Add support for the uribl plugin [SME: 9499]
+
 * Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-19.sme
 - Change separator for SBList and RBLlist from : to , [SME: 9498]
 
@@ -775,6 +813,18 @@ SME Server qpsmtpd smtpd module
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 perl createlinks
@@ -792,6 +842,9 @@ DISABLE_LOCAL="
 19loadcheck
 20rhsbl
 22dnsbl
+221spf
+223dmarc
+34badrcptto_ext
 70spamassassin
 "
 
@@ -801,6 +854,7 @@ do
 done
 
 DISABLE_EXTERNAL="
+34badrcptto
 65disclaimer
 "
 
@@ -851,6 +905,9 @@ 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)" \
+    --dir /var/lib/qpsmtpd/dmarc "attr(2750,qpsmtpd,qpsmtpd)" \
+    --dir /home/e-smith/dkim_keys "attr(2750,root,qpsmtpd)" \
+    --dir /var/service/qpsmtpd/config/dkim "attr(2750,qpsmtpd,qpsmtpd)" \
         \
     --file /usr/local/bin/qplogsumm.pl "attr(0755,root,root)" \
     > %{name}-%{version}-%{release}-filelist