diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 85e5a544b3..12142f8373 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,12 +1,13 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") - message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") + message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1l) -vcpkg_download_distfile(ARCHIVE +set(OPENSSL_VERSION 1.1.1m) +vcpkg_download_distfile( + ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0 + SHA512 ba0ef99b321546c13385966e4a607734df38b96f6ed45c4c67063a5f8d1482986855279797a6920d9f86c2ec31ce3e104dcc62c37328caacdd78aec59aa66156 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 2d890c51a3..aef75528e2 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version-string": "1.1.1l", - "port-version": 4, + "version-string": "1.1.1m", "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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0d206d9cef..b81d25b9bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5037,8 +5037,8 @@ "port-version": 1 }, "openssl": { - "baseline": "1.1.1l", - "port-version": 4 + "baseline": "1.1.1m", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index a7dd4f8be6..0bb78010fb 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dbcaacad14ed0761323aa12c13e917270153594", + "version-string": "1.1.1m", + "port-version": 0 + }, { "git-tree": "d25384246619019a1e44f018546cdfcaf1800174", "version-string": "1.1.1l",