diff options
| author | Septarius <1136966+Septarius@users.noreply.github.com> | 2020-06-29 15:43:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 14:43:51 -0700 |
| commit | 3c34afc1c44efd67f080b6fd6354f32e9ed182f0 (patch) | |
| tree | 389569bf9b9f491b759c00f69a1fe7e211d63cda /ports/openssl-windows | |
| parent | d47570b8d615abfaa1e31f612d65d89a05815ad9 (diff) | |
| download | vcpkg-3c34afc1c44efd67f080b6fd6354f32e9ed182f0.tar.gz vcpkg-3c34afc1c44efd67f080b6fd6354f32e9ed182f0.zip | |
[openssl] Update openssl 1.1.1g - continued from PR #11003 (#11882)
* [openssl] Update version to 1.1.1g
* [openssl] Disable build tests
* [openssl-unix][openssl-uwp] use vcpkg_fail_port_install
* [openssl] Applying PR #11003 Suggestions
The suggested changes from PR #11003
Along with one additional to remove the deprecated vcpkg_test_cmake from openssl-uwp\portfile.cmake as well.
* Update ports/openssl-uwp/portfile.cmake
Co-authored-by: crackedmind <digital.stream.of.mind@gmail.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/openssl-windows')
| -rw-r--r-- | ports/openssl-windows/CONTROL | 4 | ||||
| -rw-r--r-- | ports/openssl-windows/portfile.cmake | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL index 12b559d5f..e9ea27a42 100644 --- a/ports/openssl-windows/CONTROL +++ b/ports/openssl-windows/CONTROL @@ -1,4 +1,4 @@ Source: openssl-windows -Version: 1.1.1d-2 +Version: 1.1.1g 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. -Supports: windows
\ No newline at end of file +Supports: windows diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index a40532ec4..a802c84c5 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -8,15 +8,15 @@ endif() vcpkg_find_acquire_program(PERL) -set(OPENSSL_VERSION 1.1.1d) +set(OPENSSL_VERSION 1.1.1g) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") +vcpkg_add_to_path("${PERL_EXE_PATH}") 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 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7 + SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab ) vcpkg_extract_source_archive_ex( @@ -26,7 +26,7 @@ vcpkg_extract_source_archive_ex( vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH}") +vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") vcpkg_find_acquire_program(JOM) @@ -39,6 +39,7 @@ set(CONFIGURE_COMMAND ${PERL} Configure enable-static-engine enable-capieng no-ssl2 + no-tests -utf-8 ${OPENSSL_SHARED} ) @@ -181,5 +182,3 @@ vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE) |