From a6891c171c9e91ad6330edd3ee62f85887651541 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:49:12 +0200 Subject: [PATCH 1/4] [openssl] Fix dynamic build on OSX --- ports/openssl/unix/CMakeLists.txt | 2 +- ports/openssl/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index c375f0f3518e25..fc57d6de55c0c0 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -263,7 +263,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" - "${BUILDDIR}/libcrypto.1.1.dylib" + "${BUILDDIR}/libcrypto.3.dylib" COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index dfde151f1768fd..ff3927f0f22bb8 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.2", - "port-version": 2, + "port-version": 3, "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.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", From 313eeea0bbc4e3c3973defec07795c9ffe6c3d03 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:49:59 +0200 Subject: [PATCH 2/4] version --- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index bfb3a8d68e5414..5536868cab3753 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5150,7 +5150,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 207c8962730205..4d50a9815dbdbd 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1f0eeb1d755728b317b08bd484a0180e16c1633", + "version": "3.0.2", + "port-version": 3 + }, { "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", "version": "3.0.2", From c6573c200c969fceeff84fd684987d2aa1e833fb Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 13 Apr 2022 07:38:07 +0200 Subject: [PATCH 3/4] Use SHLIB_VERSION --- ports/openssl/unix/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index fc57d6de55c0c0..d47193512f2a25 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -263,7 +263,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" - "${BUILDDIR}/libcrypto.3.dylib" + "${BUILDDIR}/libcrypto.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" From da27bead26a0091bfcd1c4b728431304a3dcd7dd Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 13 Apr 2022 07:38:38 +0200 Subject: [PATCH 4/4] version --- versions/o-/openssl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 4d50a9815dbdbd..10a28745a12690 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a1f0eeb1d755728b317b08bd484a0180e16c1633", + "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", "version": "3.0.2", "port-version": 3 },