[libressl] update to 3.3.3 (#18729)

Resolves #18682
This commit is contained in:
Yuriy O'Donnell 2021-07-01 16:29:16 +02:00 committed by GitHub
parent 44bc692276
commit 7b97e041ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 16 deletions

View File

@ -9,7 +9,7 @@ index 3c80458..e8d3bf5 100644
OCSPCHECK_SRC
http.c
@@ -13,13 +11,27 @@ else()
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
endif()
+check_function_exists(getopt HAVE_GETOPT)

View File

@ -3,7 +3,7 @@ index a6a7554..b20fd4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,6 +111,11 @@ if(WIN32)
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
endif()
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)

View File

@ -1,8 +0,0 @@
Source: libressl
Version: 2.9.1
Port-Version: 3
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)
Feature: tools
Description: Build openssl and ocspcheck executables

View File

@ -6,8 +6,8 @@ endif()
vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
set(LIBRESSL_VERSION 2.9.1)
set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354)
set(LIBRESSL_VERSION 3.3.3)
set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f)
vcpkg_download_distfile(
LIBRESSL_SOURCE_ARCHIVE
@ -26,7 +26,8 @@ vcpkg_extract_source_archive_ex(
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"tools" LIBRESSL_APPS
FEATURES
"tools" LIBRESSL_APPS
)
vcpkg_configure_cmake(
@ -59,6 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/etc/ssl/certs"
"${CURRENT_PACKAGES_DIR}/debug/etc/ssl/certs"
"${CURRENT_PACKAGES_DIR}/share/man"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
@ -68,7 +70,7 @@ vcpkg_copy_pdbs()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic"))
if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
foreach(LIB ${LIBS})
string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}")

11
ports/libressl/vcpkg.json Normal file
View File

@ -0,0 +1,11 @@
{
"name": "libressl",
"version": "3.3.3",
"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)",
"features": {
"tools": {
"description": "Build openssl and ocspcheck executables"
}
}
}

View File

@ -3501,8 +3501,8 @@
"port-version": 0
},
"libressl": {
"baseline": "2.9.1",
"port-version": 3
"baseline": "3.3.3",
"port-version": 0
},
"librsvg": {
"baseline": "2.40.20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a",
"version": "3.3.3",
"port-version": 0
},
{
"git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1",
"version-string": "2.9.1",