@openziti/ziti-sdk-nodejs 0.16.0 → 0.17.0

package/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch

@@ -11,14 +11,15 @@ diff --git a/src/file.h b/src/file.h
 index 0332506..4aa9f60 100644
 --- a/src/file.h
 +++ b/src/file.h
-@@ -88,6 +88,7 @@
+@@ -88,7 +88,8 @@
  /* Do this here and now, because struct stat gets re-defined on solaris */
  #include <sys/stat.h>
  #include <stdarg.h>
 +#include <dirent.h>
- 
- #define ENABLE_CONDITIONALS
- 
+ #include <locale.h>
+ #if defined(HAVE_XLOCALE_H)
+ #include <xlocale.h>
+ #endif
 -- 
 2.29.2.windows.2
 

package/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch

@@ -161,7 +161,7 @@ index 3ab52d1..fc48d84 100644
 --- a/src/pread.c
 +++ b/src/pread.c
 @@ -3,7 +3,9 @@
- FILE_RCSID("@(#)$File: pread.c,v 1.2 2013/04/02 16:23:07 christos Exp $")
+ FILE_RCSID("@(#)$File: pread.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
  #endif  /* lint */
  #include <fcntl.h>
 +#ifdef HAVE_UNISTD_H

package/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch

@@ -17,7 +17,7 @@ index 5204f20..7244841 100644
  #undef HAVE_MAJOR
 -#ifdef	S_IFLNK
 +#if S_IFLNK != 0
- private int
+ file_private int
  bad_link(struct magic_set *ms, int err, char *buf)
  {
 @@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)

package/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch

@@ -11,21 +11,19 @@ diff --git a/src/funcs.c b/src/funcs.c
 index b926625..b585486 100644
 --- a/src/funcs.c
 +++ b/src/funcs.c
-@@ -809,6 +809,7 @@ file_print_guid(char *str, size_t len, const uint64_t *guid)
- 	    g->data4[6], g->data4[7]);
+@@ -888,5 +888,6 @@
  }
  
 +#ifndef _WIN32
- protected int
+ file_protected int
  file_pipe_closexec(int *fds)
  {
-@@ -827,6 +828,7 @@ protected int
- file_clear_closexec(int fd) {
- 	return fcntl(fd, F_SETFD, 0);
+@@ -914,5 +915,6 @@
+ #endif
  }
 +#endif
  
- protected char *
+ file_protected char *
  file_strtrim(char *str)
 -- 
 2.29.2.windows.2

package/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch

@@ -7,20 +7,20 @@ diff --git a/src/compress.c b/src/compress.c
 index 33ce2bc..f172eda 100644
 --- a/src/compress.c
 +++ b/src/compress.c
-@@ -378,7 +378,7 @@
+@@ -407,7 +407,7 @@
  sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__)))
  {
  	ssize_t rv;
--#ifdef FIONREAD
+-#if defined(FIONREAD) && !defined(__MINGW32__)
 +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
  	int t = 0;
  #endif
  	size_t rn = n;
-@@ -386,7 +386,7 @@
+@@ -418,7 +418,7 @@
  	if (fd == STDIN_FILENO)
  		goto nocheck;
  
--#ifdef FIONREAD
+-#if defined(FIONREAD) && !defined(__MINGW32__)
 +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
  	if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) {
  #ifdef FD_ZERO

package/vcpkg/ports/libmagic/0016-Fix-file_famagic-function.patch

@@ -2,13 +2,13 @@ diff --git a/src/fsmagic.c b/src/fsmagic.c
 index 7244841..2c553c1 100644
 --- a/src/fsmagic.c
 +++ b/src/fsmagic.c
-@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $")
+@@ -66,7 +66,7 @@ # define major(dev)  (((dev) >> 8) & 0xff)
  # define minor(dev)  ((dev) & 0xff)
  #endif
  #undef HAVE_MAJOR
 -#if S_IFLNK != 0
 +#if S_IFLNK != 0 && ! defined(_WIN32)
- private int
+ file_private int
  bad_link(struct magic_set *ms, int err, char *buf)
  {
 @@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)

package/vcpkg/ports/libmagic/portfile.cmake

@@ -8,12 +8,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
         "0006-Remove-Wrap-POSIX-headers.patch"
         "0007-Substitute-unistd-macros-for-MSVC.patch"
         "0008-Add-FILENO-defines.patch"
-        "0009-No-fcntl-in-magic.c.patch"
         "0010-Properly-check-for-the-presence-of-bitmasks.patch"
         "0011-Remove-pipe-related-functions-in-funcs.c.patch"
         "0012-Convert-MSYS2-paths-to-Windows-paths.patch"
         "0013-Check-for-backslash-in-argv-0-on-Windows.patch"
-        "0014-Define-POSIX-macros-if-missing.patch"
         "0015-MSYS2-Remove-ioctl-call.patch"
         "0016-Fix-file_famagic-function.patch"
     )
@@ -22,8 +20,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO file/file
-    REF FILE5_40
-    SHA512 d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319
+    REF FILE5_45
+    SHA512 fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea
     HEAD_REF master
     PATCHES ${PATCHES}
 )
@@ -68,5 +66,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake"
+    INSTALL_DESTINATION "share/unofficial-${PORT}"
+)
+
+# Handle copyright and usage
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

package/vcpkg/ports/libmagic/unofficial-libmagic-config.cmake.in

@@ -0,0 +1,69 @@
+@PACKAGE_INIT@
+
+if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    include(CMakeFindDependencyMacro)
+    find_dependency(unofficial-tre)
+endif()
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+    set(_IMPORT_PREFIX "")
+endif()
+
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    add_library(unofficial::libmagic::libmagic STATIC IMPORTED)
+else()
+    add_library(unofficial::libmagic::libmagic SHARED IMPORTED)
+endif()
+
+set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+)
+
+if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+        INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:unofficial::tre::tre>"
+    )
+endif()
+
+macro(add_library_config config prefix)
+    set_property(TARGET unofficial::libmagic::libmagic APPEND PROPERTY IMPORTED_CONFIGURATIONS ${config})
+    if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+        set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+            IMPORTED_LOCATION_${config} "${_IMPORT_PREFIX}/${prefix}lib/@VCPKG_TARGET_STATIC_LIBRARY_PREFIX@magic@VCPKG_TARGET_STATIC_LIBRARY_SUFFIX@"
+            IMPORTED_LINK_INTERFACE_LANGUAGES_${config} "C"
+        )
+    else()
+        if(WIN32)
+            set(library_dir "${_IMPORT_PREFIX}/${prefix}bin/")
+            set(soversion_suffix "-1")
+            set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+                IMPORTED_IMPLIB_${config} "${_IMPORT_PREFIX}/${prefix}/lib/@VCPKG_TARGET_IMPORT_LIBRARY_PREFIX@magic@VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX@"
+            )
+        else()
+            set(library_dir "${_IMPORT_PREFIX}/${prefix}lib/")
+        endif()
+        set_target_properties(unofficial::libmagic::libmagic PROPERTIES
+            IMPORTED_LOCATION_${config} "${library_dir}@VCPKG_TARGET_SHARED_LIBRARY_PREFIX@magic${soversion_suffix}@VCPKG_TARGET_SHARED_LIBRARY_SUFFIX@"
+        )
+        unset(soversion_suffix)
+        unset(library_dir)
+    endif()
+endmacro()
+
+if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "debug")
+    add_library_config(DEBUG "debug/")
+endif()
+
+if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "release")
+    add_library_config(RELEASE "")
+endif()
+
+set_and_check(unofficial-libmagic_DICTIONARY "${_IMPORT_PREFIX}/share/libmagic/misc/magic.mgc")
+
+unset(_IMPORT_PREFIX)
+
+check_required_components(unofficial-libmagic)

package/vcpkg/ports/libmagic/usage

@@ -0,0 +1,6 @@
+libmagic provides CMake targets:
+
+    find_package(unofficial-libmagic REQUIRED)
+    target_link_libraries(main PRIVATE unofficial::libmagic::libmagic)
+
+The magic.mgc file can be accessed from the unofficial-libmagic_DICTIONARY variable.

package/vcpkg/ports/libmagic/vcpkg.json

@@ -1,9 +1,10 @@
 {
   "name": "libmagic",
-  "version": "5.40",
-  "port-version": 3,
+  "version": "5.45",
+  "port-version": 1,
   "description": "This library can be used to classify files according to magic number tests.",
   "homepage": "https://github.com/file/file",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "dirent",

package/vcpkg/ports/libmspack/portfile.cmake

@@ -1,11 +1,11 @@
 set(LIB_NAME libmspack)
-set(LIB_VERSION 0.10.1alpha)
+set(LIB_VERSION 0.11alpha)
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
+    SHA512 40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62
 )
 
 vcpkg_extract_source_archive(

package/vcpkg/ports/libmspack/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "libmspack",
-  "version": "0.10.1",
-  "port-version": 6,
+  "version": "0.11",
   "description": "libmspack is a portable library for some loosely related Microsoft compression formats.",
   "homepage": "https://www.cabextract.org.uk/libmspack",
   "dependencies": [

package/vcpkg/ports/libmt32emu/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO munt/munt
-    REF 08aba2f0018f4e7c2af855c268a97b8b84f8dc06  #vlibmt32emu_2_7_0
-    SHA512 ef277767c6c18b1aa341b2e2cdac04c27bc19ef0aa2f1e0a4125c92128f64d5938eab53cf1d6bf2f9abaa5a59d14873e91e1518878165af48ac6b93c3e208aa5
+    REF libmt32emu_2_7_1
+    SHA512 369d1c5f16b37f3d8544ad30a30c3aa9d0796f67fcf5988e789958bff14bba119f7c5fd4c43816eb369a14b56f22f0c7eb3016ff838cd36d1d6f22ed84a2e8b9
     HEAD_REF master
 )
 

package/vcpkg/ports/libmt32emu/vcpkg.json

@@ -1,8 +1,8 @@
 {
   "name": "libmt32emu",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "A MT-32 emulator",
-  "homepage": "https://github.com/munt/munt/tree/master/mt32emu",
+  "homepage": "https://github.com/munt/munt",
   "license": "GPL-2.0-or-later",
   "dependencies": [
     {

package/vcpkg/ports/libmysql/cross-build.patch

@@ -0,0 +1,141 @@
+diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
+index 8e224532..2b63413b 100644
+--- a/libmysql/CMakeLists.txt
++++ b/libmysql/CMakeLists.txt
+@@ -259,6 +259,7 @@ ELSEIF(FREEBSD)
+   MESSAGE(STATUS "BSD built in DNS SRV APIs")
+ ELSE()
+   FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
++  FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
+   IF (RESOLV_LIBRARY)
+     LIST(APPEND LIBS_TO_LINK ${RESOLV_LIBRARY})
+     SET(HAVE_UNIX_DNS_SRV 1 PARENT_SCOPE)
+@@ -413,6 +414,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test
+   ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
+   LINK_LIBRARIES libmysql ${LIBRT}
+   SKIP_INSTALL
++  EXCLUDE_FROM_ALL
+   )
+ # Clang/UBSAN needs this on some platforms.
+ SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
+@@ -439,6 +441,6 @@ ADD_CUSTOM_COMMAND(
+   COMMAND libmysql_api_test
+   > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
+   )
+-MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL
++MY_ADD_CUSTOM_TARGET(run_libmysql_api_test
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
+   )
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 8e933877..d971acbf 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND(
+ 
+ # Add target for the above to be built
+ MY_ADD_CUSTOM_TARGET(GenFixPrivs
+-  ALL
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h
+ )
+ 
+diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt
+index aaba3575..a0e52652 100644
+--- a/scripts/sys_schema/CMakeLists.txt
++++ b/scripts/sys_schema/CMakeLists.txt
+@@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sql_commands.h)
+ 
+ MY_ADD_CUSTOM_TARGET(GenSysSchemaC
+-  ALL
+   DEPENDS comp_sql sql_commands
+   COMMENT "Generating Sys Schema C code"
+ )
+diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
+index 28cde40e..be916cbc 100644
+--- a/share/CMakeLists.txt
++++ b/share/CMakeLists.txt
+@@ -47,8 +47,12 @@ SET(dirs
+   ukrainian
+   )
+ 
+-FOREACH (dir ${dirs})
+-  INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir}
++  set(src_dir ${CMAKE_BINARY_DIR}/share/libmysql)
++  if(CMAKE_CROSSCOMPILING)
++    set(src_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql)
++  endif()
++  FOREACH (dir ${dirs})
++  INSTALL(DIRECTORY ${src_dir}/${dir}
+     DESTINATION ${INSTALL_MYSQLSHAREDIR}
+     COMPONENT Server
+     )
+diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
+index 665b35da..88f0743b 100644
+--- a/strings/CMakeLists.txt
++++ b/strings/CMakeLists.txt
+@@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt)
+ SET(ZH_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_zh_tbls.cc)
+ SET(JA_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/ja_hans.txt)
+ SET(JA_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_ja_tbls.cc)
++if(CMAKE_CROSSCOMPILING)
++  file(COPY
++    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_zh_tbls.cc"
++    "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_ja_tbls.cc"
++    DESTINATION "${CMAKE_BINARY_DIR}/strings"
++  )
++else()
+ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
+                           ${JA_HANS_DST_FILE}
+                    COMMAND uca9dump zh
+@@ -79,6 +86,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE}
+                      --out_file=${JA_HANS_DST_FILE}
+                    DEPENDS uca9dump ${ZH_HANS_SRC_FILE} ${JA_HANS_SRC_FILE}
+                   )
++install(FILES "${ZH_HANS_DST_FILE}" "${JA_HANS_DST_FILE}" DESTINATION "share/libmysql/${PROJECT_VERSION}")
++endif()
+ 
+ SET_SOURCE_FILES_PROPERTIES(
+   ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE}
+diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
+index da34524c..dc397dae 100644
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err
+   SKIP_INSTALL
+   )
+ 
++if(CMAKE_CROSSCOMPILING)
++  file(COPY
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/include/mysql/mysqld_error.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqlclient_ername.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_ername.h
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_errmsg.h
++    DESTINATION ${PROJECT_BINARY_DIR}/include
++  )
++  file(COPY
++    ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/errmsg.sys
++    DESTINATION ${PROJECT_BINARY_DIR}/share/libmysql/english
++  )
++  add_custom_target(GenClientError)
++  add_custom_target(GenError)
++else()
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
+   COMMAND comp_client_err
+   --in_file=${PROJECT_SOURCE_DIR}/include/errmsg.h
+@@ -97,6 +112,16 @@ MYSQL_ADD_EXECUTABLE(range_check_err
+   SKIP_INSTALL
+   )
+ 
++  install(
++    FILES
++      ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h
++      ${PROJECT_BINARY_DIR}/include/mysqld_ername.h
++      ${PROJECT_BINARY_DIR}/include/mysqld_errmsg.h
++      ${PROJECT_BINARY_DIR}/share/libmysql/english/errmsg.sys
++    DESTINATION share/libmysql/${PROJECT_VERSION}
++  )
++endif()
++
+ # Set InnoDB mutex type
+ ADD_DEFINITIONS(-DMUTEX_EVENT)
+ 

package/vcpkg/ports/libmysql/dependencies.patch

@@ -0,0 +1,140 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e17ec1d0..465e42f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -818,8 +818,12 @@ INCLUDE(fileutils)
+ INCLUDE(zlib)
+ INCLUDE(zstd)
+ INCLUDE(lz4)
+-INCLUDE(icu)
+-INCLUDE(libevent)
++macro(MYSQL_CHECK_ICU)
++endmacro()
++macro(MYSQL_CHECK_LIBEVENT)
++endmacro()
++macro(WARN_MISSING_SYSTEM_LIBEVENT)
++endmacro()
+ INCLUDE(ssl)
+ INCLUDE(sasl)
+ INCLUDE(ldap)
+@@ -837,7 +841,8 @@ INCLUDE(curl)
+ INCLUDE(rapidjson)
+ INCLUDE(fprofile)
+ INCLUDE(gloves)
+-INCLUDE(fido2)
++macro(MYSQL_CHECK_FIDO)
++endmacro()
+ INCLUDE(win_jemalloc)
+ 
+ IF(UNIX)
+@@ -1942,7 +1947,7 @@ MYSQL_CHECK_RAPIDJSON()
+ MYSQL_CHECK_FIDO()
+ MYSQL_CHECK_FIDO_DLLS()
+ 
+-IF(APPLE)
++IF(0)
+   GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY)
+   IF(EXISTS ${HOMEBREW_BASE}/include/boost)
+     FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO)
+diff --git a/cmake/boost.cmake b/cmake/boost.cmake
+index c979055c..53e55fcf 100644
+--- a/cmake/boost.cmake
++++ b/cmake/boost.cmake
+@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+   COULD_NOT_FIND_BOOST()
+ ENDIF()
+ 
+-IF(NOT BOOST_MINOR_VERSION EQUAL 77)
++IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION)
+   MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
+     "we need 77"
+     )
+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
+index 7107f4bd..bb7f3733 100644
+--- a/cmake/libutils.cmake
++++ b/cmake/libutils.cmake
+@@ -534,7 +534,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
+ 
+   # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib
+   # must be merged into mysqlclient.lib
+-  IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient")
++  IF(0)
+     SET(LINKER_EXTRA_FLAGS "")
+     FOREACH(LIB ${SSL_LIBRARIES})
+       STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}")
+diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
+index 10e7e8c8..48772329 100644
+--- a/cmake/lz4.cmake
++++ b/cmake/lz4.cmake
+@@ -46,7 +46,7 @@ FUNCTION(FIND_SYSTEM_LZ4)
+   FIND_PATH(LZ4_INCLUDE_DIR
+     NAMES lz4frame.h)
+   FIND_LIBRARY(LZ4_SYSTEM_LIBRARY
+-    NAMES lz4)
++    NAMES lz4d lz4 NAMES_PER_DIR)
+   IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY)
+     SET(SYSTEM_LZ4_FOUND 1 CACHE INTERNAL "")
+     ADD_LIBRARY(lz4_interface INTERFACE)
+diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
+index 04e3af87..8ae52c82 100644
+--- a/cmake/ssl.cmake
++++ b/cmake/ssl.cmake
+@@ -273,7 +273,18 @@ MACRO (MYSQL_CHECK_SSL)
+     FIND_ALTERNATIVE_SYSTEM_SSL()
+   ENDIF()
+ 
+-  IF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
++  IF(WITH_SSL STREQUAL "system")
++    find_package(OpenSSL REQUIRED)
++    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")
++    add_library(ext::openssl ALIAS OpenSSL::SSL)
++    set(SSL_LIBRARIES ext::openssl)
++    set(OPENSSL_APPLINK_C "${OPENSSL_APPLINK_SOURCE}")
++    include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
++  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL)
+     IF((APPLE OR WIN32) AND WITH_SSL STREQUAL "system")
+       # FindOpenSSL.cmake knows about
+       # http://www.slproweb.com/products/Win32OpenSSL.html
+diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
+index 3781fe09..ac312ad0 100644
+--- a/cmake/zlib.cmake
++++ b/cmake/zlib.cmake
+@@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_ZLIB)
+     MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system")
+   ENDIF()
+ 
+-  ADD_LIBRARY(ext::zlib ALIAS zlib_interface)
++  ADD_LIBRARY(ext::zlib ALIAS ZLIB::ZLIB)
+ 
+   IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED)
+     MESSAGE(FATAL_ERROR
+diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
+index 425426d1..0ae1a907 100644
+--- a/cmake/zstd.cmake
++++ b/cmake/zstd.cmake
+@@ -90,15 +90,16 @@ MACRO (MYSQL_CHECK_ZSTD)
+   IF(WITH_ZSTD STREQUAL "bundled")
+     MYSQL_USE_BUNDLED_ZSTD()
+   ELSEIF(WITH_ZSTD STREQUAL "system")
+-    FIND_SYSTEM_ZSTD()
+-    IF (NOT SYSTEM_ZSTD_FOUND)
+-      MESSAGE(FATAL_ERROR "Cannot find system zstd libraries.")
+-    ENDIF()
++    find_package(ZSTD NAMES zstd REQUIRED)
+   ELSE()
+     MESSAGE(FATAL_ERROR "WITH_ZSTD must be bundled or system")
+   ENDIF()
+ 
+-  ADD_LIBRARY(ext::zstd ALIAS zstd_interface)
++  if(TARGET zstd::libzstd_shared)
++    add_library(ext::zstd ALIAS zstd::libzstd_shared)
++  else()
++    add_library(ext::zstd ALIAS zstd::libzstd_static)
++  endif()
+ 
+   IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED)
+     MESSAGE(FATAL_ERROR