From 84e008654e8f3f5fadf913591615fa5c0aeb4385 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 27 Mar 2024 22:54:54 +0100
Subject: [PATCH] [openssl] Enforce cmd for nmake (#37716)

Fixes https://github.com/microsoft/vcpkg/issues/37134.
Fixes https://github.com/microsoft/vcpkg/issues/35949.
---
 ports/openssl/vcpkg.json             | 2 +-
 ports/openssl/windows/portfile.cmake | 5 +++++
 versions/baseline.json               | 2 +-
 versions/o-/openssl.json             | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 68a67599bf..747c90cb5c 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.2.1",
-  "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",
   "license": "Apache-2.0",
diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 59da6897fe..bb40684361 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -1,3 +1,8 @@
+# Need cmd to pass quoted CC from nmake to mkbuildinf.pl, GH-37134
+find_program(CMD_EXECUTABLE cmd HINTS ENV PATH NO_DEFAULT_PATH REQUIRED)
+cmake_path(NATIVE_PATH CMD_EXECUTABLE cmd)
+set(ENV{COMSPEC} "${cmd}")
+
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
 vcpkg_add_to_path("${PERL_EXE_PATH}")
diff --git a/versions/baseline.json b/versions/baseline.json
index 75e29856c9..99a31cf843 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6486,7 +6486,7 @@
     },
     "openssl": {
       "baseline": "3.2.1",
-      "port-version": 1
+      "port-version": 2
     },
     "openssl-unix": {
       "baseline": "deprecated",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 65854dcbd5..9078d094ac 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d41de10fe318363c031b97457b7b6d473020a18",
+      "version": "3.2.1",
+      "port-version": 2
+    },
     {
       "git-tree": "3dc6df970a3aff9c977032299e481fd9872e0970",
       "version": "3.2.1",