From 5d20dd0a3e009cc629ab9348df98f8f974b71960 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 10 Aug 2024 11:16:37 +0200
Subject: [PATCH] [libmysql] Update to 8.0.39 (#40373)

---
 ports/libmysql/install-exports.patch | 11 +++++++----
 ports/libmysql/portfile.cmake        |  9 ++++++---
 ports/libmysql/vcpkg.json            |  3 +--
 versions/baseline.json               |  4 ++--
 versions/l-/libmysql.json            |  5 +++++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ports/libmysql/install-exports.patch b/ports/libmysql/install-exports.patch
index 3cf34ed3be..c5416bed3a 100644
--- a/ports/libmysql/install-exports.patch
+++ b/ports/libmysql/install-exports.patch
@@ -64,7 +64,7 @@ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
 index c4ef5694..8e933877 100644
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -321,6 +321,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
      FOREACH(lib ${TARGET_LIB_DEPENDS})
        IF (lib MATCHES "^\\-l")
          SET(${var} "${${var}} ${lib} ")
@@ -73,13 +73,16 @@ index c4ef5694..8e933877 100644
        ELSEIF (lib MATCHES "^ext::")
          STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}")
          SET(SYSTEM_LIB ${CMAKE_MATCH_1})
-         SET(${var} "${${var}} -l${SYSTEM_LIB} ")
+@@ -330,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+         ELSE()
+           SET(${var} "${${var}} ${SYSTEM_LINK_FLAG} ")
+         ENDIF()
 +      elseif(TARGET "${lib}" AND NOT WIN32)
 +        # merged or shared, not external
        ELSEIF (lib MATCHES "^\\-L")
          # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind
          SET(${var} "${${var}} ${lib} ")
-@@ -354,6 +358,7 @@ IF(MSVC)
+@@ -365,6 +369,7 @@ IF(MSVC)
    GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION)
    GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME)
  ELSE()
@@ -87,7 +90,7 @@ index c4ef5694..8e933877 100644
    GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION)
    GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)
  ENDIF()
-@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system")
+@@ -384,6 +389,10 @@ IF (WITH_SSL STREQUAL "system")
        "${CONFIG_LIBS_PRIVATE}")
    ENDIF()
  ENDIF()
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
index a9cddbc6f2..4e67625bd5 100644
--- a/ports/libmysql/portfile.cmake
+++ b/ports/libmysql/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
     REF mysql-${VERSION}
-    SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561
+    SHA512 80341fe6bf6738b30721933a31c8c3f033ce8342a3a2defeb83e29219375bff274620f6f21a02ee6f4e77f0d3a858a20487436a5afd0a95ea35b0523812c52ab
     HEAD_REF master
     PATCHES
         dependencies.patch
@@ -16,7 +16,7 @@ vcpkg_from_github(
         fix-pdb-install-path.patch
 )
 
-file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0")
+file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_*")
 list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit")
 if (third_party)
     file(REMOVE_RECURSE ${third_party})
@@ -73,6 +73,8 @@ vcpkg_cmake_configure(
         -DMYSQL_MAINTAINER_MODE=OFF
         -DBUNDLE_RUNTIME_LIBRARIES=OFF
         -DDOWNLOAD_BOOST=OFF
+        -DWITH_AUTHENTICATION_KERBEROS=OFF
+        -DWITH_AUTHENTICATION_LDAP_DEFAULT=OFF
         -DWITH_CURL=none
         -DWITH_EDITLINE=bundled # not in vcpkg
         -DWITH_LZ4=system
@@ -148,5 +150,6 @@ file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 set(libedit_copying "${SOURCE_PATH}/COPYING for libedit")
-file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}")
+file(GLOB libedit_copying_infile "${SOURCE_PATH}/extra/libedit/libedit-*/COPYING")
+file(COPY_FILE "${libedit_copying_infile}" "${libedit_copying}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}")
diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
index efdf2f9b04..702cdb34f2 100644
--- a/ports/libmysql/vcpkg.json
+++ b/ports/libmysql/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libmysql",
-  "version": "8.0.34",
-  "port-version": 2,
+  "version": "8.0.39",
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "license": "GPL-2.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index c8dbfb6000..50fce7c9f9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4761,8 +4761,8 @@
       "port-version": 0
     },
     "libmysql": {
-      "baseline": "8.0.34",
-      "port-version": 2
+      "baseline": "8.0.39",
+      "port-version": 0
     },
     "libnice": {
       "baseline": "0.1.21",
diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json
index 45ddd552a1..db40a330e8 100644
--- a/versions/l-/libmysql.json
+++ b/versions/l-/libmysql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb4f616fe98bc02a278669124285ef829bf8abb4",
+      "version": "8.0.39",
+      "port-version": 0
+    },
     {
       "git-tree": "d203c4fd8f6d845b6d0b744bade33dd78a83957f",
       "version": "8.0.34",