--- rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2020/12/16 17:06:02 1.5 +++ rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2021/11/15 18:20:56 1.14 @@ -1,16 +1,20 @@ -# $Id: smeserver-clamav.spec,v 1.4 2019/11/27 03:52:30 jpp Exp $ +# $Id: smeserver-clamav.spec,v 1.13 2021/06/09 15:33:00 jpp Exp $ Summary: SME Server module to configure clamav %define name smeserver-clamav Name: %{name} %define version 2.7.0 -%define release 1 +%define release 10 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 +Patch0: smeserver-clamav-2.7.0-bz11103-improvements.patch +Patch1: smeserver-clamav-2.7.0-bz11313-clamdtop.patch +Patch2: smeserver-clamav-2.7.0-bz11520-clamd2scan.conf.patch +Patch3: smeserver-clamav-2.7.0-bz11755-identify-freshclam-error.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-lib @@ -32,9 +36,37 @@ BuildRequires: e-smith-devtools SME Server enhancement to configure and run clamd and freshclam %changelog +* Mon Nov 15 2021 Jean-Philippe Pialasse 2.7.0-10.sme +- identify from which server is freshclam error [SME: 11755] + fix from Graeme Fleming + +* Wed Jun 09 2021 Jean-Philippe Pialasse 2.7.0-9.sme +- fix typo in logrotate [SME: 11608] + +* Sun Apr 18 2021 Jean-Philippe Pialasse 2.7.0-8.sme +- fix typo and missing +x [SME: 11520] + +* Wed Apr 07 2021 Jean-Philippe Pialasse 2.7.0-6.sme +- fix issues with non epel standard scan.conf [SME: 11520] + move clamd.conf to scan.conf + remove alias for clamtop + add a wrapper for clamdscan to force --fdpass + +* Fri Jan 08 2021 Jean-Philipe Pialasse 2.7.0-5.sme +- ease use of clamdtop [SME: 11313] + +* Wed Jan 06 2021 Jean-Philipe Pialasse 2.7.0-4.sme +- fix Transaction check error [SME: 11311] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.7.0-2.sme +- add pid folder /run/clamd/ [SME: 11103] + few improvements +- create update event [SME: 11162] + * Wed Dec 16 2020 John Crisp 2.7.0-1 - Updated to use 0.103+ from EPEL [SME: 11194] -- Updated to use systemd +- Updated to use systemd for clamd [SME: 11103] +- Updated to use systemd for freshclam [SME: 11104] * Tue Nov 26 2019 Jean-Philipe Pialasse 2.6.0-4.sme - increase lower memory limit to 1GB [SME: 10833] @@ -365,35 +397,43 @@ SME Server enhancement to configure and %prep %setup -#%patch0 -p1 +%patch0 -p1 +mkdir -p root/run/clamd +rm -rf root/etc/e-smith/templates/usr/lib/systemd/system/freshclam.service.d +rm -rf root/usr/lib/systemd/system/freshclam.service.d +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build perl createlinks %pre - +if [ $1 -gt 1 ] ; then + if [ -e /var/service/clamd/run ] ; then + /usr/bin/sv d clamd + /usr/bin/sv d clamd/log + fi +fi +if [ $1 -gt 1 ] ; then + if [ -e /var/service/freshclam/run ] ; then + /usr/bin/sv d freshclam + /usr/bin/sv d freshclam/log + fi +fi %post +# removing old conf file +if [[ -f /etc/clamd.d/clamd.conf ]]; then + rm -f /etc/clamd.d/clamd.conf +fi -# 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" +#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" +#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/*; @@ -403,9 +443,11 @@ fi rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --dir /run/clamd 'attr(2775,clamscan,virusgroup)' \ --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/clamdscan 'attr(0755,root,root)' \ --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)' \