Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[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>
This commit is contained in:
Raul Metsma 2021-04-30 21:34:56 +03:00 committed by GitHub
parent d32e92dd16
commit 85308d1a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/openssl/CONTROL
View File

@ -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.

4
ports/openssl/portfile.cmake
View File

@ -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)

4
ports/openssl/windows/portfile.cmake
View File

@ -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")

4
versions/baseline.json
View File

@ -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",

5
versions/o-/openssl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dc279487c79f2b009333d7888799f3f9f83d8765",
"version-string": "1.1.1k",
"port-version": 0
},
{
"git-tree": "47f6dd2398634984759b609529bf35482957da54",
"version-string": "1.1.1j",