commit: 9f3e7da215c0462b6ab264daa4d15f8933a8e379 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 29 17:05:12 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 29 17:05:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3e7da2
dev-libs/openssl: backport fix for s390x w/ USE=-asm to 3.2.x It's already been backported upstream on the 3.2 branch but no new 3.2.x release yet. Closes: https://bugs.gentoo.org/923957 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/openssl/files/openssl-3.2.1-s390x.patch | 31 ++++++++++++++++++++++++ dev-libs/openssl/openssl-3.2.1-r2.ebuild | 1 + 2 files changed, 32 insertions(+) diff --git a/dev-libs/openssl/files/openssl-3.2.1-s390x.patch b/dev-libs/openssl/files/openssl-3.2.1-s390x.patch new file mode 100644 index 000000000000..3cbf4854e12e --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.2.1-s390x.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/923957 +https://github.com/openssl/openssl/pull/23458 +https://github.com/openssl/openssl/commit/5fa5d59750db9df00f4871949a66020ac44f4f9c + +From 5fa5d59750db9df00f4871949a66020ac44f4f9c Mon Sep 17 00:00:00 2001 +From: Ingo Franzki <ifran...@linux.ibm.com> +Date: Fri, 2 Feb 2024 10:20:55 +0100 +Subject: [PATCH] s390x: Fix build on s390x with 'disable-asm' + +Do not define S390X_MOD_EXP for a NO_ASM build, this would result in +unresolved externals for s390x_mod_exp and s390x_crt. + +Signed-off-by: Ingo Franzki <ifran...@linux.ibm.com> + +Reviewed-by: Hugo Landau <hlan...@openssl.org> +Reviewed-by: Tomas Mraz <to...@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/23458) + +(cherry picked from commit a5b0c568dbefddd154f99011d7ce76cfbfadb67a) +--- a/include/crypto/bn.h ++++ b/include/crypto/bn.h +@@ -116,7 +116,8 @@ OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx); + + extern const BIGNUM ossl_bn_inv_sqrt_2; + +-#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined (__s390x__) ++#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined (__s390x__) \ ++ && !defined (OPENSSL_NO_ASM) + # define S390X_MOD_EXP + #endif + diff --git a/dev-libs/openssl/openssl-3.2.1-r2.ebuild b/dev-libs/openssl/openssl-3.2.1-r2.ebuild index 31486ad9fabe..fb480821f325 100644 --- a/dev-libs/openssl/openssl-3.2.1-r2.ebuild +++ b/dev-libs/openssl/openssl-3.2.1-r2.ebuild @@ -61,6 +61,7 @@ PATCHES=( # bug 923956 (drop on next version bump) "${FILESDIR}"/${P}-riscv.patch "${FILESDIR}"/${P}-CVE-2024-2511.patch + "${FILESDIR}"/${P}-s390x.patch ) pkg_setup() {
