/[smeserver]/rpms/smeserver-clamav/sme10/smeserver-clamav.spec

Diff of /rpms/smeserver-clamav/sme10/smeserver-clamav.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.4 by jpp,
Wed Nov 27 03:52:30 2019 UTC
+Revision 1.6 by jpp,
Sun Jan  3 04:31:10 2021 UTC
 Line 1
- # $Id: smeserver-clamav.spec,v 1.3 2019/10/25 03:14:56 jpp Exp $
+ # $Id: smeserver-clamav.spec,v 1.5 2020/12/16 17:06:02 jcrisp 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 4
+ %define release 2
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: System Environment/Base
  Source: %{name}-%{version}.tar.xz
- Patch0: smeserver-clamav-2.6.0-bz10813-AllowSupplementaryGroups.patch
+ Patch0: smeserver-clamav-2.7.0-bz11103-improvements.patch
- Patch1: smeserver-clamav-2.6.0-bz10833-lowerMEMLIMITto1g.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
  Requires: e-smith-lib
- Requires: e-smith-base
+ Requires: e-smith-base >= 5.8.0-63
- Requires: clamav >= 0.94
+ Requires: clamav >= 0.103
- Requires: clamd >= 0.94
+ Requires: clamd >= 0.103
- Requires: clamav-db
+ 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
-Line 31 
 BuildRequires: e-smith-devtools
+Line 33 
 BuildRequires: e-smith-devtools
  SME Server enhancement to configure and run clamd and freshclam
  %changelog
+ * Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <jcrisp@safeandsoundit.co.uk> 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 <tests@pialasse.com> 2.6.0-4.sme
  - increase lower memory limit to 1GB [SME: 10833]
-Line 361 
 SME Server enhancement to configure and
+Line 373 
 SME Server enhancement to configure and
  %prep
  %setup
  %patch0 -p1
- %patch1 -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)' \
+   --dir /run/clamd 'attr(2775,clamscan,virusgroup)' \
-   --file /var/service/freshclam/log/run 'attr(0755,root,root)' \
+   --dir /var/log/freshclam 'attr(2755,clamupdate,clamupdate)' \
-   --dir /var/log/freshclam 'attr(2750,smelog,clamav)' \
+   --dir /var/log/clamd 'attr(2755,clamscan,clamscan)' \
-   --file /var/service/clamd/run 'attr(0755,root,root)' \
+   --dir /var/spool/clamav/quarantine 'attr(2750,clamscan,clamscan)' \
-   --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)' \
    --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

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1