[libmysql] Re-fix dependency openssl (#16426)

* [libmysql] Re-fix dependency openssl

* update version record

* LF to CRLF

* update version record

5 files changed, 48 insertions, 12 deletions

diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
deleted file mode 100644
index 4a9f2d2ba..000000000
--- a/ports/libmysql/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: libmysql
-Version: 8.0.20
-Port-Version: 1
-Homepage: https://github.com/mysql/mysql-server
-Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, lz4, zlib
-Description: A MySQL client library for C development.
-Supports: !(windows&x86)&!uwp
\ No newline at end of file
diff --git a/ports/libmysql/system-libs.patch b/ports/libmysql/system-libs.patch
index 2715823ea..547573fc5 100644
--- a/ports/libmysql/system-libs.patch
+++ b/ports/libmysql/system-libs.patch
@@ -56,6 +56,24 @@ index fde3a75..9f694b9 100644
  ENDMACRO()

  

  MACRO (MYSQL_USE_BUNDLED_ICU)

+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake

+index 3fa58da..88b53e7 100644

+--- a/cmake/libutils.cmake

++++ b/cmake/libutils.cmake

+@@ -350,12 +350,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)

+   # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib

+   # must be merged into mysqlclient.lib

+   IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient")

+-    SET(LINKER_EXTRA_FLAGS "")

+-    FOREACH(LIB ${SSL_LIBRARIES})

+-      STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}")

+-    ENDFOREACH()

+-    SET_TARGET_PROPERTIES(${TARGET}

+-      PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}")

++    TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES})

+   ENDIF()

+ 

+   IF(OSLIBS)

 diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake

 index 9aad130..68cbaba 100644

 --- a/cmake/lz4.cmake

@@ -70,7 +88,7 @@ index 9aad130..68cbaba 100644
      SET(SYSTEM_LZ4_FOUND 1)

      INCLUDE_DIRECTORIES(SYSTEM ${PATH_TO_LZ4})

 diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake

-index 52feade..4a0237a 100644

+index 52feade..1e71bd7 100644

 --- a/cmake/ssl.cmake

 +++ b/cmake/ssl.cmake

 @@ -93,7 +93,20 @@ ENDMACRO()

@@ -78,12 +96,12 @@ index 52feade..4a0237a 100644
  # WITH_SSL=[yes|system|<path/to/custom/installation>]

  MACRO (MYSQL_CHECK_SSL)

 +  find_package(OpenSSL REQUIRED)

-+  set(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY} CACHE STRING "")

-+  set(CRYPTO_LIBRARY ${OPENSSL_CRYPTO_LIBRARY} CACHE STRING "")

++  set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "")

++  set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "")

 +  FIND_PROGRAM(OPENSSL_EXECUTABLE openssl

 +        DOC "path to the openssl executable")

 +  SET(SSL_DEFINES "-DHAVE_OPENSSL")

-+  set(SSL_LIBRARIES ${OPENSSL_LIBRARIES})

++  set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)

 +  if(NOT WIN32)

 +    find_package(Threads REQUIRED)

 +    list(APPEND SSL_LIBRARIES Threads::Threads)

diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
new file mode 100644
index 000000000..225ec7495
--- /dev/null
+++ b/ports/libmysql/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "libmysql",
+  "version": "8.0.20",
+  "port-version": 2,
+  "description": "A MySQL client library for C development",
+  "homepage": "https://github.com/mysql/mysql-server",
+  "supports": "!(windows & x86) & !uwp",
+  "dependencies": [
+    "boost-algorithm",
+    "boost-functional",
+    "boost-geometry",
+    "boost-graph",
+    "boost-optional",
+    "icu",
+    "libevent",
+    "lz4",
+    "openssl",
+    "zlib"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 27152d83c..e4dc0c794 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3218,7 +3218,7 @@
     },
     "libmysql": {
       "baseline": "8.0.20",
-      "port-version": 1
+      "port-version": 2
     },
     "libnice": {
       "baseline": "0.1.15",
diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json
index b58553e67..6ad4a2384 100644
--- a/versions/l-/libmysql.json
+++ b/versions/l-/libmysql.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "55f99b850b59d83a2bc77a7a3980e96ccb67c875",
+      "version": "8.0.20",
+      "port-version": 2
+    },
+    {
       "git-tree": "0ef74d8a7cfbd48a4f57f48775212ccd9cdb06fb",
       "version-string": "8.0.20",
       "port-version": 1