openssl: Update to 3.6.0 (#25826)

* 001-support-aarch64.patch: included since
  9da1a9c30e
* 002-relocation.patch: refresh
* 003-no-set_printf_count_output.patch: skip some tests for msvcrt
This commit is contained in:
Christoph Reiter 2025-10-07 20:58:54 +02:00 committed by GitHub
parent 95a8752f8c
commit 1a586eeebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 34 deletions

View File

@ -1,21 +0,0 @@
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1603,6 +1603,18 @@
multilib => "64",
},
+ "mingwarm64" => {
+ inherit_from => [ "mingw-common" ],
+ cflags => "",
+ sys_id => "MINGWARM64",
+ bn_ops => add("SIXTY_FOUR_BIT"),
+ asm_arch => 'aarch64',
+ uplink_arch => 'armv8',
+ perlasm_scheme => "win64",
+ shared_rcflag => "",
+ multilib => "-arm64",
+ },
+
#### UEFI
"UEFI" => {
inherit_from => [ "BASE_unix" ],

View File

@ -1,11 +1,9 @@
diff --git a/crypto/build.info b/crypto/build.info
index aee5c46..9a97547 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -107,7 +107,7 @@ SOURCE[../libcrypto]=$UTIL_COMMON \
--- openssl-3.6.0/crypto/build.info.orig 2025-10-07 08:55:19.738440900 +0200
+++ openssl-3.6.0/crypto/build.info 2025-10-07 08:56:41.554349700 +0200
@@ -107,7 +107,7 @@
comp_methods.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c \
o_dir.c o_fopen.c getenv.c o_init.c init.c trace.c provider.c \
provider_child.c punycode.c passphrase.c sleep.c deterministic_nonce.c \
provider_child.c punycode.c passphrase.c sleep.c \
- quic_vlint.c time.c defaults.c ssl_err.c
+ quic_vlint.c time.c defaults.c ssl_err.c pathtools.c
SOURCE[../providers/libfips.a]=$UTIL_COMMON

View File

@ -0,0 +1,21 @@
--- openssl-3.6.0/test/bioprinttest.c.orig 2025-10-01 14:11:48.000000000 +0200
+++ openssl-3.6.0/test/bioprinttest.c 2025-10-07 09:38:48.321058200 +0200
@@ -543,6 +543,10 @@
} n = { 0 }, std_n = { 0 };
#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(__MINGW32__) && !defined(_UCRT)
+ // No _set_printf_count_output() with MSVCRT
+ skip_libc_check = true;
+#else
/*
* MS CRT is special and throws an exception when %n is used even
* in non-*_s versions of printf routines, and there is a special function
@@ -554,6 +558,7 @@
", skipping the checks against libc");
skip_libc_check = true;
}
+#endif
#elif defined(__OpenBSD__)
{
static bool note_printed;

View File

@ -3,7 +3,7 @@
_realname=openssl
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=3.5.4
pkgver=3.6.0
pkgrel=1
pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (mingw-w64)"
arch=('any')
@ -20,14 +20,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-autotools")
options=('!buildflags')
source=("https://github.com/openssl/openssl/releases/download/openssl-${pkgver}/openssl-${pkgver}.tar.gz"{,.asc}
'001-support-aarch64.patch'
'002-relocation.patch'
'003-no-set_printf_count_output.patch'
'pathtools.c'
'pathtools.h')
sha256sums=('967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99'
sha256sums=('b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9'
'SKIP'
'21b96771b401442570e885c2d5689a359a91e86dcbf5511db3667202b6c1fa8a'
'55e96c66bdcfb0b7b9c413d30aa4834cc82aee369fc6be320e5d2b6019420c46'
'fdc83cb231ed89e9fea70bc82e487427be8eb07417c1bbc3f0aa8561e79de9f3'
'90ff62d4f25f641d4eb06aa5400c2bc1ed92c3ad3b4040507b6a4323930c621c'
'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
'1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90')
# https://openssl-library.org/source/index.html
@ -49,8 +49,8 @@ prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
apply_patch_with_msg \
001-support-aarch64.patch \
002-relocation.patch
002-relocation.patch \
003-no-set_printf_count_output.patch
test ! -d "${startdir}/../mingw-w64-pathtools" || {
cmp "${startdir}/../mingw-w64-pathtools/pathtools.c" "${srcdir}/pathtools.c" &&