From 42949ceed2164b2e4fa5d2609de5d99d7bffedaa Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Apr 06 2022 18:04:42 +0000 Subject: 250.3-6.5: Backport systemd-analyze verify fix --- diff --git a/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch b/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch index 84497ad..a0d70e4 100644 --- a/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch +++ b/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch @@ -109,7 +109,7 @@ rt_sigprocmask(SIG_SETMASK, [], NULL, 8) = 0 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/test-mountpoint-util.c b/src/test/test-mountpoint-util.c -index 30b00ae4d8b..ffe5144b04a 100644 +index 30b00ae4d8b7..ffe5144b04ae 100644 --- a/src/test/test-mountpoint-util.c +++ b/src/test/test-mountpoint-util.c @@ -89,8 +89,12 @@ static void test_mnt_id(void) { diff --git a/sources b/sources index 9795131..8139fa5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-250.3.tar.gz) = 45e794771e7cee180aaa8991190745a337a2039edef57cb75080a9a81faa3da6811dd259a93ce3aca913dd5c59140f7270716d9e82a69f2fa855f54f303c0feb -SHA512 (systemd-hs+fb-250.3.tar.gz) = a834fc2c2e58432ee4bafce212be59ae456b6178d273feb34a76d636a6461f485c9352ec2421658af4f97dc9231dc4877d1b63f0bdab460e97a1a6a325ebd445 +SHA512 (systemd-hs-250.3.tar.gz) = 20b77d0c58253f7f6c5690f52b83d8e6582de5ffdb1f887f0aa30ceedf9c46b2b3199dedf94b7086c05f8becc91a6108e2c0f0053a23222450d96c8000ea3f79 +SHA512 (systemd-hs+fb-250.3.tar.gz) = 2fd710f8169d1a18694ec53f7c698ceebcb889854a6e4796b9b679a4529a01f0b92503fb0047acaabd1cf96c1f26e3cce8219ed60746547b168692f028aedf7e diff --git a/systemd.spec b/systemd.spec index 1b3d8c1..2a8715a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -4,9 +4,9 @@ %global stable 1 %if 0%{?facebook} -%global hs_commit ebf4af4ffa19cf1de7627b6464c1aef4a25ae0ab +%global hs_commit 7398fa7259fb3b805bc8e6770db21eab7ed8bc0d %else -%global hs_commit 006cad0d7fee57520db542a2cfa5ce3688325beb +%global hs_commit ee232c833a604e2075703065811fd5619aad4dec %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -43,7 +43,7 @@ Name: systemd Url: https://pagure.io/centos-sig-hyperscale/systemd %if %{without inplace} Version: 250.3 -Release: 6.4%{?dist} +Release: 6.5%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -1078,12 +1078,15 @@ fi %endif %changelog -* Wed Apr 04 2022 Daan De Meyer - 250.3-6.4 +* Wed Apr 6 2022 Daan De Meyer - 250.3-6.5 +- Backport systemd-analyze verify regression fix + +* Wed Apr 4 2022 Daan De Meyer - 250.3-6.4 - Make sure our packages override the corresponding backports from EPEL. - Modify the networkd fix from the previous release so that it can be merged into the c9s branch. -* Wed Apr 01 2022 Daan De Meyer - 250.3-6.3 +* Wed Apr 1 2022 Daan De Meyer - 250.3-6.3 - Move systemd-network-generator and networkd man pages to networkd package to avoid conflicts with systemd-extras from EPEL