gentoo resync : 16.04.2022

5 files changed, 16 insertions, 4 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index e08b2cc3c473..4a48e9eb19ea 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -39,9 +39,9 @@ EBUILD glibc-2.30-r9.ebuild 43400 BLAKE2B 01cbb9398dbe5d93f110f7c7ffe24d40719d86
 EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880eeacb5aaa8438b41b98f5b275f0816a0e654446f62ee2f34f412c5c6e72befcc0deb8988b6faec2c53a07601a9 SHA512 5247b1d75efa86b1a1c85a09219f54d402aae8aaecf0e377ca663a984daf7c69ea97b3072fe83a20002ec7d72661ec7737fbc72982122b58c26cb5bc89997548
 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f
 EBUILD glibc-2.33-r13.ebuild 48593 BLAKE2B 59c4e32d200c6b8fe1e365361c9cc4f4d7f93ab861e93fb13cb9bc0cc8e2d4f3a2f1f8f394570e186398858afc6d844188581f18a8eb7c0964ab73a147be9dcb SHA512 7003a462e28abef982330ab6fc29b836176c3e1943605bd04c907c40376de812783ebcd74a91305a9f86df7c0a75494a29f2187848bc75e6b42198704c514001
-EBUILD glibc-2.34-r10.ebuild 50001 BLAKE2B 569369e9282e8ebbf4d91539cb5eb841a24ff09f3232d29c35a4f7b9b944598a1ba0bfebc711bd45ecbece053b7c4bded5964147f43e7c31ed4294f8747a73ab SHA512 0c44609cb2de6cf8a6652bfcc5494657fec781429be2e6af446617c082d6e64363245e61a6863a633c368eec40c08f400b953ea59826feb6f6287a27d886181d
-EBUILD glibc-2.34-r11.ebuild 49924 BLAKE2B 8ba10991163057f4c222655385b1dea053d5e11e7e0803934f8c26c7b32b6205b4d34bafafb2f458aa4bdb9a52d1130e1bfecd848426ebbb77bc3aa365f09dbd SHA512 0a7528fb68aee14fa568b8a708c1c3904db8e6b82272f041bd25eb3dcfea2cf3856de710db2917a29ca15a609d641d1cebb21d278836bd0b1b4f69f540c3d920
+EBUILD glibc-2.34-r10.ebuild 50089 BLAKE2B ada10ebb3acce89f9839a8f3ab4c52e3f42d1a8767f5701f2be1a585178efa551a8c820df524af24def955692858cc0eb7bd60f53e30bed1f3392c9d36402fec SHA512 3d6658c00b5f9cac9c29d1b15ba00ebcd3212819bdeaa83ad56f10f78f4e89286fb1eab12821cd43d4516154d4f602433ed50b9d832ceba1af1a135c80d6d882
+EBUILD glibc-2.34-r11.ebuild 50012 BLAKE2B 2b5c796fc88561d3862f5e1897bec6bd9a40bc53897c9b3e49ceb0c3c0f5d9fe872884da288c5284fb8da738002d9e9acd9641299972eeed38b2b12758167100 SHA512 63191d7aa56e3aa0e24976525a01491255a273686ded3f1a05bde06594e96dc0734d7fda64b3f45cd6be042c2a0cfdd6b39dfc79acfd68bc6a19f5f43ba384f0
 EBUILD glibc-2.35-r1.ebuild 48339 BLAKE2B d837073cf2e62d8cb5d6f50f1b48db0ac5d0954f6407784622ea79709fb4750f08d24ffc702d83747671b27589370640a451dea2262ea452e34327ede556ce68 SHA512 0cbc1074684f2ed48317a5face037db43de562693ffd356068eaa4160b063c01155b258fe79e47359d0400c9f50f40f1876d92eef351106974b5be6b29220077
-EBUILD glibc-2.35-r2.ebuild 48595 BLAKE2B 71e23df6bd8d8c32b6106626f0c2d4d9d37c96f49f3cccb63298b962b6a815455922ce8d26a9be8d97aaf6dfe51104be2c27d70a2007e8e469bc2df872607a70 SHA512 60f8bdc66537a5a75fbf0dcfee9f871f0891835e151ec60668923e904fafa25c6bccf4ecb37a750b921bc986763b8d2526ec843acc0d095beb9060a711805a4b
-EBUILD glibc-9999.ebuild 48353 BLAKE2B 4b6dcf3ad0f00353da09c79feff38afe383f0b0befc347721791aad9787d5363f434e483faa68c49cf0944c7328cfcbdc767093bcaf95e37224197e4af8db84b SHA512 2431d7ab441e919a294e4c6a960292761d313e185c72391c0e9ffebaf7cd165ab6598ed328df2755d76fe54fd57d76c0cb0fb34987ae6c719bc4edb140924a94
+EBUILD glibc-2.35-r2.ebuild 48683 BLAKE2B dd103c6ff435d01e2c28eabab7099ab06ff60284a7a94eccd5a23e9809005421eaea2e5c058714765264c6d518e2d7a329fa1b7ce520b339aaa54bdbb7d78185 SHA512 1e5e12cf6030cb6dd23bd5a7b98c8d6b96cc3a0d55ef769d793365ea091b3c07f498655f53fbcc7c0391880b67219aaddf4d54bc09f38a0eb8b31c6a01e230d5
+EBUILD glibc-9999.ebuild 48441 BLAKE2B b1b5a913d75abcc15229e073d3417df2ff3c21f146eae9ca9b85a4630d35c2a3811f49deaa28eddebb76a8d4cb4208a7c8552afcca469bd69c897d14fc06d8fe SHA512 9dc2a2c09a4ba4ce923098ce579e54f84d8b756da7ac0acf426abc331447dc47a77811dcdb88e903015c2ddfa3a033cb600f6d00b96e0ef4ba74fedcdb529b80
 MISC metadata.xml 1701 BLAKE2B 91bd245d0a3685d76e3f874b50db872660054767fca5181871022fbdef9a18c4e674890bfed52cc3332c9557430ae8eec64505e67cdbedff000987406ab69ac5 SHA512 524edc37a01a47958ef557d586e8f06c6132481734ea28ed57e146969503fd129ad1da813a4d2d143a9bb8abe8810b0d8c920ab3c422a729287838435c44743a
diff --git a/sys-libs/glibc/glibc-2.34-r10.ebuild b/sys-libs/glibc/glibc-2.34-r10.ebuild
index 0bc6be3e278b..e607faf13339 100644
--- a/sys-libs/glibc/glibc-2.34-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r10.ebuild
@@ -440,6 +440,9 @@ setup_flags() {
 	replace-flags -O0 -O1
 
 	filter-flags '-fstack-protector*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection='
 }
 
 use_multiarch() {
diff --git a/sys-libs/glibc/glibc-2.34-r11.ebuild b/sys-libs/glibc/glibc-2.34-r11.ebuild
index ff5bd4304774..3cf633bea543 100644
--- a/sys-libs/glibc/glibc-2.34-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r11.ebuild
@@ -440,6 +440,9 @@ setup_flags() {
 	replace-flags -O0 -O1
 
 	filter-flags '-fstack-protector*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection='
 }
 
 use_multiarch() {
diff --git a/sys-libs/glibc/glibc-2.35-r2.ebuild b/sys-libs/glibc/glibc-2.35-r2.ebuild
index 6a0d35ce8ad5..22e2d5153f19 100644
--- a/sys-libs/glibc/glibc-2.35-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r2.ebuild
@@ -429,6 +429,9 @@ setup_flags() {
 	replace-flags -O0 -O1
 
 	filter-flags '-fstack-protector*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection='
 }
 
 use_multiarch() {
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 2483aefe5d6a..94842d8172b7 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -430,6 +430,9 @@ setup_flags() {
 	replace-flags -O0 -O1
 
 	filter-flags '-fstack-protector*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection='
 }
 
 use_multiarch() {