From 25b300209512d480af68f8a709c46bcba97de4a5 Mon Sep 17 00:00:00 2001
From: luncliff <luncliff@gmail.com>
Date: Sun, 21 Jan 2024 18:26:57 +0900
Subject: [PATCH 1/2] [openssl3] support 'tools' feature

---
 ports/openssl3/portfile.cmake | 15 +++++++++++++--
 ports/openssl3/vcpkg.json     |  8 +++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ports/openssl3/portfile.cmake b/ports/openssl3/portfile.cmake
index bb6e1c0e..21b9a5ba 100644
--- a/ports/openssl3/portfile.cmake
+++ b/ports/openssl3/portfile.cmake
@@ -59,11 +59,13 @@ file(RENAME      "${CURRENT_BUILDTREES_DIR}/${SOURCE_DIR_NAME}"
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
 vcpkg_add_to_path("${PERL_EXE_PATH}")
+message(STATUS "Using perl: ${PERL}")
 
 if(NOT VCPKG_HOST_IS_WINDOWS)
     # see ${SOURCE_PATH}/NOTES-UNIX.md
     find_program(MAKE make REQUIRED)
     get_filename_component(MAKE_EXE_PATH "${MAKE}" DIRECTORY)
+    message(STATUS "Using make: ${MAKE}")
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
@@ -73,6 +75,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
     # note: jom is not for `vcpkg_add_to_path`
     vcpkg_find_acquire_program(JOM)
+    message(STATUS "Using jom: ${JOM}")
 
 elseif(VCPKG_TARGET_IS_ANDROID)
     # see ${SOURCE_PATH}/NOTES-ANDROID.md
@@ -116,6 +119,10 @@ vcpkg_execute_required_process(
     LOGNAME "configure-perl-${TARGET_TRIPLET}-rel"
 )
 
+if("tools" IN_LIST FEATURES)
+    list(APPEND TARGETS install_runtime)
+endif()
+
 if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS)
     message(STATUS "Building ${TARGET_TRIPLET}-dbg")
     vcpkg_execute_required_process(
@@ -125,7 +132,7 @@ if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS)
     )
     message(STATUS "Building ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
-        COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile install_dev
+        COMMAND ${JOM} /K /J ${VCPKG_CONCURRENCY} /F makefile install_dev ${TARGETS}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
         LOGNAME "install-${TARGET_TRIPLET}-rel"
     )
@@ -140,7 +147,7 @@ else()
     )
     message(STATUS "Building ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
-        COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev
+        COMMAND ${MAKE} -j ${VCPKG_CONCURRENCY} install_dev ${TARGETS}
         WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
         LOGNAME "install-${TARGET_TRIPLET}-rel"
     )
@@ -166,6 +173,10 @@ else()
 
 endif()
 
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES openssl AUTO_CLEAN)
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libcrypto.a"
                 "${CURRENT_PACKAGES_DIR}/debug/lib/libssl.a"
diff --git a/ports/openssl3/vcpkg.json b/ports/openssl3/vcpkg.json
index 92db4fa0..4e19828b 100644
--- a/ports/openssl3/vcpkg.json
+++ b/ports/openssl3/vcpkg.json
@@ -1,7 +1,13 @@
 {
   "name": "openssl3",
   "version-semver": "3.1.4",
+  "port-version": 1,
   "description": "TLS/SSL and crypto library",
   "homepage": "https://www.openssl.org/",
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "features": {
+    "tools": {
+      "description": "Buind/Install OpenSSL CLI tools"
+    }
+  }
 }

From d425cfa77f973e89641d99b7beea93d55a90cf73 Mon Sep 17 00:00:00 2001
From: luncliff <luncliff@gmail.com>
Date: Sun, 21 Jan 2024 18:27:20 +0900
Subject: [PATCH 2/2] [openssl3] update baseline

---
 versions/baseline.json    | 2 +-
 versions/o-/openssl3.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 40f9b0cf..8956fa42 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -102,7 +102,7 @@
     },
     "openssl3": {
       "baseline": "3.1.4",
-      "port-version": 0
+      "port-version": 1
     },
     "pthreadpool": {
       "baseline": "2023-09-12",
diff --git a/versions/o-/openssl3.json b/versions/o-/openssl3.json
index 3c4bec99..2d4c3563 100644
--- a/versions/o-/openssl3.json
+++ b/versions/o-/openssl3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "027b5866ebd1f8f5073660e4dd37f2b7c2961e41",
+      "version-semver": "3.1.4",
+      "port-version": 1
+    },
     {
       "git-tree": "4ccaa0ed4ddb704dc02138a5ea784a35b79b46ec",
       "version-semver": "3.1.4",