diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index b1a0772a38..1de3d05aa5 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_from_github( unix/move-openssldir.patch unix/no-empty-dirs.patch unix/no-static-libs-for-shared.patch + unix/disable-quicserver.patch ) vcpkg_list(SET CONFIGURE_OPTIONS diff --git a/ports/openssl/unix/disable-quicserver.patch b/ports/openssl/unix/disable-quicserver.patch new file mode 100644 index 0000000000..5db8364d56 --- /dev/null +++ b/ports/openssl/unix/disable-quicserver.patch @@ -0,0 +1,17 @@ +diff --git a/util/build.info b/util/build.info +index cf06f15ae4f0e..e4aab44b38038 100644 +--- a/util/build.info ++++ b/util/build.info +@@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl + SOURCE[wrap.pl]=wrap.pl.in + DEPEND[wrap.pl]=../configdata.pm + +-IF[{- !$disabled{quic} && !$disabled{stdio} -}] ++IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{apps} -}] + PROGRAMS{noinst}=quicserver + SOURCE[quicserver]=quicserver.c +-INCLUDE[quicserver]=../include ../apps/include +-DEPEND[quicserver]=../libcrypto.a ../libssl.a ++ INCLUDE[quicserver]=../include ../apps/include ++ DEPEND[quicserver]=../libcrypto.a ../libssl.a + ENDIF diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index bc067f8bf6..72694559e5 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.2.0", - "port-version": 1, + "port-version": 2, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7033443803..94219cf4d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6342,7 +6342,7 @@ }, "openssl": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 7b51fc3d74..e3c5587df3 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8865e51e2cd2c891df13f80e1a2585d8b69eab9c", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "dd76b04663283d999c149033c3fac211d08f0324", "version": "3.2.0",