From 4d466575565fa6ac317c570af2d3e06bbac3f23e Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Sep 14 2023 13:55:32 +0000 Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale --- diff --git a/sources b/sources index 1eecb99..3fa0ff2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-253.7.tar.gz) = 78fe23ac8facfe09e0a7f443626d7a2fd69dffd73b393cc20c4dc5224845029cc574c35805b88707fd92def3863129d5a16b22d909a66ea7ed2e29a0017e8734 -SHA512 (systemd-hs+fb-253.7.tar.gz) = fc7cbafc3c2b798521dbf3937ee01523346b88c97f7acbfe8ebadda58f224bc449bd8fc5cbd0b600012bda0349a2c55ccb760081795a8ccc1b5e6b2553ddc91c +SHA512 (systemd-hs-253.7.tar.gz) = d8427adc1158a1dcc8b574e1beb79f91ed068cdbee11761e57efe27196fceb8d1ee0c4325e32bc4dc2f3f382bbe7c36d317f8a46dac66f53245385ffc1d5a73e +SHA512 (systemd-hs+fb-253.7.tar.gz) = 651b6dad6fec20a45387be2e72f4663daed339e99cebb57f18c0dcc3e1716a32de5300b7149fa57706781fb483b1bc6a2d34f47b43f3a4aad2da3108558da097 diff --git a/systemd.spec b/systemd.spec index 7d1830f..73d8b9e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -2,9 +2,9 @@ %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %if 0%{?facebook} -%global hs_commit 87642635010e6fd1ae3329baac821a45c8838261 +%global hs_commit 9d24499df65a22d10953508b0808a87768c964c1 %else -%global hs_commit 3071a8f20815d537116b887a76c96955b34eed2d +%global hs_commit 59ef89051aa8e6cfd2e5060b48275caeb5af0da3 %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -39,7 +39,7 @@ Version: 253.7 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 1.5%{?dist} +Release: 1.6%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -1298,6 +1298,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Thu Sep 14 2023 Anita Zhang - 253.7-1.6 +- Backport fix for #27287 (daemon-reload deadlock) + * Wed Sep 06 2023 Anita Zhang - 253.7-1.5 - Backport fix for rlim_max