Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Tue, 08 Nov 2022 20:21:12
Message-Id: 1667938857.64d7de10f211dd48a8368cf6cb65e4cc8da77cdd.sam@gentoo
1 commit: 64d7de10f211dd48a8368cf6cb65e4cc8da77cdd
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 8 19:31:10 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 8 20:20:57 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d7de10
7
8 sys-apps/systemd: add 251.8
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-apps/systemd/Manifest | 1 +
13 sys-apps/systemd/{systemd-9999.ebuild => systemd-251.8.ebuild} | 4 ++--
14 sys-apps/systemd/systemd-9999.ebuild | 3 +--
15 3 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
18 index 8d08ffeb55d5..807330612969 100644
19 --- a/sys-apps/systemd/Manifest
20 +++ b/sys-apps/systemd/Manifest
21 @@ -1,3 +1,4 @@
22 DIST systemd-252.tar.gz 11759896 BLAKE2B ebc4ca81714cfc3b512c81d78201e4372665d0b43fe869a356214afef512b193af62ffd252b68594281fd2e009bb551cf7b2390fe80a8de452b40c04850a4928 SHA512 c9a5f4e3d11cf6a73b0f0d34f7e8f380b9b39bd4e8dd540affcba2eb24b777943f90662eb6ca2bd24276eb5d502312fcc2f097ec242ed1ca79603dbbde19ec7f
23 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
24 DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
25 +DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
26
27 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-251.8.ebuild
28 similarity index 99%
29 copy from sys-apps/systemd/systemd-9999.ebuild
30 copy to sys-apps/systemd/systemd-251.8.ebuild
31 index d4f1b4c5d629..5ca08501d3aa 100644
32 --- a/sys-apps/systemd/systemd-9999.ebuild
33 +++ b/sys-apps/systemd/systemd-251.8.ebuild
34 @@ -235,6 +235,7 @@ src_unpack() {
35
36 src_prepare() {
37 local PATCHES=(
38 + "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
39 )
40
41 if ! use vanilla; then
42 @@ -255,8 +256,7 @@ src_configure() {
43 # Prevent conflicts with i686 cross toolchain, bug 559726
44 tc-export AR CC NM OBJCOPY RANLIB
45
46 - # Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
47 - # the upstream patch for it because it breaks Clang: bug #841770.
48 + # Broken with FORTIFY_SOURCE=3: bug #841770.
49 #
50 # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
51 # to unset F_S first, then explicitly set 2, to negate any default
52
53 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
54 index d4f1b4c5d629..0aa33e7138b9 100644
55 --- a/sys-apps/systemd/systemd-9999.ebuild
56 +++ b/sys-apps/systemd/systemd-9999.ebuild
57 @@ -255,8 +255,7 @@ src_configure() {
58 # Prevent conflicts with i686 cross toolchain, bug 559726
59 tc-export AR CC NM OBJCOPY RANLIB
60
61 - # Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
62 - # the upstream patch for it because it breaks Clang: bug #841770.
63 + # Broken with FORTIFY_SOURCE=3: bug #841770.
64 #
65 # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
66 # to unset F_S first, then explicitly set 2, to negate any default