--- rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2016/02/05 23:45:20 1.1 +++ rpms/smeserver-clamav/sme10/smeserver-clamav.spec 2021/01/06 22:21:20 1.7 @@ -1,23 +1,27 @@ -# $Id: smeserver-clamav.spec,v 1.5 2015/12/01 18:14:45 vip-ire Exp $ +# $Id: smeserver-clamav.spec,v 1.6 2021/01/03 04:31:10 jpp Exp $ Summary: SME Server module to configure clamav %define name smeserver-clamav Name: %{name} -%define version 2.6.0 -%define release 1 +%define version 2.7.0 +%define release 3 Version: %{version} Release: %{release}%{?dist} License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.xz +Patch0: smeserver-clamav-2.7.0-bz11103-improvements.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 +33,29 @@ BuildRequires: e-smith-devtools SME Server enhancement to configure and run clamd and freshclam %changelog +* Wed Jan 06 2021 Jean-Philipe Pialasse 2.7.0-3.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 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] + +* Thu Oct 24 2019 Jean-Philipe Pialasse 2.6.0-3.sme +- fix for AllowSupplementaryGroups warning [SME: 10813] + thanks to bunkobugsy + +* Thu May 12 2016 Daniel Berteaud 2.6.0-2.sme +- Rebuild for [SME: 9393] + * Sat Feb 06 2016 stephane de Labrusse 2.6.0-1.sme - Initial release to sme10 @@ -348,29 +375,73 @@ SME Server enhancement to configure and %prep %setup +%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 %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 -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 + +# 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" +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 /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/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