--- rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2021/01/08 22:25:52 1.9 +++ rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2022/05/04 13:19:21 1.19 @@ -1,10 +1,10 @@ -# $Id: smeserver-clamav.spec,v 1.8 2021/01/08 16:04:20 jpp Exp $ +# $Id: smeserver-clamav.spec,v 1.18 2022/03/14 07:03:28 jpp Exp $ Summary: SME Server module to configure clamav %define name smeserver-clamav Name: %{name} %define version 2.7.0 -%define release 5 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -12,6 +12,11 @@ Group: System Environment/Base Source: %{name}-%{version}.tar.xz 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 +Patch4: smeserver-clamav-2.7.0-bz11695-properties.patch +Patch5: smeserver-clamav-2.7.0-bz11695-propertyfix.patch +Patch6: smeserver-clamav-2.7.0-bz11963-logrotate.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -34,6 +39,42 @@ BuildRequires: e-smith-devtools SME Server enhancement to configure and run clamd and freshclam %changelog +* Wed May 04 2022 Zsolt Vasarhelyi 2.7.0-15.sme +- logrotate clamd keeps logging to old log [SME: 11963] + +* Mon Mar 14 2022 Jean-Philippe Pialasse 2.7.0-14.sme +- remove default property ArchiveBlockEncrypted [SME: 11695] + +* Sat Jan 01 2022 Terry Fage 2.7.0-13.sme +- fix property name error 2.7.0-12.sme [SME: 11695] + +* Mon Dec 20 2021 Jean-Philippe Pialasse 2.7.0-12.sme +- fix spec file error 2.7.0-11.sme [SME: 11474] + +* Mon Dec 20 2021 Jean-Philippe Pialasse 2.7.0-11.sme +- rename property ArchiveBlockEncrypted to AlertEncrypted as per upstream [SME: 11695] + added properties AlertBrokenExecutables AlertExceedsMax AlertOLE2Macros + AlertPartitionIntersection AlertPhishingCloak and AlertPhishingSSLMismatch + with default no + added property HeuristicAlerts with default yes +- fix noise on centos2sme [SME: 11474] + +* 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] @@ -384,6 +425,11 @@ 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 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build perl createlinks @@ -402,34 +448,19 @@ if [ $1 -gt 1 ] ; then 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 - -# no clue where it comes from not in sme9, not in new rpms, not templated -#rm -f /etc/cron.d/clamav 2>/dev/null || true -# this is clamd-0.100.2-2.el7.sme.x86_64 owned and not templated, removing the rpm will remove it ; useless -#rm -f /etc/logrotate.d/clamav 2>/dev/null || true -# this is clamav-filesystem-0.103.0-1.el7.noarch owned, should be done elsewhere, will be readded everytime the rpm is updated -#rm -f /etc/clamd.d/scan.conf 2>/dev/null || true -# should only be removed from prep as it is owned by this rpm -#rm -rf /etc/e-smith/events/bootstrap-console-save/templates2expand/etc/cron.daily/freshclam 2>/dev/null || true -# clamav-db and clamd rpm owned, might remains because of the content -#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/*; fi %install @@ -440,6 +471,7 @@ rm -rf $RPM_BUILD_ROOT --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)' \