From 560267d2266f62c6124a6f89144c9bd733c8b745 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 4 Feb 2026 18:25:02 +0100 Subject: [PATCH] depends: openssl: update to 3.6.1 --- contrib/depends/packages/openssl.mk | 6 ++++-- .../depends/patches/openssl/fix-mingw64.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 contrib/depends/patches/openssl/fix-mingw64.patch diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk index 7737a32b..b561bc63 100644 --- a/contrib/depends/packages/openssl.mk +++ b/contrib/depends/packages/openssl.mk @@ -1,8 +1,9 @@ package=openssl -$(package)_version=3.6.0 +$(package)_version=3.6.1 $(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version) $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9 +$(package)_sha256_hash=b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e +$(package)_patches=fix-mingw64.patch define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" @@ -51,6 +52,7 @@ endef define $(package)_preprocess_cmds sed -i.old 's|crypto ssl apps util tools fuzz providers doc|crypto ssl util tools providers|' build.info &&\ + patch -p1 < $($(package)_patch_dir)/fix-mingw64.patch && \ rm -rf doc demos apps test endef diff --git a/contrib/depends/patches/openssl/fix-mingw64.patch b/contrib/depends/patches/openssl/fix-mingw64.patch new file mode 100644 index 00000000..e8eb7d75 --- /dev/null +++ b/contrib/depends/patches/openssl/fix-mingw64.patch @@ -0,0 +1,19 @@ +https://github.com/openssl/openssl/pull/29826 + +diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c +index a754f285bb..deec428152 100644 +--- a/ssl/quic/quic_reactor.c ++++ b/ssl/quic/quic_reactor.c +@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor) + } + + #if defined(OPENSSL_SYS_WINDOWS) ++ ++/* Work around for MinGW builds. */ ++#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET) ++#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15) ++#endif ++ + /* + * On Windows recvfrom() may return WSAECONNRESET when destination port + * used in preceding call to sendto() is no longer reachable. The reset