From b1ddadc8b4f867587b50c13aef0f63db4ce65d78 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 20 May 2021 23:41:10 -0700 Subject: [PATCH 01/20] [openssl] Add cmake wrapper to handle OPENSSL_ROOT_DIR --- ports/openssl/portfile.cmake | 2 +- ports/openssl/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/openssl/vcpkg.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 ports/openssl/vcpkg-cmake-wrapper.cmake diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 9b59a3c8550f53..445bce149dce82 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -21,5 +21,5 @@ else() include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake") endif() - +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..4324376f554171 --- /dev/null +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) +set(OPENSSL_ROOT_DIR ${CURRENT_INSTALLED_DIR}) + +_find_package(${ARGS}) + +set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) \ No newline at end of file diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 612b38a057c668..462e3b6cbaa518 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 1, + "port-version": 2, "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" } From 6becf069d2f87e1b984a75cb3a777956aac06054 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 20 May 2021 23:44:26 -0700 Subject: [PATCH 02/20] Get the abs path --- ports/openssl/vcpkg-cmake-wrapper.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake index 4324376f554171..618fadc9c0cc3d 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake @@ -1,5 +1,7 @@ set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) -set(OPENSSL_ROOT_DIR ${CURRENT_INSTALLED_DIR}) +get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) _find_package(${ARGS}) From 4fa26f4d6a2bffd9b362dd5c668a17b75227f37f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 20 May 2021 23:44:47 -0700 Subject: [PATCH 03/20] update version record --- 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 7145894ab07fa4..f23e5335fc19a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4558,7 +4558,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index c0771f1a52d437..31f604f62a25ca 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d1de3729313ac0e210a70738449a2f72e7621f9", + "version-string": "1.1.1k", + "port-version": 2 + }, { "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201", "version-string": "1.1.1k", From a160c71b21b9c2d2df260d647d6a06f8a4d6a5c9 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 24 May 2021 18:51:23 -0700 Subject: [PATCH 04/20] apply suggestion. --- ports/openssl/vcpkg-cmake-wrapper.cmake | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake index 618fadc9c0cc3d..2e25084b5307ec 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake @@ -3,6 +3,35 @@ get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) +set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") +file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) +set(CMAKE_SYSTEM_IGNORE_PATH_BAK ${CMAKE_SYSTEM_IGNORE_PATH}) +set(CMAKE_SYSTEM_IGNORE_PATH + "${Z_VCPKG_PROGRAMFILES}/OpenSSL" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" + "C:/OpenSSL/" + "C:/OpenSSL-Win32/" + "C:/OpenSSL-Win64/" + "C:/OpenSSL-Win32/lib/VC" + "C:/OpenSSL-Win64/lib/VC" + "C:/OpenSSL-Win32/lib/VC/static" + "C:/OpenSSL-Win64/lib/VC/static" +) + _find_package(${ARGS}) +set(CMAKE_SYSTEM_IGNORE_PATH ${CMAKE_SYSTEM_IGNORE_PATH_BAK}) set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) \ No newline at end of file From bbce9db40c773330fac895742c54ddeb6a698756 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 24 May 2021 18:52:44 -0700 Subject: [PATCH 05/20] Clean up openssl related code, move to openssl wrapper. --- scripts/buildsystems/vcpkg.cmake | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 9bdf6573e30608..d9192e92d7d6b5 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -519,33 +519,6 @@ endif() set(VCPKG_CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}") -file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) -set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") -file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) -set(CMAKE_SYSTEM_IGNORE_PATH - "${Z_VCPKG_PROGRAMFILES}/OpenSSL" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" - "C:/OpenSSL/" - "C:/OpenSSL-Win32/" - "C:/OpenSSL-Win64/" - "C:/OpenSSL-Win32/lib/VC" - "C:/OpenSSL-Win64/lib/VC" - "C:/OpenSSL-Win32/lib/VC/static" - "C:/OpenSSL-Win64/lib/VC/static" -) - # CMAKE_EXECUTABLE_SUFFIX is not yet defined if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") set(Z_VCPKG_EXECUTABLE "${Z_VCPKG_ROOT_DIR}/vcpkg.exe") From ac97e30704cca0e7201a73789aeded73adbc3662 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 24 May 2021 18:53:09 -0700 Subject: [PATCH 06/20] update version record --- 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 31f604f62a25ca..510d2b2991c122 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3d1de3729313ac0e210a70738449a2f72e7621f9", + "git-tree": "15f21e44c8c035e5e3fbd8541bea39aec016612f", "version-string": "1.1.1k", "port-version": 2 }, From 064f0a902d1a14bcc8bf48288a739695162de653 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 25 May 2021 19:02:24 -0700 Subject: [PATCH 07/20] [kf5holidays] Disable parallel configure --- ports/kf5holidays/portfile.cmake | 1 + ports/kf5holidays/vcpkg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 22899a21b09a0c..0a8c2209a1b7e1 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index ee7a3fcd6c381f..0d6daeea423229 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.75.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", From 69cbaebf0a278274259f89e6ae20169f0498d1dd Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 25 May 2021 19:02:43 -0700 Subject: [PATCH 08/20] update version record --- versions/baseline.json | 2 +- versions/k-/kf5holidays.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index f23e5335fc19a5..601acefe4bdff6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2838,7 +2838,7 @@ }, "kf5holidays": { "baseline": "5.75.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.75.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index ed4f322e1058aa..30d7b54c36c0a8 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae1d307bfe93fefc845ef782cae40a359c7453be", + "version": "5.75.0", + "port-version": 1 + }, { "git-tree": "18dd0b493b905446080c4060b086e2e8ad653613", "version": "5.75.0", From 4797fcf8c1efc73a2385577a4677a21ea2279d92 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 25 May 2021 19:08:38 -0700 Subject: [PATCH 09/20] update version record --- versions/k-/kf5holidays.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index a141ccaa53b3a6..a7e6ce01d42fea 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,10 +1,15 @@ { "versions": [ { - "git-tree": "748a3353b679c76468e85e01c3b5fa4e21351566", + "git-tree": "624f5c592ba2ea64dda5f8962d423165e470be7d", "version": "5.81.0", "port-version": 1 }, + { + "git-tree": "748a3353b679c76468e85e01c3b5fa4e21351566", + "version": "5.81.0", + "port-version": 0 + }, { "git-tree": "18dd0b493b905446080c4060b086e2e8ad653613", "version": "5.75.0", From 88ec0f06dd23f863d32a966bade0008eb5f07bc2 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 26 May 2021 20:14:24 -0700 Subject: [PATCH 10/20] bump version --- ports/openssl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 462e3b6cbaa518..d7a4a76e0455a1 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "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" } From 6e3e2a3242c474637e564c4adb98c5dece2cbfdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 28 May 2021 10:58:29 +0800 Subject: [PATCH 11/20] 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 1a5670c59928f6..c63c3a4727dc9d 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "15f21e44c8c035e5e3fbd8541bea39aec016612f", + "git-tree": "46cecbb0f83f916b49c930f630246d44de6aa7c3", "version-string": "1.1.1k", "port-version": 3 }, From 77978589e0bd3b670b09eadac554e7d4afec3c47 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Fri, 28 May 2021 02:35:05 -0700 Subject: [PATCH 12/20] update baseline --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index d88ee2ae914fab..4d36a9cc95fba3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4566,7 +4566,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", From 48fa12cd7be766c901ab8e7a8142b4e0f0ca78a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 31 May 2021 10:32:01 +0800 Subject: [PATCH 13/20] Update ports/openssl/vcpkg-cmake-wrapper.cmake --- ports/openssl/vcpkg-cmake-wrapper.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake index 2e25084b5307ec..5cf08b2a7149fe 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake @@ -33,5 +33,4 @@ set(CMAKE_SYSTEM_IGNORE_PATH _find_package(${ARGS}) -set(CMAKE_SYSTEM_IGNORE_PATH ${CMAKE_SYSTEM_IGNORE_PATH_BAK}) -set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) \ No newline at end of file +set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) From c4edc7c609d5fae08dcc1fdea28b97e3970234ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 31 May 2021 10:32:06 +0800 Subject: [PATCH 14/20] Update ports/openssl/vcpkg-cmake-wrapper.cmake --- ports/openssl/vcpkg-cmake-wrapper.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake index 5cf08b2a7149fe..6ef468ee6c6c25 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake @@ -6,7 +6,6 @@ get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) -set(CMAKE_SYSTEM_IGNORE_PATH_BAK ${CMAKE_SYSTEM_IGNORE_PATH}) set(CMAKE_SYSTEM_IGNORE_PATH "${Z_VCPKG_PROGRAMFILES}/OpenSSL" "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" From 3784712c8597fb5fffb5311a35221902e4227c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 31 May 2021 17:51:04 +0800 Subject: [PATCH 15/20] 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 c63c3a4727dc9d..18ed02210e3730 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "46cecbb0f83f916b49c930f630246d44de6aa7c3", + "git-tree": "eb471f523da25c78b54ca194807a1c43d8faeecc", "version-string": "1.1.1k", "port-version": 3 }, From 3a2ee2a0ac815e9a148fb95acc43d8c48ddb7b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 4 Jun 2021 10:14:34 +0800 Subject: [PATCH 16/20] Update ports/openssl/vcpkg.json --- ports/openssl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d7a4a76e0455a1..2d0eb1370480b9 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 3, + "port-version": 4, "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" } From cae12c66ade57e9445a7ed77c435cd12a8605073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 8 Jun 2021 10:42:06 +0800 Subject: [PATCH 17/20] 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 df1ead2f7f2b21..7ef54b9816c8ff 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb471f523da25c78b54ca194807a1c43d8faeecc", + "git-tree": "4323fd67834c43c2388b3581d4224df4ed99dacf", "version-string": "1.1.1k", "port-version": 4 }, From 1b2926e317509703da0238469644d5eb6c18d4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:40:22 +0800 Subject: [PATCH 18/20] Update ports/openssl/vcpkg.json --- ports/openssl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 2d0eb1370480b9..cd7b732c001604 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 4, + "port-version": 5, "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" } From 8097308722be577126d86eb4319020e50ec2008d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 9 Jun 2021 09:59:01 +0800 Subject: [PATCH 19/20] 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 d2e5e1e1529280..281a232db0cb6e 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4323fd67834c43c2388b3581d4224df4ed99dacf", + "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7", "version-string": "1.1.1k", "port-version": 5 }, From ce4abaa15896d2f7427a5016b3ae55b4e203d71b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 9 Jun 2021 20:05:00 -0700 Subject: [PATCH 20/20] update version record --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8c6726e671cfb5..00503c0c0011ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4586,7 +4586,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 4 + "port-version": 5 }, "openssl-unix": { "baseline": "1.1.1h",