From 90699d43048258d6f26da3e1afc8f2a490436862 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 13:19:50 +0100 Subject: [PATCH 1/6] update libressl --- ports/libressl/portfile.cmake | 14 +++++++------- ports/libressl/vcpkg.json | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index d957d8783e0cda..a463155bfe0c00 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -4,20 +4,20 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") return() endif() -set(LIBRESSL_VERSION 3.3.4) -set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de) +set(LIBRESSL_VERSION 3.4.2) +set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b413e97cbb8ba504400f0a1f42757f6128b3fa763d06bae4fc9f2b9dbeea867a57ad2) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE - URLS https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz - FILENAME ${PORT}-${LIBRESSL_VERSION}.tar.gz - SHA512 ${LIBRESSL_HASH} + URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" + FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz" + SHA512 "${LIBRESSL_HASH}" ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}" - REF ${LIBRESSL_VERSION} + REF "${LIBRESSL_VERSION}" PATCHES 0001-enable-ocspcheck-on-msvc.patch 0002-suppress-msvc-warnings.patch @@ -65,6 +65,6 @@ 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}") - execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${LIB}" "${LINK}") + file(CREATE_LINK "${LIB}" "${LINK}") endforeach() endif() diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index f6afd1026741c1..3b784e025024b5 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libressl", - "version": "3.3.4", - "port-version": 1, + "version": "3.4.2", "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": [ From e8b4d2e8bca9fdb7b148e9f09cc47e450a9c9265 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 13:20:16 +0100 Subject: [PATCH 2/6] version stuff --- versions/baseline.json | 4 ++-- versions/l-/libressl.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1286dcf59dd1b6..666052049cb817 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3877,8 +3877,8 @@ "port-version": 0 }, "libressl": { - "baseline": "3.3.4", - "port-version": 1 + "baseline": "3.4.2", + "port-version": 0 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index d750caba6b26c7..9f2741d5d235b2 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6aa04a0e8e0e22504006a5f949607fb6495ce088", + "version": "3.4.2", + "port-version": 0 + }, { "git-tree": "1541c15439fdf9199c6796b51cd59fa644b7d9e4", "version": "3.3.4", From 9120845d8e86441306dd0a4872c15ef1f78883f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 20:25:14 +0100 Subject: [PATCH 3/6] correctly seperate urls --- ports/libressl/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index a463155bfe0c00..b8604ebfda33ad 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -9,7 +9,7 @@ set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b41 vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE - URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" + URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz" SHA512 "${LIBRESSL_HASH}" ) From 3cc9051ac5fc1ee06f71fe0d6a59bab7b500a221 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 20:25:41 +0100 Subject: [PATCH 4/6] version stuff --- versions/l-/libressl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 9f2741d5d235b2..7312a9eda54fc2 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6aa04a0e8e0e22504006a5f949607fb6495ce088", + "git-tree": "09613175bb9f051a273b68c0520ad4017d8fabd9", "version": "3.4.2", "port-version": 0 }, From a6bc04b33463beba876808addad31e9ed8aadf9d Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 20:27:48 +0100 Subject: [PATCH 5/6] let CI build it --- scripts/ci.baseline.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f015d8c757c200..7cdf6545a87b84 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -592,15 +592,15 @@ boringssl:x64-windows = skip boringssl:x64-windows-static = skip boringssl:x64-windows-static-md=skip boringssl:x86-windows = skip -libressl:arm64-windows = skip -libressl:arm-uwp = skip -libressl:x64-linux = skip -libressl:x64-osx = skip -libressl:x64-uwp = skip -libressl:x64-windows = skip -libressl:x64-windows-static = skip -libressl:x64-windows-static-md=skip -libressl:x86-windows = skip +#libressl:arm64-windows = skip +#libressl:arm-uwp = skip +#libressl:x64-linux = skip +#libressl:x64-osx = skip +#libressl:x64-uwp = skip +#libressl:x64-windows = skip +#libressl:x64-windows-static = skip +#libressl:x64-windows-static-md=skip +#libressl:x86-windows = skip libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail From df9e2743b3f9ad7f37fd573c68aca8a132ae182a Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Fri, 25 Feb 2022 21:17:14 +0100 Subject: [PATCH 6/6] Revert "let CI build it" This reverts commit a6bc04b33463beba876808addad31e9ed8aadf9d. --- scripts/ci.baseline.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7cdf6545a87b84..f015d8c757c200 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -592,15 +592,15 @@ boringssl:x64-windows = skip boringssl:x64-windows-static = skip boringssl:x64-windows-static-md=skip boringssl:x86-windows = skip -#libressl:arm64-windows = skip -#libressl:arm-uwp = skip -#libressl:x64-linux = skip -#libressl:x64-osx = skip -#libressl:x64-uwp = skip -#libressl:x64-windows = skip -#libressl:x64-windows-static = skip -#libressl:x64-windows-static-md=skip -#libressl:x86-windows = skip +libressl:arm64-windows = skip +libressl:arm-uwp = skip +libressl:x64-linux = skip +libressl:x64-osx = skip +libressl:x64-uwp = skip +libressl:x64-windows = skip +libressl:x64-windows-static = skip +libressl:x64-windows-static-md=skip +libressl:x86-windows = skip libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail