--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/05/06 09:30:19	1.20
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/06/07 06:51:42	1.26
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.19 2016/05/06 09:27:09 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.25 2016/05/27 06:37:29 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 19
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,11 +28,22 @@ Patch14: smeserver-qpsmtpd-2.6.0-externa
 Patch15: smeserver-qpsmtpd-2.6.0-smtpd_to_qpsmtpd.patch
 Patch16: smeserver-qpsmtpd-2.6.0-inbound_spf.patch
 Patch17: smeserver-qpsmtpd-2.6.0-inbound_dkim.patch
+Patch18: smeserver-qpsmtpd-2.6.0-inbound_dmarc.patch
+Patch19: smeserver-qpsmtpd-2.6.0-dkim_signing.patch
+Patch20: smeserver-qpsmtpd-2.6.0-init_dmarc_report_db.patch
+Patch21: smeserver-qpsmtpd-2.6.0-dmarc_settings_bool.patch
+Patch22: smeserver-qpsmtpd-2.6.0-dmarc_reporting.patch
+Patch23: smeserver-qpsmtpd-2.6.0-spf_reject_policy.patch
+Patch24: smeserver-qpsmtpd-2.6.0-fix_syntax_in_print_dns.patch
+Patch25: smeserver-qpsmtpd-2.6.0-set_dkim_option_after_key.patch
+Patch26: smeserver-qpsmtpd-2.6.0-remove_o_and_r_dkim_fields.patch
+Patch27: smeserver-qpsmtpd-2.6.0-missing_default_props.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
 Requires: perl(Mail::DKIM::DkSignature)
 Requires: perl(ClamAV::Client)
+Requires: perl(Mail::DMARC)
 Requires: daemontools
 Requires: qpsmtpd-plugins >= 0.0.1-sme04
 Requires: ipsvd
@@ -60,6 +71,29 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Tue Jun 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-25.sme
+- Add missing tnef2mime and MaximumDateOffset to qpsmtpd [SME: 9560]
+
+* Fri May 27 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-24.sme
+- Create missing directories for DKIM keys [SME: 9496]
+- Create missing directory for the DMARC report database [SME: 9206]
+
+* Tue May 24 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-23.sme
+- Remove o and r DKIM fields as they are not standard [SME: 9496]
+
+* Mon May 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-22.sme
+- In qpsmtpd-print-dns set DKIM options after the public key so the string
+  will still be splitted correctly [SME: 9496]
+
+* Sat May 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-21.sme
+- Fix a syntax error in qpsmtpd-print-dns script [SME: 9206]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-20.sme
+- Enable DMARC checking and reporting [SME: 9206]
+- Add helper to publish DKIM/DMARC/SPF policy [SME: 9496]
+- Allow DKIM signing of outbound emails [SME: 9496]
+- Possibility to reject on SPF failure [SME: 9479]
+
 * Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-19.sme
 - Enable inbound dkim checking (without reject) [SME: 9480]
 
@@ -823,10 +857,23 @@ SME Server qpsmtpd smtpd module
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 perl createlinks
 mkdir -p root/var/lib/qpsmtpd/karma
+mkdir -p root/var/lib/qpsmtpd/dmarc
+mkdir -p root/home/e-smith/dkim_keys/default
+mkdir -p root/var/service/qpsmtpd/config/dkim
 
 PEERS_CONFIG=root/etc/e-smith/templates/var/service/qpsmtpd/config/peers
 mkdir -p $PEERS_CONFIG/0
@@ -842,6 +889,7 @@ DISABLE_LOCAL="
 20rhsbl
 22dnsbl
 221spf
+223dmarc
 23naughty
 34badrcptto_ext
 70spamassassin
@@ -904,6 +952,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