From 282d1f30a64204630e96bcf048597f6afbe4a8bf Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Apr 05 2024 10:07:33 +0000
Subject: Backport various commits


97df75d7bd13ae9843fb55dd7285bf113adc2bd2: socket: pass socket FDs to all ExecXYZ= commands but ExecStartPre=
87c4c199a590b26889c5158906925f317a87ce19: core: Serialize both pid and pidfd to keep downgrades working
e3783068c6dc1d5199c30c6ee4835f16ad92d3f9: core/mount: if mount is gone eventually, consider it success
8e94bb62a5c1309c56c57e0a505aae13a2ac5f4f: core/mount: if umount(8) fails but mount disappeared, assume success

---

diff --git a/sources b/sources
index 6aab51b..e879f01 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (systemd-hs-255.4.tar.gz) = eb63e2a577aa8bc4a0f1112e297dc458f43ff42309ad71d7c5cbd8dc2cec4e717e97937eb269597e707ba95ed7fcd5a96b98b35f6d59b3b15cbe5c941cb064ec
-SHA512 (systemd-hs+fb-255.4.tar.gz) = 174cce6cfb8d2b556c678b062d2c772865e1720ee47ca9627d79c9acd2fcab7090a4a2017533cbcd9db1624836c93f8f626f819577b57d514fb81dc88160e663
+SHA512 (systemd-hs-255.4.tar.gz) = edac012bce88faaaa12d42e973a7f4ad5e76789c8f9d86ed777393662563a131dab33fded0b32fc599717201f488a856c24df4424be457f7f1ea467c0b4f628a
+SHA512 (systemd-hs+fb-255.4.tar.gz) = 5d86f65b4b696d37a00f6bc2460484dd1107de104a79cb1c1561bc9efc09eb4f1b37a298987e3f288729f3f0fc780cc573ac188a8c9e05310a24117ea6148180
diff --git a/systemd.spec b/systemd.spec
index 16037dd..bbf6617 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 3eba66c37877b1858d077b704000923ceed412c9
+%define commit 2c64dbdb6d8b40ac47382be9e8213a06aa6e566b
 %else
-%define commit 74d0d1174b780d99786c7dd4d3dbb1c249fb5dc3
+%define commit fb3a481ade99659f6c82095c7289908789146b78
 %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.4}%{?dist}
+Release:        %{?release_override}%{!?release_override:1.5}%{?dist}
 
 %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?)