diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index a13938a468..5d0e316216 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -7,26 +7,17 @@ if(VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -# Download fix for cert store crash on Windows -vcpkg_download_distfile( - WINDOWS_CRASH_PATCH - URLS https://github.com/openssl/openssl/commit/2b5e7253b9a6a4cde64d3f2f22d71272f6ad32c5.patch?full_index=1 - FILENAME openssl-certstore-crash-2b5e7253b9a6a4cde64d3f2f22d71272f6ad32c5.patch - SHA512 a13054a457ee72fd3d1760810b5323d04be5aaf18f199824515ca596a72e98154ace4fefd747e32a7cc32c6e4ed2363b100bf65a729cf2361fcc76715d5b7cd1 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 a1ef09ecc810b761b3adcdb79b5746ba06244a10f626a40e495a3df19411546b98d75f6c7e7c13de7c15753caf3db87af7096ed0bb835afed8cc6dbc366b542f + SHA512 0ffa32b60779709214ca3987838d0cd02f906d6f14772a32ef49e3f4854f8d2a287503ec742004ce7623afa9cf9ef2c8813d94a3c5b6c230ba150b0b4b4914d3 PATCHES cmake-config.patch command-line-length.patch script-prefix.patch windows/install-layout.patch windows/install-pdbs.patch - "${WINDOWS_CRASH_PATCH}" unix/android-cc.patch unix/move-openssldir.patch unix/no-empty-dirs.patch diff --git a/ports/openssl/script-prefix.patch b/ports/openssl/script-prefix.patch index 70f0859ca8..fd3316b858 100644 --- a/ports/openssl/script-prefix.patch +++ b/ports/openssl/script-prefix.patch @@ -18,5 +18,5 @@ index 343cdc1..e48038e 100644 -$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); +$ENV{PATH} = "$FindBin::Bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : ""); - if (! -x $openssl) { + if (!(-f $openssl && -x $openssl)) { my $found = 0; diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 963b2c90bd..76f6054de0 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.5.0", - "port-version": 1, + "version": "3.5.1", "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 fa61d06804..7103d914c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7029,8 +7029,8 @@ "port-version": 4 }, "openssl": { - "baseline": "3.5.0", - "port-version": 1 + "baseline": "3.5.1", + "port-version": 0 }, "opensubdiv": { "baseline": "3.5.0", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 30547e3432..aa7bea0e60 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce87a54727bd8a845487174b4cc04edd00348cfb", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "6819498ce6c5c3e379b3ffbd2b5d93e3fc271933", "version": "3.5.0",