gentoo auto-resync : 06:07:2024 - 08:06:15

3 files changed, 47 insertions, 1 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 41978684d056..2069a0614b90 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -2,6 +2,7 @@ AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7
 AUX busybox-1.34.1-skip-selinux-search.patch 724 BLAKE2B 068334c468bb9c2199311be836f38264df4c6fc12a410119f989e210a27ea9561190f554c17b8d29fca4b83fc2016e1211edc4b1ca7d127449381291720946f1 SHA512 bc6eb9e8cbc21e8e00f696505d88ad3c7be5a3e4f7414a2dc4c8fe98088e7602f44b1d5b58b13ae85675b635be23bee13db800b6ab639babf89b306669980b43
 AUX busybox-1.36.0-fortify-source-3-fixdep.patch 1120 BLAKE2B 1064e3e57dddd2a12509a96a57f0e7fe78968405f53f005ff6a466da4531d1d93045c9397e86e3abdd20e850742a4803ab309c8f7597df972f7821343c26431d SHA512 c987935d5ca1ff5567235f4d2a7ecc6a59fc0aeab8d429413165ac37e344dff243ba40459a5d99e9f02fc7476fa04b9f9ac4201b62fa321ec2e7a9a165188308
 AUX busybox-1.36.1-kernel-6.8.patch 1768 BLAKE2B 6829a3aaeb128a47cc5a24cd3825a667aaaa9b0e8da53ce75f82d43c873f12c1962f06c7a84e5256c82c9bd0ac9b0f4d40f5276747defc759dcd114bb4148e3e SHA512 c99fb248933df4d2c9aea09b7f5adaa99ef48316d67ebbd2e85909e48c6e6776ac3bd972e93b248e79a2a17b04bab82e8cae6f7eb58a673e9fe88a1c09a0fad9
+AUX busybox-1.36.1-skip-dynamic-relocations.patch 1769 BLAKE2B 07cc14d42eaa1fa2fbd3aa4b7f27350a0beef54f5f6927ce25840b0a0bd5a2c3a799886eb8c798ab07294c703f3d03a5c3e550b79a2bc120628e1e35a89ac723 SHA512 16818ac3888b830e2d9c01bd4ef05de8d0a6df3ef8d50c041a5d5ab46ed7d68168b1f31bcf1e64a3adf470de642cb26367e09ec7e23b98f68a9d2b25fdcb07dc
 AUX crond.confd 55 BLAKE2B 23e5530472b9ea09177b8e5ea944528a0ff9ba62a8b434a547da16b2e8721c8a1500405b69af8840be3a3b3d86d2d3b7bd1fd5a27a34de874ca44caf961d5cee SHA512 10a3c88ecf7ccf0c1e0581c78433846135ee8b1092d07082e745d5371108194871c7502b4c58ad430e065c25441fea7ba0e73268c95df13cd6f8e9146ef312d7
 AUX crond.initd 253 BLAKE2B 8fc898a5127eb114417c04d8b392237f8628673138bb3ce420038f58caea28c43ceb1433f05cdd238999f9faf8b22e74d540521223de31ef31f224a5a2233f93 SHA512 312e308010434200d53baf9a362c8372f48661394a7d7643e14dbbe8c8d579f43f5e38714f55ccc4ddb084f9a06804adde0acbf2a4d2bc69c8e39b91aa716bdd
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
@@ -20,6 +21,6 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e SHA512 8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
 EBUILD busybox-1.36.1-r1.ebuild 10690 BLAKE2B e29a3e6bace1ca7cd6b508cfd53b693f3b765c9cc226d0503cb1745d55c46daedbc853da79f492ddd42564226c86d331882e906fd067790ce70e99ec2c346dba SHA512 938fd384b4bb2b09e464ed434c68dc8c434fde6cef033ed8a34c992591ff93b13bfdffc75251114cd8c3564b1ddcf19e3ac3bfc7f2636f181688183182a53282
-EBUILD busybox-1.36.1-r2.ebuild 10743 BLAKE2B 3837572d0404b9f8396e17fa46d48cd00441719769a82ec2ee0b468be1b03b097ebc2e11fecc4bc980fb1f588717153c8382aed4ca583a05fec994e12a0972dd SHA512 abdc8bafaa6bd2d154a4d6723434fc88480f281940579e83e9adbd19d34ed647b2ec2665b06831bc50cec8bbd0f32781d8d6c48ba98d2fb6ef7e12f3f5635196
+EBUILD busybox-1.36.1-r3.ebuild 10803 BLAKE2B f7e880c5dd648fc3005de7bf69244cd8ab8b7c644b7150aefdeb175a41f278b24df14740e5b313b6053b2cfd9b184b85fd4069c1783ddb27d4f7a108cb0be922 SHA512 cbda1a4e3a140abc80616e8d174757de0485d28f8e3820fd9fea64f694f31e48fc6b8daf3520ceed56787c219909ba693ca73fc2a3edc4ca4ed941a9b75fd93c
 EBUILD busybox-9999.ebuild 10743 BLAKE2B 3837572d0404b9f8396e17fa46d48cd00441719769a82ec2ee0b468be1b03b097ebc2e11fecc4bc980fb1f588717153c8382aed4ca583a05fec994e12a0972dd SHA512 abdc8bafaa6bd2d154a4d6723434fc88480f281940579e83e9adbd19d34ed647b2ec2665b06831bc50cec8bbd0f32781d8d6c48ba98d2fb6ef7e12f3f5635196
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.36.1-r2.ebuild b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
index cd06d97bc0d3..a0e6e95cf3f2 100644
--- a/sys-apps/busybox/busybox-1.36.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.36.1-r3.ebuild
@@ -83,6 +83,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
 	"${FILESDIR}"/${PN}-1.36.1-kernel-6.8.patch
 
+	"${FILESDIR}"/${PN}-1.36.1-skip-dynamic-relocations.patch
+
 	# "${FILESDIR}"/${P}-*.patch
 )
 
diff --git a/sys-apps/busybox/files/busybox-1.36.1-skip-dynamic-relocations.patch b/sys-apps/busybox/files/busybox-1.36.1-skip-dynamic-relocations.patch
new file mode 100644
index 000000000000..4da0d4666ef3
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.36.1-skip-dynamic-relocations.patch
@@ -0,0 +1,43 @@
+https://git.alpinelinux.org/aports/plain/main/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+https://bugs.gentoo.org/933771
+
+From 3ead51e53687e94a51beb793661363df27b00814 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 5 Jan 2023 15:47:55 +0100
+Subject: [PATCH] Hackfix to disable HW acceleration for MD5/SHA1 on x86
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This causes a direct segfault with musl libc.
+
+See: http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
+--- a/libbb/hash_md5_sha.c
++++ b/libbb/hash_md5_sha.c
+@@ -14,7 +14,7 @@
+ #define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA)
+ 
+ #if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
+ {
+ 	asm ("cpuid"
+@@ -1173,7 +1173,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
+ 	ctx->total64 = 0;
+ 	ctx->process_block = sha1_process_block64;
+ #if ENABLE_SHA1_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
+@@ -1227,7 +1227,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
+ 	/*ctx->total64 = 0; - done by prepending two 32-bit zeros to init256 */
+ 	ctx->process_block = sha256_process_block64;
+ #if ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;