From 0804a21e2ef9f03079a09f109b2f0e3e2ea7b7a9 Mon Sep 17 00:00:00 2001 From: Heiko Hund Date: Tue, 13 Apr 2021 01:09:16 +0200 Subject: [PATCH 1/6] [openssl] fix cross compilation with mingw When cross compiling openssl on Linux, e.g. ./vcpkg install openssl:x64-mingw-dynamic failed, because 'windres' was not found. The call to openssl's Configure was missing the WINDRES environment variable, which is needed in case it is prefixed. On Ubuntu the binutils-mingw-w64-x86-64 package installed it as /usr/bin/x86_64-w64-mingw32-windres. Since mingw uses openssl-unix to build, it's worth mentioning that the WINDRES env has no impact for non-mingw and is ignored there. --- ports/openssl/CONTROL | 1 + ports/openssl/unix/CMakeLists.txt | 1 + versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 303b7d910f5bb7..7849a13a97b919 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,4 +1,5 @@ Source: openssl Version: 1.1.1k +Port-Version: 1 Homepage: https://www.openssl.org 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. diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index f85f7b9f7eae66..a46b027bbe6355 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -153,6 +153,7 @@ add_custom_command( COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB} COMMAND ${ENV_COMMAND} MAKE=${MAKE} COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER} + COMMAND ${ENV_COMMAND} WINDRES=${CMAKE_RC_COMPILER} COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}" COMMAND "${PERL}" Configure ${SHARED} diff --git a/versions/baseline.json b/versions/baseline.json index 87efce787d5a5c..f3cb63b67104eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4542,7 +4542,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 600c1724aead46..f06aa1d9696e44 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48fd23e88938b2840b1deeeba1360311c34f55a7", + "version-string": "1.1.1k", + "port-version": 1 + }, { "git-tree": "dc279487c79f2b009333d7888799f3f9f83d8765", "version-string": "1.1.1k", From d594739392d5f857e2756fb7544c216a7ad079bd Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Tue, 20 Jul 2021 01:33:36 -0700 Subject: [PATCH 2/6] Handle conflicts --- ports/openssl/unix/CMakeLists.txt | 3 +-- versions/o-/openssl.json | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 92da0faeeeca01..e2c2ac9f758578 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -279,5 +279,4 @@ install( install( FILES ${INSTALL_PKG_CONFIGS} DESTINATION lib/pkgconfig -) ->>>>>>> b67fab9861239e33b722b9a44f5c96dec6ca807e +) \ No newline at end of file diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 1e229556869128..474c91547d727b 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,9 +1,6 @@ { "versions": [ { -<<<<<<< HEAD - "git-tree": "48fd23e88938b2840b1deeeba1360311c34f55a7", -======= "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", "version-string": "1.1.1k", "port-version": 7 @@ -35,7 +32,6 @@ }, { "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201", ->>>>>>> b67fab9861239e33b722b9a44f5c96dec6ca807e "version-string": "1.1.1k", "port-version": 1 }, From 0cb1acc40c3947612e813118225ebaba68737e94 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Tue, 20 Jul 2021 01:34:44 -0700 Subject: [PATCH 3/6] Update version files --- 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 cef33e4dee056e..3aef5442187290 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4634,7 +4634,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 7 + "port-version": 8 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 474c91547d727b..22deb85a110ab0 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3e36f6178bf5f2326fe6de702746410ea1ab477", + "version-string": "1.1.1k", + "port-version": 8 + }, { "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", "version-string": "1.1.1k", From 9e67b5309558466575dace667b34c4c5eff48047 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 21 Jul 2021 12:11:38 -0500 Subject: [PATCH 4/6] Update ports/openssl/unix/CMakeLists.txt --- 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 e2c2ac9f758578..be9c23d0032bff 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -279,4 +279,4 @@ install( install( FILES ${INSTALL_PKG_CONFIGS} DESTINATION lib/pkgconfig -) \ No newline at end of file +) From 4c5a1d00637fe3b6d674e07ef85280362f197cb4 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 22 Jul 2021 10:39:31 +0800 Subject: [PATCH 5/6] Update versions/o-/openssl.json --- 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 22deb85a110ab0..2f5f554a83f4cf 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d3e36f6178bf5f2326fe6de702746410ea1ab477", + "git-tree": "65617c3a08ee03835410c66f8be3b29606c89ff7", "version-string": "1.1.1k", "port-version": 8 }, From 4b18fc3fcea86626f7eb07bfe1d573835519d880 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Fri, 8 Oct 2021 01:36:27 -0700 Subject: [PATCH 6/6] Update versions/o-/openssl.json --- versions/o-/openssl.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index caf3958130a9a1..69a54b37451c64 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5310e60291032390ab8c893794f6044a7b9ae04", + "version-string": "1.1.1l", + "port-version": 2 + }, { "git-tree": "6d19a647704efae9398b178a0012140c1f1ee8b8", "version-string": "1.1.1l",