From 8763c6738c848a7eee6f395f5b3334d88c97410e Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 12 Aug 2025 14:05:32 +0800 Subject: [PATCH] Fix service stop error and installation error --- clamav-clamonacc-service.patch | 10 +++++----- clamav-milter.sysusers.conf | 2 +- clamav.spec | 6 +++++- clamav.sysusers.conf | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/clamav-clamonacc-service.patch b/clamav-clamonacc-service.patch index b376dba..eb052a8 100644 --- a/clamav-clamonacc-service.patch +++ b/clamav-clamonacc-service.patch @@ -1,7 +1,6 @@ -diff -up clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service clamav-1.4.0/clamonacc/clamav-clamonacc.service.in ---- clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service 2024-08-15 20:12:56.950984705 -0600 -+++ clamav-1.4.0/clamonacc/clamav-clamonacc.service.in 2024-08-15 20:14:19.088770747 -0600 -@@ -4,14 +4,12 @@ +--- a/clamonacc/clamav-clamonacc.service.in 2025-08-12 11:31:36.330346590 +0800 ++++ b/clamonacc/clamav-clamonacc.service.in 2025-08-12 11:32:07.010346590 +0800 +@@ -4,15 +4,12 @@ [Unit] Description=ClamAV On-Access Scanner Documentation=man:clamonacc(8) man:clamd.conf(5) https://docs.clamav.net/ @@ -14,7 +13,8 @@ diff -up clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service cl 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 +-ExecStop=/bin/kill -SIGKILL $MAINPID +ExecStart=@prefix@/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf - ExecStop=/bin/kill -SIGKILL $MAINPID [Install] + WantedBy=multi-user.target diff --git a/clamav-milter.sysusers.conf b/clamav-milter.sysusers.conf index d244cc1..ed7f822 100644 --- a/clamav-milter.sysusers.conf +++ b/clamav-milter.sysusers.conf @@ -1,3 +1,3 @@ -u clamilt - 'Clamav milter user' %{_rundir}/clamav-milter - +u clamilt - 'Clamav milter user' /run/clamav-milter - m clamilt virusgroup m clamilt clamscan diff --git a/clamav.spec b/clamav.spec index 49f8f37..ab34f7b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -16,7 +16,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.4.3 -Release: 2 +Release: 3 License: GPL-2.0-only URL: https://www.clamav.net/ Source0: https://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz @@ -505,6 +505,10 @@ done %{_sysusersdir}/clamav-milter.conf %changelog +* Tue Aug 12 2025 yaoxin <1024769339@qq.com> - 1.4.3-3 +- Fix clamav-clamonacc.service and clamonacc.service stop error +- Fix clamav-milter, and clamav-filesystem installation error + * Thu Jun 26 2025 yaoxin <1024769339@qq.com> - 1.4.3-2 - Fix clamav downgrade failure diff --git a/clamav.sysusers.conf b/clamav.sysusers.conf index 0a758d5..ce610ff 100644 --- a/clamav.sysusers.conf +++ b/clamav.sysusers.conf @@ -1,3 +1,3 @@ g virusgroup - -u clamupdate - 'Clamav database update user' %{homedir} - +u clamupdate - 'Clamav database update user' /var/lib/clamav - m clamupdate virusgroup -- Gitee