Same mitigation for clamav-milter

This commit is contained in:
Sérgio M. Basto 2018-06-03 02:45:21 +01:00
parent ea823d8b6c
commit ef587a6a43

View File

@ -301,13 +301,13 @@ Obsoletes: clamav-scanner-upstart < %{version}-%{release}
Provides: clamav-server-sysvinit = %{version}-%{release}
Obsoletes: clamav-server-sysvinit < %{version}-%{release}
%description -n clamd
The Clam AntiVirus Daemon
See the README file how this can be done with a minimum of effort.
This package contains a generic system wide clamd service which is
e.g. used by the clamav-milter package.
%package server-systemd
Requires: clamd = %{version}-%{release}
Summary: Systemd initscripts for clamav server
@ -323,6 +323,7 @@ Summary: systemd initscripts for clamav scanner daemon
Empty package just to allow migration of service without stop it and disable it
%files scanner-systemd
%package milter
Summary: Milter module for the Clam Antivirus scanner
Group: System Environment/Daemons
@ -351,14 +352,21 @@ Provides: clamav-milter-upstart = %version-%release
%endif
Obsoletes: clamav-milter-upstart < %version-%release
%if %{with systemd}
Provides: clamav-milter-systemd = %{version}-%{release}
%endif
Obsoletes: clamav-milter-systemd < %{version}-%{release}
#if %{with systemd}
#Provides: clamav-milter-systemd = %{version}-%{release}
#endif
#Obsoletes: clamav-milter-systemd < %{version}-%{release}
%description milter
This package contains files which are needed to run the clamav-milter.
%package milter-systemd
Requires: clamd = %{version}-%{release}
Summary: Systemd initscripts for the clamav sendmail-milter
%description milter-systemd
Empty package just to allow migration of service without stop it and disable it
%files milter-systemd
## ------------------------------------------------------------
%prep
@ -671,7 +679,9 @@ test -e %milterlog || {
/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || :
%endif
%if %{with systemd}
%systemd_post clamav-milter.service
#systemd_post clamav-milter.service
# Package upgrade, not uninstall
systemctl try-restart clamav-milter.service >/dev/null 2>&1 || :
%{?with_tmpfiles:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamav-milter.conf || :}
%endif