From 55a6a961aaec0b8b535b270e919a37ea15f46a95 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 28 Apr 2025 14:56:26 +0800
Subject: [PATCH] change user and group creation to systemd style (recognized
 by rpm 4.20)

---
 clamav-milter.sysusers.conf |  3 +++
 clamav.spec                 | 39 +++++++++++++++----------------------
 clamav.sysusers.conf        |  3 +++
 clamd.sysusers.conf         |  2 ++
 4 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 clamav-milter.sysusers.conf
 create mode 100644 clamav.sysusers.conf
 create mode 100644 clamd.sysusers.conf

diff --git a/clamav-milter.sysusers.conf b/clamav-milter.sysusers.conf
new file mode 100644
index 0000000..d244cc1
--- /dev/null
+++ b/clamav-milter.sysusers.conf
@@ -0,0 +1,3 @@
+u clamilt - 'Clamav milter user' %{_rundir}/clamav-milter -
+m clamilt virusgroup
+m clamilt clamscan
diff --git a/clamav.spec b/clamav.spec
index 4ee7c89..296540b 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.2
-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
@@ -25,6 +25,9 @@ Source1:    clamav-types.h
 #for server
 Source3:    clamd.logrotate
 Source5:    clamd-README
+Source6:    clamav.sysusers.conf
+Source7:    clamd.sysusers.conf
+Source8:    clamav-milter.sysusers.conf
 # To download the *.cvd, go to https://www.clamav.net and use the links
 # there (I renamed the files to add the -version suffix for verifying).
 # Check the first line of the file for version or run file *cvd
@@ -339,6 +342,9 @@ install -m 0644 %SOURCE1 %{buildroot}%{_includedir}/clamav-types.h
 # TODO: Evaluate using upstream's unit with clamav-daemon.socket
 rm %{buildroot}%{_unitdir}/clamav-daemon.*
 
+install -m0644 -D %{S:6} %{buildroot}%{_sysusersdir}/clamav.conf
+install -m0644 -D %{S:7} %{buildroot}%{_sysusersdir}/clamd.conf
+install -m0644 -D %{S:8} %{buildroot}%{_sysusersdir}/clamav-milter.conf
 
 %check
 %ctest -E valgrind
@@ -366,22 +372,10 @@ done
 
 
 %pre filesystem
-getent group %{updateuser} >/dev/null || groupadd -r %{updateuser}
-getent passwd %{updateuser} >/dev/null || \
-    useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \
-    -c "Clamav database update user" %{updateuser}
-getent group virusgroup >/dev/null || groupadd -r virusgroup
-usermod %{updateuser} -a -G virusgroup
-exit 0
-
+%sysusers_create_compat %{S:6}
 
 %pre -n clamd
-getent group %{scanuser} >/dev/null || groupadd -r %{scanuser}
-getent passwd %{scanuser} >/dev/null || \
-    useradd -r -g %{scanuser} -d / -s /sbin/nologin \
-    -c "Clamav scanner user" %{scanuser}
-usermod %{scanuser} -a -G virusgroup
-exit 0
+%sysusers_create_compat %{S:7}
 
 %post -n clamd
 # Point to the new service unit
@@ -402,12 +396,7 @@ exit 0
 /usr/sbin/groupmems -g %{scanuser} -a %{milteruser} &>/dev/null || :
 
 %pre milter
-getent group %{milteruser} >/dev/null || groupadd -r %{milteruser}
-getent passwd %{milteruser} >/dev/null || \
-    useradd -r -g %{milteruser} -d %{_rundir}/clamav-milter -s /sbin/nologin \
-    -c "Clamav Milter user" %{milteruser}
-usermod %{milteruser} -a -G virusgroup
-exit 0
+%sysusers_create_compat %{S:8}
 
 %post milter
 %systemd_post clamav-milter.service
@@ -465,7 +454,7 @@ exit 0
 %dir %{_sysconfdir}/clamd.d
 # Used by both clamd, clamdscan, and clamonacc
 %config(noreplace) %{_sysconfdir}/clamd.d/scan.conf
-
+%{_sysusersdir}/clamav.conf
 
 %files data
 %defattr(-,%{updateuser},%{updateuser},-)
@@ -504,7 +493,7 @@ exit 0
 %{_sbindir}/clamd
 %{_unitdir}/clamd@.service
 %{_tmpfilesdir}/clamd.scan.conf
-
+%{_sysusersdir}/clamd.conf
 
 %files milter
 %{_sbindir}/*milter*
@@ -513,8 +502,12 @@ exit 0
 %dir %{_sysconfdir}/mail
 %config(noreplace) %{_sysconfdir}/mail/clamav-milter.conf
 %{_tmpfilesdir}/clamav-milter.conf
+%{_sysusersdir}/clamav-milter.conf
 
 %changelog
+* Mon Apr 28 2025 Funda Wang <fundawang@yeah.net> - 1.4.2-3
+- change user and group creation to systemd style (recognized by rpm 4.20)
+
 * Wed Apr 09 2025 wangkai <13474090681@163.com> - 1.4.2-2
 - Update buildrequires and patch
 
diff --git a/clamav.sysusers.conf b/clamav.sysusers.conf
new file mode 100644
index 0000000..0a758d5
--- /dev/null
+++ b/clamav.sysusers.conf
@@ -0,0 +1,3 @@
+g virusgroup -
+u clamupdate - 'Clamav database update user' %{homedir} -
+m clamupdate virusgroup
diff --git a/clamd.sysusers.conf b/clamd.sysusers.conf
new file mode 100644
index 0000000..2783802
--- /dev/null
+++ b/clamd.sysusers.conf
@@ -0,0 +1,2 @@
+u clamscan - 'Clamav scanner user' - -
+m clamscan virusgroup
-- 
Gitee