--- rpms/smeserver-clamav/sme10/smeserver-clamav.spec	2016/02/05 23:45:20	1.1
+++ rpms/smeserver-clamav/sme10/smeserver-clamav.spec	2020/12/16 17:06:02	1.5
@@ -1,23 +1,26 @@
-# $Id: smeserver-clamav.spec,v 1.5 2015/12/01 18:14:45 vip-ire Exp $
+# $Id: smeserver-clamav.spec,v 1.4 2019/11/27 03:52:30 jpp Exp $
 
 Summary: SME Server module to configure clamav
 %define name smeserver-clamav
 Name: %{name}
-%define version 2.6.0
+%define version 2.7.0
 %define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.xz
+#Patch0: smeserver-clamav-2.7.0-bz123454-som-fix.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
-Requires: e-smith-base
-Requires: clamav >= 0.94
-Requires: clamd >= 0.94
-Requires: clamav-db
+Requires: e-smith-base >= 5.8.0-63
+Requires: clamav >= 0.103
+Requires: clamd >= 0.103
+Requires: clamav-data
+Requires: clamav-update
 Requires: e-smith-formmagick >= 1.4.0-12
+Requires: smeserver-spamassassin >= 2.7.0
 Provides: e-smith-clamav
 Obsoletes: e-smith-clamav
 Obsoletes: e-smith-antivirus
@@ -29,6 +32,20 @@ BuildRequires: e-smith-devtools
 SME Server enhancement to configure and run clamd and freshclam
 
 %changelog
+* Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-1
+- Updated to use 0.103+ from EPEL [SME: 11194]
+- Updated to use systemd
+
+* Tue Nov 26 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+- increase lower memory limit to 1GB [SME: 10833]
+
+* Thu Oct 24 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- fix for AllowSupplementaryGroups warning [SME: 10813]
+  thanks to  bunkobugsy 
+
+* Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
+- Rebuild for [SME: 9393]
+
 * Sat Feb 06 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -348,6 +365,7 @@ SME Server enhancement to configure and
 
 %prep
 %setup
+#%patch0 -p1
 
 %build
 perl createlinks
@@ -355,22 +373,46 @@ perl createlinks
 %pre
 
 %post
-rm -f /etc/cron.d/clamav
+
+# All a bit ugly clearing up due to migrating freshclam here and A5 updates
+# Most of this can go in due course
+
+echo "File cleanup"
+# cleanup old files
+
+rm -f /etc/cron.d/clamav 2>/dev/null || true
+rm -f /etc/logrotate.d/clamav 2>/dev/null || true
+rm -f /etc/clamd.d/scan.conf  2>/dev/null || true
+rm -rf /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/cron.daily/freshclam  2>/dev/null || true
+rm -f /etc/crond.daily/freshclam* 2>/dev/null || true
+rm -rf /var/clamav 2>/dev/null || true
+
+echo "Changing freshclam log owners"
+if [[ -d /var/log/freshclam ]]; then 
+  chown -R clamupdate:clamupdate /var/log/freshclam;
+  chown -R clamupdate:clamupdate /var/log/freshclam/*;
+fi
+
+echo "Changing clamd log owners"
+if [[ -d /var/log/clamd ]]; then 
+  chown -R clamscan:clamscan /var/log/clamd;
+  chown -R clamscan:clamscan /var/log/clamd/*;
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-  --file /var/service/freshclam/run 'attr(0755,root,root)' \
-  --file /var/service/freshclam/log/run 'attr(0755,root,root)' \
-  --dir /var/log/freshclam 'attr(2750,smelog,clamav)' \
-  --file /var/service/clamd/run 'attr(0755,root,root)' \
-  --file /var/service/clamd/log/run 'attr(0755,root,root)' \
-  --dir /var/log/clamd 'attr(2750,smelog,smelog)' \
-  --dir /var/spool/clamav/quarantine 'attr(2750,clamav,clamav)' \
+  --dir /var/log/freshclam 'attr(2755,clamupdate,clamupdate)' \
+  --dir /var/log/clamd 'attr(2755,clamscan,clamscan)' \
+  --dir /var/spool/clamav/quarantine 'attr(2750,clamscan,clamscan)' \
   --file /sbin/e-smith/freshclam-update-failed 'attr(0755,root,root)' \
   --file /sbin/e-smith/freshclam-update-ok 'attr(0755,root,root)' \
   --file /sbin/e-smith/smeserver-clamscan 'attr(0755,root,root)' \
+  --file /usr/lib/systemd/system/clamd.service 'attr(0644,root,root)' \
+  --file /usr/lib/systemd/system/freshclam.service 'attr(0644,root,root)' \
+  --dir /usr/lib/systemd/system/clamd.service.d 'attr(0755,root,root)' \
+  --dir /usr/lib/systemd/system/freshclam.service.d 'attr(0755,root,root)' \
   > %{name}-%{version}-%{release}-filelist
 
 %clean