--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/05/06 09:46:48	1.21
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/05/27 06:37:29	1.25
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.20 2016/05/06 09:30:19 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.24 2016/05/24 08:23:38 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 20
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -34,6 +34,9 @@ Patch20: smeserver-qpsmtpd-2.6.0-init_dm
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
@@ -67,6 +70,20 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* 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]
@@ -842,10 +859,16 @@ SME Server qpsmtpd smtpd module
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -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