diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-09-28 08:26:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 17:26:06 -0700 |
| commit | ee0584f05066a63073b516605091155ccd99c7d9 (patch) | |
| tree | 64f846196e45d728d684238723ae97335b17ec67 /ports/libressl | |
| parent | d49854f8a0a5f496557fb658b3751b7edd98c889 (diff) | |
| download | vcpkg-ee0584f05066a63073b516605091155ccd99c7d9.tar.gz vcpkg-ee0584f05066a63073b516605091155ccd99c7d9.zip | |
[libssh/libressl] update to the latest version (#20067)
* [libssh/libssh2/libssh2] update to the latest version
* update version
* update patches formating
* update version
* update hash512
* update version'
* fix CI build error
* update version
* update vcpkg.json and portifile.cmake
* update version
* delete hash
* update version
* revert libssh2
* update version
* revert libssh2
* update portfile.cmake
* update version
Diffstat (limited to 'ports/libressl')
| -rw-r--r-- | ports/libressl/portfile.cmake | 19 | ||||
| -rw-r--r-- | ports/libressl/vcpkg.json | 12 |
2 files changed, 17 insertions, 14 deletions
diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7483e02c8..32ca4d767 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
-set(LIBRESSL_VERSION 3.3.3)
-set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f)
+set(LIBRESSL_VERSION 3.3.4)
+set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de)
vcpkg_download_distfile(
LIBRESSL_SOURCE_ARCHIVE
@@ -30,9 +30,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" LIBRESSL_APPS
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DLIBRESSL_TESTS=OFF
@@ -40,16 +39,10 @@ vcpkg_configure_cmake( -DLIBRESSL_APPS=OFF
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
if("tools" IN_LIST FEATURES)
- if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
- set(EXECUTABLE_SUFFIX .exe)
- endif()
- file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl")
- file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}")
- file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}")
- vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl")
+ vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openssl" AUTO_CLEAN)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 59c18243c..ff08a3b58 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libressl", - "version": "3.3.3", + "version": "3.3.4", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build openssl and ocspcheck executables" |