Fix start clamav-clamonacc-service

(cherry picked from commit b4e8e04eb1d5854fe366f437c5ac0a5ac11d5638)
This commit is contained in:
houyingchao 2022-05-25 16:46:28 +08:00 committed by openeuler-sync-bot
parent c6ec14912a
commit 6002168fd3
2 changed files with 24 additions and 1 deletions

View File

@ -0,0 +1,19 @@
--- ./clamonacc/clamav-clamonacc.service.in.clamonacc-service 2022-05-05 22:36:27.572671129 +0100
+++ ./clamonacc/clamav-clamonacc.service.in 2022-05-05 22:43:05.204324524 +0100
@@ -4,14 +4,12 @@
[Unit]
Description=ClamAV On-Access Scanner
Documentation=man:clamonacc(8) man:clamd.conf(5) https://docs.clamav.net/
-Requires=clamav-daemon.service
-After=clamav-daemon.service syslog.target network.target
+After=clamd@scan.service syslog.target network.target
[Service]
Type=simple
User=root
-ExecStartPre=/bin/bash -c "while [ ! -S /run/clamav/clamd.ctl ]; do sleep 1; done"
-ExecStart=@prefix@/sbin/clamonacc -F --log=/var/log/clamav/clamonacc.log --move=/root/quarantine
+ExecStart=@prefix@/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
Name: clamav
Summary: End-user tools for the Clam Antivirus scanner
Version: 0.103.6
Release: 1
Release: 2
License: GPLv2 and Public Domain and bzip2-1.0.6 and Zlib and Apache-2.0
URL: https://www.clamav.net/
@ -24,6 +24,7 @@ Source15: clamd@.service
Patch0001: clamav-stats-deprecation.patch
Patch0002: clamav-default_confs.patch
Patch0003: clamav-0.99-private.patch
Patch0005: clamav-clamonacc-service.patch
Patch0006: clamav-freshclam.service.patch
Patch0007: clamav-type-conversion.patch
Patch0008: clamav-return-val-process.patch
@ -412,6 +413,9 @@ test -e %_var/log/clamav-milter.log || {
%changelog
* Wed May 25 2022 houyingchao <houyingchao@h-partners.com> - 0.103.6-2
- Fix start clamav-clamonacc-service
* Fri May 13 2022 houyingchao <houyingchao@h-partners.com> - 0.103.6-1
- Upgrade to 0.103.6
- Fix CVE-2022-20785 CVE-2022-20771 CVE-2022-20770 CVE-2022-20792