diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk index b561bc63..46b5e48a 100644 --- a/contrib/depends/packages/openssl.mk +++ b/contrib/depends/packages/openssl.mk @@ -1,9 +1,8 @@ package=openssl -$(package)_version=3.6.1 +$(package)_version=3.6.2 $(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version) $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e -$(package)_patches=fix-mingw64.patch +$(package)_sha256_hash=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" @@ -52,7 +51,6 @@ 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 deleted file mode 100644 index e8eb7d75..00000000 --- a/contrib/depends/patches/openssl/fix-mingw64.patch +++ /dev/null @@ -1,19 +0,0 @@ -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