From c7cdb27db0c8c52e993e0bc04724dce7a0e5fb92 Mon Sep 17 00:00:00 2001
From: importbot <releng@rockylinux.org>
Date: Tue, 3 Dec 2024 09:44:31 +0000
Subject: [PATCH] import systemd-256-18.el10
---
SOURCES/systemd-resolved.sysusers | 8 ++++++++
SPECS/systemd.spec | 10 +++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 SOURCES/systemd-resolved.sysusers
diff --git a/SOURCES/systemd-resolved.sysusers b/SOURCES/systemd-resolved.sysusers
new file mode 100644
index 0000000..37ccb7a
--- /dev/null
+++ b/SOURCES/systemd-resolved.sysusers
@@ -0,0 +1,8 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+u systemd-resolve 193 "systemd Resolver"
\ No newline at end of file
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 9415df9..bb57491 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -48,7 +48,7 @@ Url: https://systemd.io
# Allow users to specify the version and release when building the rpm by
# setting the %%version_override and %%release_override macros.
Version: %{?version_override}%{!?version_override:256}
-Release: 17%{?dist}
+Release: 18%{?dist}
%global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)
@@ -94,6 +94,7 @@ Source24: sysusers.generate-pre.sh
Source25: 98-default-mac-none.link
Source26: rc.local
+Source27: systemd-resolved.sysusers
%if 0
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
@@ -621,6 +622,7 @@ Obsoletes: %{name} < 249~~
Requires: libidn2.so.0%{?elf_suffix}
Requires: libidn2.so.0(IDN2_0.0.0)%{?elf_bits}
Requires(posttrans): grep
+%{?sysusers_requires_compat}
%description resolved
systemd-resolved is a system service that provides network name resolution to
@@ -1048,6 +1050,9 @@ fi
%systemd_postun_with_restart %journal_remote_units_restart
%firewalld_reload
+%pre resolved
+%sysusers_create_compat %{SOURCE27}
+
%post resolved
%systemd_post systemd-resolved.service
@@ -1140,6 +1145,9 @@ rm -f .file-list-*
rm -f %{name}.lang
%changelog
+* Tue Nov 19 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-18
+- add %%pre sysuser scriptlet for resolved subpackage (RHEL-50564)
+
* Tue Nov 12 2024 systemd maintenance team <systemd-maint@redhat.com> - 256-17
- socket: fix socket activation of stopped services with pinned FD store (RHEL-60896)
--
GitLab