gentoo auto-resync : 28:07:2023 - 04:35:59

3 files changed, 29 insertions, 1 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 8177431507c8..128bfc32f81f 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,6 +4,7 @@ AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da6
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b
 AUX systemd-253.5-services-stop.patch 1429 BLAKE2B 3e191d2f98173c4b75791b8ade557f250229021d50c84efb9010ed06bb9a4df6e0b084625d9c3c8dbb16b8378a7c62ddbb3be4cf17790169709c581c09802fea SHA512 74e3cab089d1d3ca1603b3180638dfe2a6a0dfc494b9b72920f1b0cbe659784582d9757ba1b3f75b0c6469ae88a782a26da89049b5571b0f1ec50e845092ab21
+AUX systemd-254-dt_relr.patch 1054 BLAKE2B 7d457d6577a425ac07e6009d0ed5ed6e7c1c192175427c32dabfbb703f41c80f48a30524c0bfb5d555e5b848faea114a02e956d26854486fbd0b4e4d672a25c1 SHA512 c9b25a466278ff2be5812ae144670e06d9381610c1259814e5135a186e54c61d6db9142b7b5f301e3ad63cfdf119d7559e46c6a7d9e1317ff42ab457dbdd52c2
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-254-rc2.tar.gz 14304024 BLAKE2B a7d16f5938a174e55146d1fbb47a4210bce8130dd3288ed420d7fa0f7faec984cbc5d479eb3a742f91db12075d5e6189b41677e4610a9f76da529a4b391f0f64 SHA512 d19f6f709536475f200925d0a0711422878ecfebfd351a989bda98505926c0646cf18b00fb158249b51e8476b2e01754e0ed7f30fbbf775c3a99e819bcd16579
 DIST systemd-254-rc3.tar.gz 14314774 BLAKE2B 6b8bbae3d8bf4409fdbb646a3bbf6e7622c4337b6ac342b70ddd7934f512c3120cfddc212f0770a57b30ce11aa880480bb13e72d8e52307d33c105ce2ffb20fd SHA512 b4d0385b4e25bc3895f37480afea6a5e17dd900379e6c5f8882b8b3db26c56305642f270c139c8396fcc41d87e1a8c97b963d945cd3deb43c58f4eb2196cb0a3
@@ -19,6 +20,6 @@ EBUILD systemd-253.5.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a
 EBUILD systemd-253.6.ebuild 14667 BLAKE2B 3b154c55c573e2306f871c362f3d7207fb9b7efee374f118cf4b94477a3e01060b473b293fe86d3ba0923fd9cd7d9e9f8b06490f59514002caadf1b203387e7d SHA512 3c39c8742b35540bb7d70e9277876c10e648e78d4e549cb65bb0a4b843aca3bbea91ee39e0698b294415e9e77dd6c7f350497fe5f841619e11cd2301950bafc0
 EBUILD systemd-253.7.ebuild 14669 BLAKE2B 106db6ca3073de27cd0f7c72b30397da77cbd98dfe1d1357f67d39f61e722c47d7fd5b3b7378e329883e9894cfe90159f3db50400ca5d791b438907b00b797b3 SHA512 56e632a1f7d396607df97f3bfbde8e85ed4534b69b341e196356adf26f932f54db0bde0365ea5e4ef8c84e36662b61b7465ba4b3336c0eebbaa3932554c13eaa
 EBUILD systemd-254_rc2.ebuild 14858 BLAKE2B 175989f7b8dd072340ff044bc7e549cf35919fb9632e5ad04e125742e67d00a18fc26e9469d09f28edcec6f2fd72e2f21a07b2d2b5138b94a1319dd5356e3194 SHA512 f793acc7d6d530debec1471562d77210fbaf3e7aea97009ecf0a3fe7a78dc4d814c67d9dcc142107326bf64ecab82301d3d7a43f874988d4e2a442ef51cf2ba7
-EBUILD systemd-254_rc3.ebuild 14858 BLAKE2B 175989f7b8dd072340ff044bc7e549cf35919fb9632e5ad04e125742e67d00a18fc26e9469d09f28edcec6f2fd72e2f21a07b2d2b5138b94a1319dd5356e3194 SHA512 f793acc7d6d530debec1471562d77210fbaf3e7aea97009ecf0a3fe7a78dc4d814c67d9dcc142107326bf64ecab82301d3d7a43f874988d4e2a442ef51cf2ba7
+EBUILD systemd-254_rc3.ebuild 14900 BLAKE2B 9b18330007319151ef461592372654fae95cad736eaba28daa9574d87ae38697a6d8642da2a5e6687aea603fb15d1d70a3a29609a5f91eab05409fa73401cf4f SHA512 9b118225d9467c22264e138144f6f5231987648a7f23f78bac6be61b056b7fd6d322415bab5057bd7c2bfa054db80d99019c80ba9e8d5307a2e7438030e2db39
 EBUILD systemd-9999.ebuild 14805 BLAKE2B 62d8ad8d32113194ed3719f90989aa1c912ec72764c4426ad1de10e53b54e30485b1f0beac558d91c3060e773af30f4b881fa84013147c67623303681760b633 SHA512 b6298270ce255d6c439ecaf84b5d4e60aa8f6d4fe5d9c0d030225216638d78558a667f5708e881aba7f027534da2249ef7567800278f2b0fb85a12ea7be8a38e
 MISC metadata.xml 2612 BLAKE2B 60495769a304d0623f73de8eb305770eb93706fdcbea158a2de2beb72e5d04495fc5ef45b4e55d3003a9a70bc3f60a7a5d6880aaac9512647132be69f96112ad SHA512 397f63a498b46647edfb665f92680197607de5edef42c3c17ab96abf94f117d82eda4863bf138329e25880609e8c631e9d154277e8a548eafbe87e8b83e47ccc
diff --git a/sys-apps/systemd/files/systemd-254-dt_relr.patch b/sys-apps/systemd/files/systemd-254-dt_relr.patch
new file mode 100644
index 000000000000..9adfc11c1dd3
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-254-dt_relr.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/910570
+https://github.com/systemd/systemd/issues/28520
+https://github.com/systemd/systemd/commit/eff91e2f3863f9e176b383e5c54741c64ca7a636
+
+From eff91e2f3863f9e176b383e5c54741c64ca7a636 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Wed, 26 Jul 2023 11:29:57 +0100
+Subject: [PATCH] efi: link with -z nopack-relative-relocs
+
+elf2efi.py cannot handle DT_RELR relocations, so disable it
+if we can
+
+Fixes https://github.com/systemd/systemd/issues/28520
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -174,6 +174,10 @@ efi_c_ld_args = [
+         '-T' + elf2efi_lds,
+ ]
+ 
++# On CentOS 8 the nopack-relative-relocs linker flag is not supported, and we get:
++#   /usr/bin/ld.bfd: warning: -z nopack-relative-relocs ignored
++efi_c_ld_args += cc.get_supported_link_arguments('-Wl,-z,nopack-relative-relocs')
++
+ # efi_c_args is explicitly passed to targets so that they can override distro-provided flags
+ # that should not be used for EFI binaries.
+ efi_disabled_c_args = cc.get_supported_arguments(
diff --git a/sys-apps/systemd/systemd-254_rc3.ebuild b/sys-apps/systemd/systemd-254_rc3.ebuild
index 494249a2edd6..1333d2cd88f7 100644
--- a/sys-apps/systemd/systemd-254_rc3.ebuild
+++ b/sys-apps/systemd/systemd-254_rc3.ebuild
@@ -241,6 +241,7 @@ src_unpack() {
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/systemd-253-initrd-generators.patch"
+		"${FILESDIR}/systemd-254-dt_relr.patch"
 	)
 
 	if ! use vanilla; then