--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/06 22:12:06	1.23
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2016/05/16 10:22:42	1.30
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.22 2016/05/06 21:28:42 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.29 2016/05/07 06:52:02 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 24
+%define release 28
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -35,16 +35,21 @@ Patch22: smeserver-qpsmtpd-2.4.0-externa
 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-init_dmarc_report_db.patch
-Patch27: smeserver-qpsmtpd-2.4.0-dmarc_settings_bool.patch
-Patch28: smeserver-qpsmtpd-2.4.0-dmarc_reporting.patch
-Patch29: smeserver-qpsmtpd-2.4.0-spf_reject_policy.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
+Patch31: smeserver-qpsmtpd-2.4.0-PERMS.patch
+Patch32: smeserver-qpsmtpd-2.4.0-fix_syntax_in_print_dns.patch
+Patch33: smeserver-qpsmtpd-2.4.0-set_dkim_option_after_key.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: perl(DBD::SQLite)
 Requires: daemontools
 Requires: qpsmtpd-plugins >= 0.0.1-sme04
 Requires: ipsvd
@@ -72,13 +77,28 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Mon May 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-28.sme
+- In qpsmtpd-print-dns set DKIM options after the public key so the string
+  will still be splitted correctly [SME: 9506]
+
+* Sat May 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-27.sme
+- Fix a syntax error in the qpsmtpd-print-dns script [SME: 9507]
+
+* Sat May 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-26.sme
+- Remove warning about spool dir permission on startup [SME: 9511]
+
+* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-25.sme
+- Add missing patch for DKIM signing [SME: 9506]
+- Create needed directories [SME: 9507]
+- Add missing run time dependency on perl(DBD::SQLite) [SME: 9507]
+
 * 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 outbounb emails [SME: 9506]
+- 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
@@ -820,10 +840,19 @@ SME Server qpsmtpd smtpd module
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -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
 mkdir -p $PEERS_CONFIG/local