From 640cb26c1a85bc27146500d7f675760d1d4ed403 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 13 Oct 2023 19:06:57 +0100
Subject: [PATCH] [BoringSSL] rm debug suffix non-Windows, short name in UNIX
 pc (#34459)

---
 ports/boringssl/install-pc-files.cmake | 16 ++++++++++------
 ports/boringssl/portfile.cmake         |  8 ++++++--
 ports/boringssl/vcpkg.json             |  2 +-
 versions/b-/boringssl.json             |  5 +++++
 versions/baseline.json                 |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake
index 262a533a8b..47eab26cdc 100644
--- a/ports/boringssl/install-pc-files.cmake
+++ b/ports/boringssl/install-pc-files.cmake
@@ -3,6 +3,8 @@ function(install_pc_file name pc_data)
     if (NOT VCPKG_TARGET_IS_WINDOWS)
         string(REPLACE "-lcrypt32" "" pc_data "${pc_data}")
         string(REPLACE "-lws2_32" "" pc_data "${pc_data}")
+        string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
+        string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
     elseif (NOT VCPKG_TARGET_IS_MINGW)
         string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
         string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}")
@@ -11,12 +13,14 @@ function(install_pc_file name pc_data)
         configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
     endif()
     if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-            string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}")
-            string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}")
-        else()
-            string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}")
-            string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}")
+        if(VCPKG_TARGET_IS_WINDOWS)
+            if (NOT VCPKG_TARGET_IS_MINGW)
+                string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}")
+                string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}")
+            else()
+                string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}")
+                string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}")
+            endif()
         endif()
         configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
     endif()
diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake
index dee6ccd95e..6fb4c9c80a 100644
--- a/ports/boringssl/portfile.cmake
+++ b/ports/boringssl/portfile.cmake
@@ -26,11 +26,15 @@ vcpkg_from_github(
     0003-fix-shared-symbol-visibility.patch
 )
 
+if(VCPKG_TARGET_IS_WINDOWS)
+  # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix.
+  set(CMAKE_CONFIGURE_OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d")
+endif()
+
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS_DEBUG
-    # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix.
-    -DCMAKE_DEBUG_POSTFIX=d
+    ${CMAKE_CONFIGURE_OPTIONS_DEBUG}
 )
 
 vcpkg_cmake_install()
diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json
index c47b1bcc45..6dc9f6b02d 100644
--- a/ports/boringssl/vcpkg.json
+++ b/ports/boringssl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "boringssl",
-  "version-date": "2023-09-25",
+  "version-date": "2023-10-13",
   "description": "BoringSSL is a fork of OpenSSL developed by Google",
   "homepage": "https://boringssl.googlesource.com/boringssl",
   "supports": "!uwp",
diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json
index 29f4edb13c..fe013489a9 100644
--- a/versions/b-/boringssl.json
+++ b/versions/b-/boringssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2b809260036c7ee69cbf1a8a06e015354121d741",
+      "version-date": "2023-10-13",
+      "port-version": 0
+    },
     {
       "git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01",
       "version-date": "2023-09-25",
diff --git a/versions/baseline.json b/versions/baseline.json
index bb1d72d572..d04fee7a61 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1289,7 +1289,7 @@
       "port-version": 0
     },
     "boringssl": {
-      "baseline": "2023-09-25",
+      "baseline": "2023-10-13",
       "port-version": 0
     },
     "botan": {