diff options
| author | Raul Metsma <raul@metsma.ee> | 2021-04-30 21:34:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 11:34:56 -0700 |
| commit | 85308d1a2135f65bf52603687360f54e9c4e25ba (patch) | |
| tree | c9cfaa5a6c2716144b013e9c03a35024142e7a53 | |
| parent | d32e92dd1678792c07c4d8adb6ce6a8d9e59a2ac (diff) | |
| download | vcpkg-85308d1a2135f65bf52603687360f54e9c4e25ba.tar.gz vcpkg-85308d1a2135f65bf52603687360f54e9c4e25ba.zip | |
[OpenSSL] Update to 1.1.1k (#16937)
* [OpenSSL] Update to 1.1.1k
Signed-off-by: Raul Metsma <raul@metsma.ee>
* Update JSON file
Signed-off-by: Raul Metsma <raul@metsma.ee>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
| -rw-r--r-- | ports/openssl/CONTROL | 3 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/openssl/windows/portfile.cmake | 4 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
5 files changed, 12 insertions, 8 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 4fb53bb67..303b7d910 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,4 @@ Source: openssl -Version: 1.1.1j -Port-Version: 2 +Version: 1.1.1k Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index cd7884f17..9b59a3c85 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -2,11 +2,11 @@ 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.") endif() -set(OPENSSL_VERSION 1.1.1j) +set(OPENSSL_VERSION 1.1.1k) 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 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5 + SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index d444bd694..7a3bf08ed 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -65,7 +65,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-rel + LOGNAME configure-perl-${TARGET_TRIPLET}-rel ) message(STATUS "Configure ${TARGET_TRIPLET}-rel done") @@ -104,7 +104,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-dbg + LOGNAME configure-perl-${TARGET_TRIPLET}-dbg ) message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") diff --git a/versions/baseline.json b/versions/baseline.json index 1f0002e40..55a208008 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4537,8 +4537,8 @@ "port-version": 0 }, "openssl": { - "baseline": "1.1.1j", - "port-version": 2 + "baseline": "1.1.1k", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 0e37bc8df..600c1724a 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "dc279487c79f2b009333d7888799f3f9f83d8765", + "version-string": "1.1.1k", + "port-version": 0 + }, + { "git-tree": "47f6dd2398634984759b609529bf35482957da54", "version-string": "1.1.1j", "port-version": 2 |