diff --git a/clamav-clamonacc-service.patch b/clamav-clamonacc-service.patch new file mode 100644 index 0000000000000000000000000000000000000000..c72e80645cf623bb72658caf63d569a842795139 --- /dev/null +++ b/clamav-clamonacc-service.patch @@ -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 diff --git a/clamav.spec b/clamav.spec index 839f50c5c960cdcea2ddddf469a9fc82967da87d..d7c86b4c68355ac6b453780379bc5eb50149291e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -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 - 0.103.6-2 +- Fix start clamav-clamonacc-service + * Fri May 13 2022 houyingchao - 0.103.6-1 - Upgrade to 0.103.6 - Fix CVE-2022-20785 CVE-2022-20771 CVE-2022-20770 CVE-2022-20792