databases/mysql57-*: Remove expired port

2026-05-22 18:42:42 -07:00 · 2023-12-31 01:06:36 +01:00
parent d904ca2a2c
commit e716c4e0ea
84 changed files with 8 additions and 2171 deletions
@@ -8283,3 +8283,5 @@ www/py-dj41-drf-yasg|www/py-dj42-drf-yasg|2023-12-31|Has expired: Extended suppo
 print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
 print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10
 www/py-dj41-django-cors-headers|www/py-dj42-django-cors-headers|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/
+databases/mysql57-server|mysql80-server|2023-12-31|Has expired: Upstream support ended in October 2019
+databases/mysql57-client|mysql80-client|2023-12-31|Has expired: Upstream support ended in October 2019
@@ -1,15 +1,14 @@
 # Provide support for MySQL
 # Feature:	mysql
 # Usage:	USES=mysql or USES=mysql:args
-# Valid ARGS:	<version>, client, server, embedded
+# Valid ARGS:	<version>, client, server
 #
 # version	If no version is given (by the maintainer via the port), try to
 #		find the currently installed version.  Fall back to default if
 #		necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
 #		possible values).
 # client	Depends on the libmysqlclient library (default)
-# server/embedded
-#		Depend on the server at run/build time. If none of these is
+# server 	Depend on the server at run/build time. If none of these is
 #		set, depends on the client.
 #
 # IGNORE_WITH_MYSQL
@@ -28,16 +27,11 @@ _INCLUDE_USES_MYSQL_MK=	yes
 .  if !empty(mysql_ARGS)
 .undef _WANT_MYSQL_VER
 .undef _WANT_MYSQL_SERVER
-.undef _WANT_MYSQL_EMBEDDED
 _MYSQL_ARGS=		${mysql_ARGS:S/,/ /g}
 .    if ${_MYSQL_ARGS:Mserver}
 _WANT_MYSQL_SERVER=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nserver}
 .    endif
-.    if ${_MYSQL_ARGS:Membedded}
-_WANT_MYSQL_EMBEDDED=	yes
-_MYSQL_ARGS:=	${_MYSQL_ARGS:Nembedded}
-.    endif
 .    if ${_MYSQL_ARGS:Mclient}
 _WANT_MYSQL_CLIENT=	yes
 _MYSQL_ARGS:=	${_MYSQL_ARGS:Nclient}
@@ -62,7 +56,6 @@ DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # MySQL client version currently supported.
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-MYSQL57_LIBVER=		20
 MYSQL80_LIBVER=		21
 MYSQL81_LIBVER=		22
 .  for v in 5 6 11
@@ -139,14 +132,10 @@ IGNORE=		cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${
 .        endif
 .      endfor
 .    endif # IGNORE_WITH_MYSQL
-.    if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED)
+.    if defined(_WANT_MYSQL_SERVER)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
-.      if defined(_WANT_MYSQL_EMBEDDED)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
-.      endif
 .    endif
-.    if defined(_WANT_MYSQL_CLIENT) || \
-	!(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED))
+.    if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER)
 LIB_DEPENDS+=	${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
 .    endif
 .  else
@@ -105,7 +105,7 @@ LUAJIT_DEFAULT?=	luajit-devel
 .  endif
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT?=		5.20
-# Possible values: 5.7, 8.0, 8.1, 10.5m, 10.6m, 10.11m
+# Possible values: 8.0, 8.1, 10.5m, 10.6m, 10.11m
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
@@ -193,8 +193,6 @@
    SUBDIR += mysql-connector-java51
    SUBDIR += mysql-connector-odbc-80
    SUBDIR += mysql2pgsql
-    SUBDIR += mysql57-client
-    SUBDIR += mysql57-server
    SUBDIR += mysql80-client
    SUBDIR += mysql80-server
    SUBDIR += mysql81-client
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 	libzstd.so:archivers/zstd

 USES=		cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
-IGNORE_WITH_MYSQL=	57
 USE_LDCONFIG=	yes

 CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
@@ -1,47 +0,0 @@
-PORTNAME=	mysql
-PORTREVISION=	2
-PKGNAMESUFFIX=	57-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-LICENSE+=	LGPL21
-
-MASTERDIR=	${.CURDIR}/../mysql57-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql5[0-68-9]-client \
-			mysql[0-46-9][0-9]-client \
-			mariadb[0-9][0-9]-client \
-			percona[0-9][0-9]-client
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
-		-DWITH_NDBCLUSTER=1
-
-USE_CXXSTD=	c++14
-USE_LDCONFIG+=	${PREFIX}/lib/mysql
-
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-OPTIONS_GROUP+=		PLUGINS
-PLUGINS_DESC=		Default Client Plugins
-OPTIONS_GROUP_PLUGINS=	SASLCLIENT
-SASLCLIENT_DESC=	SASL client plugin module
-SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USES=		ldap
-OPTIONS_DEFAULT+=	SASLCLIENT
-
-# issue 166367: adding symlinks for back-compatibility with ${lib}_r
-post-install:
-	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
-	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
-	@${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
-
-.include "${MASTERDIR}/Makefile"
@@ -1,46 +0,0 @@
--- CMakeLists.txt.orig	2017-06-22 14:13:19 UTC
-+++ CMakeLists.txt
-@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
-   SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
-   # Add storage engines and plugins.
-   CONFIGURE_PLUGINS()
-ELSE()
-  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
-  ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
- 
- ADD_SUBDIRECTORY(include)
-@@ -647,8 +644,8 @@ ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -719,14 +716,13 @@ ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
-ADD_SUBDIRECTORY(packaging/solaris)
- 
- IF(UNIX)
-  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
@@ -1,54 +0,0 @@
--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ client/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-     upgrade/program.cc
-@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
-@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-+ENDIF()
- 
- IF(UNIX AND NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -122,7 +130,6 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
-  mysql_plugin
-   mysqlcheck
-   mysqldump
-   mysqlimport
@@ -1,20 +0,0 @@
--- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -43,7 +43,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
-    SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
-@@ -68,7 +68,7 @@ IF(UNIX)  
-     ENDIF()
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(COMMON_CXX_FLAGS               "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                     OUTPUT_VARIABLE GXX_VERSION)
@@ -1,27 +0,0 @@
--- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
-+++ cmake/os/DragonFly.cmake
-@@ -0,0 +1,24 @@
-+INCLUDE(CheckCSourceRuns)
-+
-+# We require at least GCC 4.4 or Clang 3.3.
-+IF(NOT FORCE_UNSUPPORTED_COMPILER)
-+  IF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-+  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ < 3) ||
-+               (__clang_major__ == 3 && __clang_minor__ < 3);
-+      }" HAVE_SUPPORTED_CLANG_VERSION)
-+    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-+      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+  ENDIF()
-+ENDIF()
@@ -1,32 +0,0 @@
--- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
-  ELSE()
-    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ENDIF()
- ENDIF()
- 
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
-
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
@@ -1,25 +0,0 @@
--- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
-+++ cmake/plugin.cmake
-@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
-      INSTALL_DEBUG_TARGET(${target}
-        DESTINATION ${INSTALL_PLUGINDIR}/debug
-        COMPONENT ${INSTALL_COMPONENT})
-+      IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-+          INSTALL_DEBUG_TARGET(${target}
-+            DESTINATION ${INSTALL_PLUGINDIR}/debug
-+            COMPONENT ${INSTALL_COMPONENT})
-+          # Add installed files to list for RPMs
-+          FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-+                  "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+      ENDIF()
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
-              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
@@ -1,30 +0,0 @@
--- cmake/ssl.cmake.orig	2023-10-25 22:22:28.748647000 +0200
-+++ cmake/ssl.cmake	2023-10-30 19:12:39.388494000 +0100
-@@ -232,13 +232,6 @@ MACRO (MYSQL_CHECK_SSL)
-       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
-     ENDIF()
- 
-    # On mac this list is <.dylib;.so;.a>
-    # We prefer static libraries, so we reverse it here.
-    IF (WITH_SSL_PATH)
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
-      MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
-    ENDIF()
-
-     FIND_LIBRARY(OPENSSL_LIBRARY
-                  NAMES ssl libssl ssleay32 ssleay32MD
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-@@ -253,9 +246,10 @@ MACRO (MYSQL_CHECK_SSL)
-       FIND_OPENSSL_VERSION()
-     ENDIF()
- 
-    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
-       ADD_DEFINITIONS(-DHAVE_TLSv13)
-       SET(HAVE_TLSv13 1)
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
-+       #SET(HAVE_TLSv13 1)
-        IF(SOLARIS)
-          SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
-        ENDIF()
@@ -1,15 +0,0 @@
--- configure.cmake.orig	2018-01-16 23:26:09 UTC
-+++ configure.cmake
-@@ -43,6 +43,12 @@ IF(UNIX)
- ENDIF()
- 
- 
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
-+ENDIF()
-+
-+
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
-   ## We will be using gcc to generate .so files
-   ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
@@ -1,33 +0,0 @@
--- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ extra/CMakeLists.txt
-@@ -45,6 +45,7 @@ ENDIF()
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
-                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
-+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
-                    COMMAND comp_err
-                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
-                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
-@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- # In published release builds on Solaris, we need to bundle gcc source.
- # PB2 will take care of putting it in extra/ when needed
@@ -1,10 +0,0 @@
--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ include/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
@@ -1,11 +0,0 @@
--- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
@@ -1,11 +0,0 @@
--- include/my_openssl.h.orig	2020-03-23 17:35:17 UTC
-+++ include/my_openssl.h
-@@ -51,7 +51,7 @@ extern "C" {
-  */
- static inline int mysql_OPENSSL_init()
- {
-#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   return SSL_library_init();
@@ -1,11 +0,0 @@
--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
@@ -1,11 +0,0 @@
--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ libmysql/CMakeLists.txt
-@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
-     COMPONENT SharedLibraries)
-   IF(UNIX)
-     # libtool compatability
-    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSE()
-       SET(OS_SHARED_LIB_VERSION
--- a/Show More
+++ b/Show More