--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2020/06/28 04:00:44	1.39
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2021/02/13 04:54:03	1.45
@@ -1,50 +1,16 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.38 2020/06/28 03:27:16 jpp Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.44 2020/12/16 16:49:35 jcrisp Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
-%define version 2.6.0
-%define release 36
+%define version 2.7.0
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch0: smeserver-qpsmtpd-2.6.0-PERMS.patch
-Patch1: smeserver-qpsmtpd-2.6.0-compat_with_0.96.patch
-Patch2: smeserver-qpsmtpd-2.6.0-remove_obsolete_badrcptto_pattern_conf.patch
-Patch3: smeserver-qpsmtpd-2.6.0-dhparam.patch
-Patch4: smeserver-qpsmtpd-2.6.0-karma.patch
-Patch5: smeserver-qpsmtpd-2.6.0-loadcheck.patch
-Patch6: smeserver-qpsmtpd-2.6.0-bogus_bounce.patch
-Patch7: smeserver-qpsmtpd-2.6.0-use_clamdscan_plugin.patch
-Patch8: smeserver-qpsmtpd-2.6.0-set_karma_negative.patch
-Patch9: smeserver-qpsmtpd-2.6.0-change_rbl_sbl_list_separator.patch
-Patch10: smeserver-qpsmtpd-2.6.0-add_uribl_support.patch
-Patch11: smeserver-qpsmtpd-2.6.0-helo_default_to_rfc.patch
-Patch12: smeserver-qpsmtpd-2.6.0-use_naughty_plugin.patch
-Patch13: smeserver-qpsmtpd-2.6.0-karma_before_earlytalker.patch
-Patch14: smeserver-qpsmtpd-2.6.0-external_badrcptto.patch
-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
-Patch28: smeserver-qpsmtpd-2.6.0-fix_disabling_dmarc_reports.patch
-Patch29: smeserver-qpsmtpd-2.6.0-spf_and_dmarc_reject_off.patch
-Patch30: smeserver-qpsmtpd-2.6.0-disable_dmarc_report.patch
-Patch31: smeserver-qpsmtpd-2.6.0-log_dmarc_send_reports_output.patch
-Patch32: smeserver-qpsmtpd-2.6.0-bz10290-forcespamcheck.patch
-Patch33: smeserver-qpsmtpd-2.6.0-bz10460-better-Cipher-and-Protocol.patch
-Patch34: smeserver-qpsmtpd-2.6.0-bz10368-expand-badrcptto_ext.patch
+Patch0: smeserver-qpsmtpd-2.7.0-bz10958-preset.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96-19
@@ -57,6 +23,7 @@ Requires: qpsmtpd-plugins >= 0.0.1-sme04
 Requires: ipsvd
 Requires: e-smith-lib >= 1.16.0-08
 Requires: e-smith-cvm-unix-local
+Requires: smeserver-clamav >= 2.7.0
 Obsoletes: e-smith-obtuse-smtpd
 Obsoletes: e-smith-qmail-smtpd
 Obsoletes: e-smith-mailfront
@@ -79,6 +46,24 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Fri Feb 12 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-2.sme
+- remove /usr/lib/systemd/system-preset/80-koozali-qpsmtpd.preset [SME: 10958]
+
+* Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-1.sme
+- modify for clamav 0.103.0 [SME: 11210]
+- roll up patches
+
+* Thu Dec 10 2020  Michel Begue <mab974@gmail.com> 2.6.0-40.sme
+- add Requires=runit.service (qpsmtpd & sqpsmtpd) [SME: 11245]
+
+* Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-39.sme
+- fix service not enabled [SME: 11107]
+  remove reset-unsavedflag
+
+* Fri Nov 27 2020 Michel Begue <mab974@gmail.com> 2.6.0-37.sme
+- Move qpsmtpd & sqpsmtpd services to systemd [SME: 11107]
+- Create smeserver-qpsmtpd-update event [SME: 11164]
+
 * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-36.sme
 - expand badrcptto_ext when needed [SME: 10638]
   this avoid user, group or pseudonyms for internal purpose to be reachable 
@@ -890,40 +875,7 @@ SME Server qpsmtpd smtpd module
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%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
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
+rm -rf root/usr/lib/systemd/system-preset
 
 %build
 perl createlinks
@@ -1007,7 +959,7 @@ rm -f %{name}-%{version}-%{release}-file
     --dir /var/log/sqpsmtpd "attr(2750,smelog,smelog)" \
 	\
     --file /var/service/sqpsmtpd/sqpsmtpd "attr(0755,root,root)" \
-    --dir /var/spool/qpsmtpd "attr(2750,qpsmtpd,clamav)" \
+    --dir /var/spool/qpsmtpd "attr(2750,qpsmtpd,clamscan)" \
     --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)" \
@@ -1029,6 +981,11 @@ true
 
 %post
 
+#Fix spool perms on clam upgrade
+if [[ -d /var/spool/qpsmtpd ]]; then
+  chown qpsmtpd:clamscan /var/spool/qpsmtpd;
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT