gentoo auto-resync : 24:01:2025 - 06:47:17

3 files changed, 41 insertions, 1 deletions

diff --git a/dev-libs/isa-l/Manifest b/dev-libs/isa-l/Manifest
index 55773aeb881f..225e4db4d2e0 100644
--- a/dev-libs/isa-l/Manifest
+++ b/dev-libs/isa-l/Manifest
@@ -3,9 +3,10 @@ AUX isa-l-2.30.0_makefile-no-D.patch 511 BLAKE2B 64e65daf876cde7a5ca4ba8f8f4e308
 AUX isa-l-2.30.0_makefile-x86.patch 223 BLAKE2B ddbe4532bcff110c10d79791e2e8378ed03b6cabc2ec5b86e4f82718b07f09757d0ed903b7e6b412f11504d3beb9c4263b47a1d29243978c277470f1f3272290 SHA512 36da90bb9ac7031485ef18b8a082a682aeb0addb16f71fe864c3f8e16c48f19fedbed30b2acfb1e84bb983305f146866aaf61a38f65ae9d5a28f6a491eaf1b3e
 AUX isa-l-2.31.0_makefile-no-D.patch 527 BLAKE2B a9424cf6bfbee6b88e901218fe810803374bb46d0dc4fdd12e27f5b2d44eabd1481cdabf4b517485ea336fd9e24e3a7701efc2d7cee58832458cd09b5db943f2 SHA512 e7e78d908bdd9661f3724ce6f8d700a0bd14dc2c1b747d116b090f0f02ccf346c25f52fe4731caf2b2a4821dba534d5174fa4a7315a1dfaeb076268111038428
 AUX isa-l-2.31.0_makefile-x86.patch 231 BLAKE2B 78a0b2f1d2b1bbbdfab17e0abda0ebc9d9f6866cad22f12eae3b39a7b86baa7d12af30c0c0ddbed9a5327786f74afa66f8f39be4dbf58d5753362fe8baedbbe2 SHA512 d9a7893b6e23450a02c51bbc2931a1d0d64b456b55a62ab281806e14ebf43e07a191d83f0c904f2f4dd2084427314df7d50406e0e10b45eb1b141719f74e3bcf
+AUX isa-l-2.31.0_no-fortify-source.patch 1163 BLAKE2B ce80b595111667c48eeee8588a0a7643fddfe41f815e8e9b06b5a0fa40a0901898c439b7415e6986fcf14b54721337e9b7c095d5c2da56e141bad1af75206e0e SHA512 69909249b3e01ad18acda04d3b44e4767421e76b0209e7516c87cf18483639c61563f6e38abec8158850392de20efacf2e4ceba5a69939ed94d8bce08dd0dbf4
 AUX isa-l-2.31.0_user-ldflags.patch 212 BLAKE2B 268c3ff68401cdae31966e6cba0158835464e0115571586dd8b93615e00b5e4f25e35f3bd162a3199aad057faf2d0d0bb73e0fbf38de8dab5ab0bae4de7c9079 SHA512 70a62e2fe2f43cdc14de20cd52174fcc52f4c11ad036462c0847078b4589bf2e46c7d2b09b224aec9b28d2dd99d310eaf138f1c103b4733fc58ab50645833394
 DIST isa-l-2.30.0.tar.gz 649389 BLAKE2B 3364733d61ce16c91891b6da63d2b4fb2bc004761c91f2076a9a6441adaea24af43b6d32caec011c06206e3811e8c9639f8ceaac89fe97800144c7f78c80c350 SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2
 DIST isa-l-2.31.0.tar.gz 705375 BLAKE2B 80e0c7f7351e4765393fc5734452ab00d84a84fd017a529a0b96d594c045e7e1c23957d292a56fc449e611dc29f3d4cc2a66c75055d1a7fbb31ca1d6f5c4650a SHA512 bbda3cf84e12352728c16d043ae71160569bff9540928eebb986e22d570176162a7f74fba9423d2349d014df061c09fc084343fbc51077415cfae9f692906dd8
 EBUILD isa-l-2.30.0-r1.ebuild 1194 BLAKE2B b4241a852ec119148e6ec0850f3da2b6acf2e29186c7474c2026631b94a67b7430ee6bb9a3db9f4d97fca9df1987ff6ae0cf5563bf6861f836ae53aa0c382e84 SHA512 56ac595d8345b3a82d8eb6c0f9c91554eb41a36f267feee3833e081f4ba8ce1709ce58bb3a2818b288fe3cbea2b75094450a02054f915abc8614c22f3a560ce9
-EBUILD isa-l-2.31.0.ebuild 1287 BLAKE2B 7d5b90deacaa1d81a5da6ad12b0da1796ce0396f50fa92aa088a48d74da55f4413ced8012a30c5d19fb52c3def2f3a29b4e79aea86d245390bb2be4e0c676b5c SHA512 bee97a7bc160772929b0ef99f6523cb2f246294aca397a3cff99388a4885be9e8bf756af49d1efbffcdb5a5278c758f3dfddd986bb6b14c849b0ecd6483a497c
+EBUILD isa-l-2.31.0.ebuild 1339 BLAKE2B e6e3db3f9182aca0e6e594db9b17675e8cc23eddd8d3fa414065f7e72626fdf016f5807433262d8c3b469ae872c6b8bb471b136fa28a74374af9e3be116805c8 SHA512 ce6973dd6aa874ae001ce709004562d1e81337f0f8f2c3bb6e951581aab33516274c8bb2a538b3ce8422542c25f325abae537a26ccf6119f0ad4c1f9ca3fc481
 MISC metadata.xml 924 BLAKE2B f73558b325ee09e296f5e54262ac4ec62f3379b01c9ddcd5c650e15c4633678a2494009d8a1bfd7e3560700aeb8e48361cfcc55d73deaf97bdafc743b78300d6 SHA512 dd56e30c82f52b45ad298382b073f7e214709f7e02c20ebd710eb4ef4f1db8d34f822fae0383309752e699bc0d67da1fe17eddfaf848d6c95e2e8af655dc55af
diff --git a/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch b/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch
new file mode 100644
index 000000000000..36ddb6304035
--- /dev/null
+++ b/dev-libs/isa-l/files/isa-l-2.31.0_no-fortify-source.patch
@@ -0,0 +1,38 @@
+From: Filip Kobierski <fkobi@pm.me>
+Date: Fri, 6 Sep 2024 12:49:09 +0200
+Upstream hardcodes FORTIFY_SOURCE to 2. This patch removes it so it is not redefined when we set it.
+This fixes https://bugs.gentoo.org/935525
+
+---
+ configure.ac | 1 -
+ make.inc     | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 72500ee..72bbb54 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -301,7 +301,6 @@ my_CFLAGS="\
+ -Wstrict-prototypes \
+ -Wtype-limits \
+ -fstack-protector \
+--D_FORTIFY_SOURCE=2 \
+ "
+ AC_SUBST([my_CFLAGS])
+ 
+diff --git a/make.inc b/make.inc
+index 33baf49..0cfc571 100644
+--- a/make.inc
++++ b/make.inc
+@@ -57,7 +57,7 @@ DEBUG_yasm = -g dwarf2
+ DEBUG_nasm = -g
+ 
+ # Default arch= build options
+-CFLAGS_    = -Wall -Wchar-subscripts -Wformat-security -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wtype-limits -fstack-protector -D_FORTIFY_SOURCE=2
++CFLAGS_    = -Wall -Wchar-subscripts -Wformat-security -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wtype-limits -fstack-protector
+ ASFLAGS_   = -f elf64
+ ARFLAGS_   = cr $@
+ STRIP_gcc  = strip -d -R .comment $@
+-- 
+2.44.2
+
diff --git a/dev-libs/isa-l/isa-l-2.31.0.ebuild b/dev-libs/isa-l/isa-l-2.31.0.ebuild
index 992207e9e408..cff37c2a7586 100644
--- a/dev-libs/isa-l/isa-l-2.31.0.ebuild
+++ b/dev-libs/isa-l/isa-l-2.31.0.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.30.0_fix-shebang.patch
 	"${FILESDIR}"/${PN}-2.31.0_makefile-no-D.patch
 	"${FILESDIR}"/${PN}-2.31.0_makefile-x86.patch
+	"${FILESDIR}"/${PN}-2.31.0_no-fortify-source.patch
 	"${FILESDIR}"/${PN}-2.31.0_user-ldflags.patch
 )