--- rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2017/02/27 18:58:29	1.36
+++ rpms/smeserver-qpsmtpd/sme9/smeserver-qpsmtpd.spec	2017/08/03 13:50:08	1.40
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.35 2017/02/27 18:47:02 unnilennium Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.39 2017/05/20 11:14:10 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.4.0
-%define release 34
+%define release 38
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -47,6 +47,8 @@ Patch34: smeserver-qpsmtpd-2.4.0-remove_
 Patch35: smeserver-qpsmtpd-2.4.0-fix_disabling_dmarc_reports.patch
 Patch36: smeserver-qpsmtpd-2.4.0-spf_and_dmarc_reject_off.patch
 Patch37: smeserver-qpsmtpd-2.4.0-default_helo_policy_lenient.patch
+Patch38: smeserver-qpsmtpd-2.6.0-disable_dmarc_report.patch
+Patch39: smeserver-qpsmtpd-2.6.0-log_dmarc_send_reports_output.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(ClamAV::Client)
@@ -73,6 +75,7 @@ Requires: perl-Convert-TNEF
 Requires: perl-IO-stringy
 Requires: perl-File-MMagic
 Requires: perl-MIME-tools
+Conflicts: smeserver-wbl < 0.3.0-14
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 AutoReqProv: no
@@ -81,6 +84,16 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Thu Aug 3 2017 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-38.sme
+- Log DMARC reporting in syslog instead of sending email to the admin.
+  Also suppress SSL connection failed warnings [SME: 10401]
+
+* Sat May 20 2017 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-37.sme
+- Turn DMARC reporting off by default [SME: 10320]
+
+* Sat May 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.4.0-36.sme
+- prevent incoming email to stop if smeserver-wbl is installed and not updated [SME: 10276]
+
 * Mon Feb 27 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.4.0-34.sme
 - updated regex for SBList in smeserver-qpsmtpd-2.4.0-change_rbl_sbl_list_separator.patch
 - to take into account list using a subdomain [SME: 10116]
@@ -877,6 +890,8 @@ SME Server qpsmtpd smtpd module
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %build
 perl createlinks