[gentoo-commits] proj/releng:master commit in: releases/portage/isos-x86/patches/sys-apps/busybox/

[gentoo-commits] proj/releng:master commit in: releases/portage/isos-x86/patches/sys-apps/busybox/

[Ben Kohler]

commit:     cd107fa8b4bbaf8dd58440e2a9e06f9e068c57d2
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 11:38:15 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 11:38:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=cd107fa8

portage/isos-x86: add busybox patch from alpine for bug 933771

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 ...disable-HW-acceleration-for-MD5-SHA1-on-x.patch | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch b/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
new file mode 100644
index 00000000..a3030da2
--- /dev/null
+++ b/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
@@ -0,0 +1,46 @@
+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
+---
+ libbb/hash_md5_sha.c | 6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
+index 880ffab01..a006422ab 100644
+--- 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;

[gentoo-commits] proj/releng:master commit in: releases/portage/isos-x86/patches/sys-apps/busybox/

[Andreas K. Hüttel]

commit:     88909606f5b4167710cfea4041ca575de260004f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 10:03:49 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 10:14:08 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=88909606

Drop patch that fails to apply

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 ...disable-HW-acceleration-for-MD5-SHA1-on-x.patch | 46 ----------------------
 1 file changed, 46 deletions(-)

diff --git a/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch b/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
deleted file mode 100644
index a3030da2..00000000
--- a/releases/portage/isos-x86/patches/sys-apps/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
----
- libbb/hash_md5_sha.c | 6 +++---
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
-index 880ffab01..a006422ab 100644
---- 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;