external/openssl/0001-const-up-ERR_str_libraries.patch | 26 +++++++++++++++++ external/openssl/UnpackedTarball_openssl.mk | 4 ++ 2 files changed, 30 insertions(+)
New commits: commit 8c5b4a4e9ebacca8453150c898b9b558b86c5ad9 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jul 13 20:25:05 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Jul 14 17:46:37 2025 +0200 const up openssl Change-Id: I28f825bdcc37e77ac800c16c24734f5c0241bce2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187827 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/external/openssl/0001-const-up-ERR_str_libraries.patch b/external/openssl/0001-const-up-ERR_str_libraries.patch new file mode 100644 index 000000000000..d0e76b1b70fc --- /dev/null +++ b/external/openssl/0001-const-up-ERR_str_libraries.patch @@ -0,0 +1,26 @@ +From c2148028116c729d58dad12d0cddb5ff7b8736aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Sun, 13 Jul 2025 20:21:19 +0100 +Subject: [PATCH] const up ERR_str_libraries + +move this symbol out of the .data section +--- + crypto/err/err.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/err/err.c b/crypto/err/err.c +index 167b66ed6b..e9228d66a3 100644 +--- a/crypto/err/err.c ++++ b/crypto/err/err.c +@@ -35,7 +35,7 @@ + + static void ERR_STATE_free(ERR_STATE *s); + #ifndef OPENSSL_NO_ERR +-static ERR_STRING_DATA ERR_str_libraries[] = { ++static const ERR_STRING_DATA ERR_str_libraries[] = { + {ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library"}, + {ERR_PACK(ERR_LIB_SYS, 0, 0), "system library"}, + {ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines"}, +-- +2.49.0 + diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 2a8f3bb3f905..d4461b9ccae9 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -11,11 +11,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl)) $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl)) +# 0001-const-up-ERR_str_libraries.patch upstream as: +# https://github.com/openssl/openssl/pull/28029 + $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ external/openssl/openssl-no-multilib.patch.0 \ external/openssl/configurable-z-option.patch.0 \ external/openssl/openssl-no-ipc-cmd.patch.0 \ external/openssl/system-cannot-find-path-for-move.patch.0 \ + external/openssl/0001-const-up-ERR_str_libraries.patch \ )) # vim: set noet sw=4 ts=4:
