Skip to content

Commit 560267d

Browse files
committed
depends: openssl: update to 3.6.1
1 parent 8bedb2a commit 560267d

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

contrib/depends/packages/openssl.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package=openssl
2-
$(package)_version=3.6.0
2+
$(package)_version=3.6.1
33
$(package)_download_path=https://github.com/openssl/openssl/releases/download/openssl-$($(package)_version)
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5-
$(package)_sha256_hash=b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9
5+
$(package)_sha256_hash=b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e
6+
$(package)_patches=fix-mingw64.patch
67

78
define $(package)_set_vars
89
$(package)_config_env=AR="$($(package)_ar)" ARFLAGS=$($(package)_arflags) RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
@@ -51,6 +52,7 @@ endef
5152

5253
define $(package)_preprocess_cmds
5354
sed -i.old 's|crypto ssl apps util tools fuzz providers doc|crypto ssl util tools providers|' build.info &&\
55+
patch -p1 < $($(package)_patch_dir)/fix-mingw64.patch && \
5456
rm -rf doc demos apps test
5557
endef
5658

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
https://github.com/openssl/openssl/pull/29826
2+
3+
diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c
4+
index a754f285bb..deec428152 100644
5+
--- a/ssl/quic/quic_reactor.c
6+
+++ b/ssl/quic/quic_reactor.c
7+
@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor)
8+
}
9+
10+
#if defined(OPENSSL_SYS_WINDOWS)
11+
+
12+
+/* Work around for MinGW builds. */
13+
+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
14+
+#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
15+
+#endif
16+
+
17+
/*
18+
* On Windows recvfrom() may return WSAECONNRESET when destination port
19+
* used in preceding call to sendto() is no longer reachable. The reset

0 commit comments

Comments
 (0)