From 927d25fa9c4f1575cfa7f0d7a1f806ba7fc8045d Mon Sep 17 00:00:00 2001
From: Jiri Kyjovsky <j1.kyjovsky@gmail.com>
Date: Sun, 28 Apr 2024 17:14:13 +0200
Subject: [PATCH] Enable RPM sysusers integration

Provide users/groups via `/usr/lib/sysusers.d`. This is going
to be handled by RPM as described in
https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation
and https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/NEFOV236FJYS2RED2SEOV5YHDFLDX7DK/#KB6KS3U7RO4AYANGSUNVSG7UF5AW52Q2

Relates to https://github.com/fedora-copr/copr/issues/2789
---
 mock-core-configs/mock-core-configs.spec      |  2 --
 {mock-core-configs => mock}/mock.conf         |  0
 mock/mock.spec                                | 20 ++++++++++++-------
 .../sysusers-handled-by-rpm.feature           |  3 +++
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename {mock-core-configs => mock}/mock.conf (100%)
 create mode 100644 releng/release-notes-next/sysusers-handled-by-rpm.feature

diff --git a/mock-core-configs/mock-core-configs.spec b/mock-core-configs/mock-core-configs.spec
index 420c5e8c9..869562f8f 100644
--- a/mock-core-configs/mock-core-configs.spec
+++ b/mock-core-configs/mock-core-configs.spec
@@ -50,8 +50,6 @@ Rocky Linux and various other specific or combined chroots.
 
 
 %install
-mkdir -p %{buildroot}%{_sysusersdir}
-
 mkdir -p %{buildroot}%{_sysconfdir}/mock/eol/templates
 mkdir -p %{buildroot}%{_sysconfdir}/mock/templates
 cp -a etc/mock/*.cfg %{buildroot}%{_sysconfdir}/mock
diff --git a/mock-core-configs/mock.conf b/mock/mock.conf
similarity index 100%
rename from mock-core-configs/mock.conf
rename to mock/mock.conf
diff --git a/mock/mock.spec b/mock/mock.spec
index fed1bae4a..18064ad97 100644
--- a/mock/mock.spec
+++ b/mock/mock.spec
@@ -1,9 +1,6 @@
 %bcond_with lint
 %bcond_without tests
 
-# mock group id allocate for Fedora
-%global mockgid 135
-
 %global __python %{__python3}
 %global python_sitelib %{python3_sitelib}
 
@@ -146,6 +143,9 @@ Mock plugin that preprocesses spec files using rpmautospec.
 %package filesystem
 Summary:  Mock filesystem layout
 Requires(pre):  shadow-utils
+BuildRequires:  systemd-rpm-macros
+
+%{?sysusers_requires_compat}
 
 %description filesystem
 Filesystem layout and group for Mock.
@@ -169,6 +169,9 @@ done
 
 ./precompile-bash-completion "mock.complete"
 
+# this is what %%sysusers_create_compat will expand to
+%{_rpmconfigdir}/sysusers.generate-pre.sh mock.conf > sysusers_script
+
 %install
 #base filesystem
 mkdir -p %{buildroot}%{_sysconfdir}/mock/eol/templates
@@ -213,13 +216,15 @@ install -d %{buildroot}/var/cache/mock
 mkdir -p %{buildroot}%{_pkgdocdir}
 install -p -m 0644 docs/site-defaults.cfg %{buildroot}%{_pkgdocdir}
 
+mkdir -p %{buildroot}%{_sysusersdir}
+install -p -D -m 0644 %{name}.conf %{buildroot}%{_sysusersdir}
+
 sed -i 's/^_MOCK_NVR = None$/_MOCK_NVR = "%name-%version-%release"/' \
     %{buildroot}%{_libexecdir}/mock/mock
 
-%pre filesystem
-# check for existence of mock group, create it if not found
-getent group mock > /dev/null || groupadd -f -g %mockgid -r mock
-exit 0
+
+%pre filesystem -f sysusers_script
+
 
 %check
 %if %{with lint}
@@ -257,6 +262,7 @@ pylint-3 py/mockbuild/ py/*.py py/mockbuild/plugins/* || :
 %config(noreplace) %{_sysconfdir}/%{name}/*.ini
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%config(noreplace) %{_sysusersdir}/mock.conf
 
 # directory for personal gpg keys
 %dir %{_sysconfdir}/pki/mock
diff --git a/releng/release-notes-next/sysusers-handled-by-rpm.feature b/releng/release-notes-next/sysusers-handled-by-rpm.feature
new file mode 100644
index 000000000..7c163b740
--- /dev/null
+++ b/releng/release-notes-next/sysusers-handled-by-rpm.feature
@@ -0,0 +1,3 @@
+New Mock RPM package provides the systemd-sysusers drop-in configuration file for automatic
+`mock 135` group ID allocation.
+https://rpm-software-management.github.io/rpm/manual/users_and_groups.html