From cae3dd3fd55afe8e6f51e94a0f40315428fe74a5 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 15 Jan 2026 12:00:00 +0100
Subject: [PATCH] use sysuser setting for uuidd

Resolves: RHEL-132706
(cherry picked from commit 793c96842a415e6fba8086d9fd84ba54285577de)
---
 util-linux-uuidd-sysusers.conf |  1 +
 util-linux.spec                | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 util-linux-uuidd-sysusers.conf

diff --git a/util-linux-uuidd-sysusers.conf b/util-linux-uuidd-sysusers.conf
new file mode 100644
index 0000000..afd02eb
--- /dev/null
+++ b/util-linux-uuidd-sysusers.conf
@@ -0,0 +1 @@
+u uuidd - "UUID generator helper daemon" /var/lib/libuuid
diff --git a/util-linux.spec b/util-linux.spec
index 7a84da1..9cd213f 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.37.4
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: http://en.wikipedia.org/wiki/Util-linux
 
@@ -28,6 +28,7 @@ BuildRequires: popt-devel
 BuildRequires: libutempter-devel
 Buildrequires: systemd-devel
 BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
 Buildrequires: libuser-devel
 BuildRequires: libcap-ng-devel
 BuildRequires: %{pypkg}-devel
@@ -37,6 +38,7 @@ BuildRequires: rubygem-asciidoctor
 %ifarch ppc64le
 BuildRequires: librtas-devel
 %endif
+%{?sysusers_requires_compat}
 
 # enable if make changes to build-system
 #BuildRequires: autoconf
@@ -55,6 +57,7 @@ Source12: util-linux-su.pamd
 Source13: util-linux-su-l.pamd
 Source14: util-linux-runuser.pamd
 Source15: util-linux-runuser-l.pamd
+Source16: util-linux-uuidd-sysusers.conf
 
 ### Obsoletes & Conflicts & Provides
 Conflicts: initscripts < 9.79-4
@@ -504,6 +507,8 @@ install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/uuidd.conf
 install -d ${RPM_BUILD_ROOT}/run/uuidd
 install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
 
+install -m 644 -D %{SOURCE16} %{buildroot}%{_sysusersdir}/uuidd-sysusers.conf
+
 # /etc/adjtime
 install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/adjtime
 
@@ -605,11 +610,8 @@ for I in /etc/blkid.tab /etc/blkid.tab.old \
 done
 
 %pre -n uuidd
-getent group uuidd >/dev/null || groupadd -r uuidd
-getent passwd uuidd >/dev/null || \
-useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
-    -c "UUID generator helper daemon" uuidd
-exit 0
+%sysusers_create_compat %{SOURCE16}
+
 
 # Please, keep uuidd running after installation! Note that systemd_post is
 # "systemctl preset" and it enable/disable service only.
@@ -1010,6 +1012,7 @@ fi
 %dir %attr(2775, uuidd, uuidd) /run/uuidd
 %{compldir}/uuidd
 %{_tmpfilesdir}/uuidd.conf
+%{_sysusersdir}/uuidd-sysusers.conf
 
 
 %files -n libfdisk
@@ -1085,6 +1088,9 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
+* Mon Jan 19 2026 Karel Zak <kzak@redhat.com> 2.37.4-25
+- fix RHEL-132706 - use sysusers.d for uuidd
+
 * Mon Dec 15 2025 Karel Zak <kzak@redhat.com> 2.37.4-24
 - fix RHEL-133956 - login-utils: fix setpwnam() buffer use [CVE-2025-14104]