--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/22 04:19:31	1.20
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2023/07/05 14:03:17	1.27
@@ -1,10 +1,10 @@
-# $Id: smeserver-spamassassin.spec,v 1.19 2021/02/22 04:17:46 jpp Exp $
+# $Id: smeserver-spamassassin.spec,v 1.26 2023/03/08 09:55:14 jcrisp Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
 %define version 2.7.0
-%define release 7
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,11 +14,12 @@ Patch0: smeserver-spamassassin-2.7.0-bz1
 Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch
 Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch
 Patch3: smeserver-spamassassin-2.7.0-bz11375-remove-spamd.patch
+Patch4: smeserver-spamassassin-2.7.0-bz12330-logging-sa4.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-email >= 4.13.0-38
 Requires: headermatch
-Requires: spamassassin >= 3.4.4
+Requires: spamassassin >= 4.0.0
 Requires: perl(Crypt::OpenSSL::Bignum)
 Requires: perl(IO::Socket::INET6)
 Requires: perl(IP::Country)
@@ -26,6 +27,7 @@ Requires: perl(Net::DNS) >= 0.34-1
 Requires: perl(Net::Ident)
 Requires: perl(Compress::Zlib)
 Requires: perl(Mail::DKIM)
+Requires: perl(Mail::DMARC) >= 1.20200214
 Requires: ucspi-tcp daemontools
 Requires: e-smith-lib >= 1.13.1-90
 Requires: e-smith-base >= 4.13.16
@@ -45,6 +47,21 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* Wed Jul 05 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-12.sme
+- Add requires perl-Mail-DMARC for spamassassin 4
+
+* Tue Mar 07 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-11.sme
+- update for Spamassassin 4 - thanks for the patch Zsolt [SME: 12330]
+
+* Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
+- prevent noise in log at spamassassin call from qpsmtpd [SME: 11491]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
+- clean rsyslog syntax for spamd [SME: 11422]
+
+* Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
+- remove warning while trying to delete file when missing in post script [SME: 11375]
+
 * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
 - remove spamd reference as service use spamassassin.service [SME: 11375]
   migrate spamd propertie SpamLearning to spamassassin
@@ -148,7 +165,7 @@ SME Server - spamassassin anti-spam modu
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
-* Sat Mar 9 2008 chris burnat <devlist@burnat.com> 1.4.0-18
+* Sat Mar 8 2008 chris burnat <devlist@burnat.com> 1.4.0-18
 - Edit and rename deprecated template fragment [SME: 3857]  
 
 * Tue Dec 25 2007 Shad L. Lords <slords@mail.com> 1.4.0-17
@@ -478,6 +495,8 @@ rm -rf root//usr/lib/systemd/system/spam
 %patch2 -p1
 %patch3 -p1
 rm -rf root/etc/e-smith/db/configuration/defaults/spamd
+mkdir -p root/var/service/qpsmtpd/.spamassassin
+%patch4 -p1
 
 %build
 perl createlinks
@@ -493,6 +512,9 @@ rm -f %{name}-%{version}-%{release}-file
     --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \
     --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \
     --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
+    --dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \
+    |grep  -v "/var/service/qpsmtpd$" \
+    |grep  -v "/var/service$" \
     > %{name}-%{version}-%{release}-filelist
 
 %pre
@@ -500,7 +522,7 @@ rm -f %{name}-%{version}-%{release}-file
     'spamassassin daemon user' /var/spool/spamd /bin/false
 #clean 10.0b1 bad choice
 if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then 
-	echo "unlink /etc/systemd/system/spamassassin.service"; fi
+	unlink /etc/systemd/system/spamassassin.service; fi
 if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
 	/usr/bin/systemctl stop spamd.service
 	/usr/bin/systemctl stop spamassassin.service
@@ -514,7 +536,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 
 # Cleanup old files
-rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
+if [[  -d /var/lib/spamassassin/3.004000 ]]; then
+  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
+fi
 
 if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
   echo "Installing new spam databases - please be patient"
@@ -528,7 +552,9 @@ if [[ ! -d /var/lib/spamassassin/3.00400
   fi
 fi
 
-rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true
+if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
+  rm -rf /usr/lib/systemd/system/spamd.service.d 
+fi
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)