From 3c24f0acb5517ab04414ef4639128f21f25957be Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 11 2024 10:19:14 +0000 Subject: Various fixes - Update UID classification patch to match Rawhide - Drop conflicts/provides/obsoletes on epel-systemd-rpm-macros as it only existed on CentOS Stream 8 - Drop 'v' from version to match Rawhide. - Add conditional grubby/sdubby version depends again to match Rawhide. --- diff --git a/30846.patch b/30846.patch index 84a4163..f135830 100644 --- a/30846.patch +++ b/30846.patch @@ -1,4 +1,4 @@ -From 07fd822c59e29b4f5e7dab029ea1186c1b862e3e Mon Sep 17 00:00:00 2001 +From ca1344d04a9c1804234417dcfbd868524abc7ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jan 2024 11:28:04 +0100 Subject: [PATCH] journal: again create user journals for users with high uids @@ -39,13 +39,13 @@ revert the change to fix user systems. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2251843. --- - src/basic/uid-alloc-range.c | 2 +- + src/basic/uid-classification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/basic/uid-alloc-range.c b/src/basic/uid-alloc-range.c -index 669cb6d56f7be..7b724b7959f60 100644 ---- a/src/basic/uid-alloc-range.c -+++ b/src/basic/uid-alloc-range.c +diff --git a/src/basic/uid-classification.c b/src/basic/uid-classification.c +index e2d2cebc6d..2c8b06c0d3 100644 +--- a/src/basic/uid-classification.c ++++ b/src/basic/uid-classification.c @@ -127,5 +127,5 @@ bool uid_for_system_journal(uid_t uid) { /* Returns true if the specified UID shall get its data stored in the system journal. */ diff --git a/systemd.spec b/systemd.spec index 5145714..f0fc71c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -378,11 +378,6 @@ Systemd PAM module registers the session with systemd-logind. %package rpm-macros Summary: Macros that define paths and scriptlets related to systemd BuildArch: noarch -# Make sure we obsolete the existing version and any possible future versions -# of epel-rpm-macros-systemd in c8s and c9s. -Conflicts: epel-rpm-macros-systemd < 10-0 -Obsoletes: epel-rpm-macros-systemd < 10-0 -Provides: epel-rpm-macros-systemd = 10-0 %description rpm-macros Just the definitions of rpm macros. @@ -421,6 +416,8 @@ Obsoletes: systemd < 245.6-1 Provides: udev = %{version} Provides: udev%{_isa} = %{version} Obsoletes: udev < 183 +Requires: (grubby > 8.40-72 if grubby) +Requires: (sdubby > 1.0-3 if sdubby) Conflicts: systemd-timesyncd < %{version}-%{release} Obsoletes: systemd-timesyncd < %{version}-%{release} Provides: systemd-timesyncd = %{version}-%{release} @@ -766,8 +763,7 @@ CONFIGURE_OPTS=( -Dsplit-bin=true -Db_ndebug=false -Dman=%[%{with docs}?"enabled":"disabled"] - # there is stuff that relies on the "v" prefix - -Dversion-tag=v%{version}%[%{without upstream}?"-%{release}":""] + -Dversion-tag=%{version}%[%{without upstream}?"-%{release}":""] # https://bugzilla.redhat.com/show_bug.cgi?id=1906010 -Dshared-lib-tag=%{version_no_tilde}%[%{without upstream}?"-%{release}":""] -Dlink-executor-shared=false