import CS dbus-broker-28-9.el9

SOURCES/dbus-broker.sysusers.conf

@@ -0,0 +1 @@
+u dbus 81 'System Message Bus' - -

SPECS/dbus-broker.spec

@@ -1,12 +1,11 @@
-%global dbus_user_id 81
-
 Name:                 dbus-broker
 Version:              28
-Release:              7%{?dist}
+Release:              9%{?dist}
 Summary:              Linux D-Bus Message Broker
 License:              ASL 2.0
 URL:                  https://github.com/bus1/dbus-broker
 Source0:              https://github.com/bus1/dbus-broker/releases/download/v%{version}/dbus-broker-%{version}.tar.xz
+Source1:              dbus-broker.sysusers.conf
 Patch0000:            https://github.com/bus1/dbus-broker/commit/1add8a7d60e46806e0ef87994d3024245db0d84a.patch
 Patch0001:            https://github.com/bus1/dbus-broker/commit/b82b670bfec6600d0144bcb9ca635fb07c80118f.patch
 Patch0002:            cve-2022-31212.patch
@@ -24,8 +23,9 @@ BuildRequires:        gcc
 BuildRequires:        glibc-devel
 BuildRequires:        meson
 BuildRequires:        python3-docutils
+BuildRequires:        systemd-rpm-macros
+%{?sysusers_requires_compat}
 Requires:             dbus-common
-Requires(pre):        shadow-utils
 Requires(post):       /usr/bin/systemctl
 # for triggerpostun
 Requires:             /usr/bin/systemctl
@@ -47,20 +47,13 @@ recent Linux kernel releases.
 %install
 %meson_install
 
+install -m0644 -D %{SOURCE1} %{buildroot}%{_sysusersdir}/dbus-broker.conf
+
 %check
 %meson_test
 
 %pre
-# create dbus user and group
-getent group dbus >/dev/null || groupadd -f -g %{dbus_user_id} -r dbus
-if ! getent passwd dbus >/dev/null ; then
-    if ! getent passwd %{dbus_user_id} >/dev/null ; then
-      useradd -r -u %{dbus_user_id} -g %{dbus_user_id} -d '/' -s /sbin/nologin -c "System message bus" dbus
-    else
-      useradd -r -g %{dbus_user_id} -d '/' -s /sbin/nologin -c "System message bus" dbus
-    fi
-fi
-exit 0
+%sysusers_create_compat %{SOURCE1}
 
 %post
 %systemd_post dbus-broker.service
@@ -96,8 +89,17 @@ fi
 %{_mandir}/man1/dbus-broker-launch.1*
 %{_unitdir}/dbus-broker.service
 %{_userunitdir}/dbus-broker.service
+%{_sysusersdir}/dbus-broker.conf
 
 %changelog
+* Tue May 19 2026 Siteshwar Vashisht <svashisht@redhat.com> - 28-9
+- Use systemd-sysusers to create users
+  Resolves: RHEL-109036
+
+* Mon Sep 22 2025 Lukas Nykryn <lnykryn@redhat.com> - 28-8
+- Switch from useradd to systemd sysusers
+Resolves: RHEL-109036
+
 * Mon Aug 22 2022 Frantisek Sumsal <fsumsal@redhat.com> - 28-7
 - Add coverage for CVE-2022-31213 and other config-file-related issues
 Related: CVE-2022-31213
@@ -314,4 +316,3 @@ Resolves: CVE-2022-31213
 
 * Sun Aug 13 2017 Tom Gundersen <teg@jklm.no> - 1-1
 - Initial RPM release
-