From 1641c490e13e0982252c4d3b8374063f85f9940f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mar 28 2024 13:12:24 +0000 Subject: Backport 8ba3efed8669639457fc9b482d61d87e77f79b33 logind: Add fallback for when the PIDFDs= property is not available --- diff --git a/26494.patch b/26494.patch index 19bc67b..3c8f7a7 100644 --- a/26494.patch +++ b/26494.patch @@ -14,7 +14,7 @@ Fixes #26488. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 7b394794b0d4..306477c6e6c2 100644 +index 7b394794b0d4d..306477c6e6c2d 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) { diff --git a/sources b/sources index 91b9577..eb7efa7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-255.4.tar.gz) = a74b967bfabc7450d66d5e618f20fb08f1c17fce81da0b7bf21f8063c186d0746347265d33f32615a94eb8eb615f02e0473818df3fcde514f3a00e510d181b0b -SHA512 (systemd-hs+fb-255.4.tar.gz) = f6169760587319797e7acbc1907f329befa091da8f13e7df2511d66fe88d92a5c2289843931cb21a2a0b949c13365cf2028af7b88b0ad2a5a8bbb1f69b84469e +SHA512 (systemd-hs-255.4.tar.gz) = 4fd29f99224674a4a66799742e655a09e02ef4aef911a8cbea788a5180ec6e540d7df181c335892c6119500e5dad029649c4bac4654b441327da86da839dfef5 +SHA512 (systemd-hs+fb-255.4.tar.gz) = fb02daf2bfc95eeeb57afefe75d723ca80cec869d0f346fae5522fc188de2357d5578c456d6ca051d81b0a64d77eba80725d6dc9d9f7a37004590fdbbabfeee0 diff --git a/systemd.spec b/systemd.spec index 821fa86..9349a1e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,9 +2,9 @@ %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %if 0%{?facebook} -%define commit f0c7792e2aaf72dd7f465c81e64729ab9b9f78eb +%define commit c013ba38f4a9c13e39f28f487c6248db20bf0985 %else -%define commit e7f976ec62dfd8398e4c0ac6bbaecb1ebeffc0f0 +%define commit d5e7fbc2fb94a43368d7d1006b7d98b0b658cb0e %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -42,7 +42,7 @@ Url: https://pagure.io/centos-sig-hyperscale/systemd # 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:255.4} -Release: %{?release_override}%{!?release_override:1.1}%{?dist} +Release: %{?release_override}%{!?release_override:1.2}%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)