diff options
Diffstat (limited to 'databases/mysql57-client/files')
24 files changed, 0 insertions, 587 deletions
diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt deleted file mode 100644 index 3e1761d68ea5..000000000000 --- a/databases/mysql57-client/files/patch-CMakeLists.txt +++ /dev/null @@ -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) - diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 843117b51fd6..000000000000 --- a/databases/mysql57-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -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 diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake deleted file mode 100644 index f8c13ec7c398..000000000000 --- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ /dev/null @@ -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) diff --git a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake deleted file mode 100644 index 83c154ee3bcf..000000000000 --- a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake +++ /dev/null @@ -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() diff --git a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index e2f70f193360..000000000000 --- a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -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) -+ diff --git a/databases/mysql57-client/files/patch-cmake_plugin.cmake b/databases/mysql57-client/files/patch-cmake_plugin.cmake deleted file mode 100644 index 77b38c747b61..000000000000 --- a/databases/mysql57-client/files/patch-cmake_plugin.cmake +++ /dev/null @@ -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}) diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 6efbcd0e492d..000000000000 --- a/databases/mysql57-client/files/patch-cmake_ssl.cmake +++ /dev/null @@ -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() diff --git a/databases/mysql57-client/files/patch-configure.cmake b/databases/mysql57-client/files/patch-configure.cmake deleted file mode 100644 index 81ab9495aac3..000000000000 --- a/databases/mysql57-client/files/patch-configure.cmake +++ /dev/null @@ -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 diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 045b98549e41..000000000000 --- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -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 diff --git a/databases/mysql57-client/files/patch-include_CMakeLists.txt b/databases/mysql57-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 1fc41ad15601..000000000000 --- a/databases/mysql57-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -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 diff --git a/databases/mysql57-client/files/patch-include_my__compare.h b/databases/mysql57-client/files/patch-include_my__compare.h deleted file mode 100644 index 1a64142bb658..000000000000 --- a/databases/mysql57-client/files/patch-include_my__compare.h +++ /dev/null @@ -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) diff --git a/databases/mysql57-client/files/patch-include_my_openssl.h b/databases/mysql57-client/files/patch-include_my_openssl.h deleted file mode 100644 index 43ddb2935038..000000000000 --- a/databases/mysql57-client/files/patch-include_my_openssl.h +++ /dev/null @@ -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(); diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h deleted file mode 100644 index 0a4b795e9426..000000000000 --- a/databases/mysql57-client/files/patch-include_myisam.h +++ /dev/null @@ -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) diff --git a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index b90821a7f767..000000000000 --- a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -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 diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index e02a804949d8..000000000000 --- a/databases/mysql57-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ man/CMakeLists.txt -@@ -15,10 +15,6 @@ - - # Copy man pages - FILE(GLOB MAN1_FILES *.1) --FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN8_FILES *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) - IF(MAN1_EXCLUDE) - LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index ea05679341fa..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC -+++ mysys_ssl/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) - { - line++; -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * - end[(strlen(end)-1)] = ' '; - else - strxmov(end, conf_file, *ext , " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo - - #else - -- errors += add_directory(alloc, "/etc/", dirs); -- errors += add_directory(alloc, "/etc/mysql/", dirs); -- --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f - MY_STAT stat_info; - - if (!my_stat(file_name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore .mylogin.cnf file if not exclusively readable/writable - by current user. diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc deleted file mode 100644 index f01df5434093..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:31:17 UTC -+++ mysys_ssl/my_kdf.cc -@@ -59,7 +59,7 @@ int create_kdf_key(const unsigned char *key, const uns - Key_derivation_function *kdf_function = NULL; - - if (kdf_name == "hkdf") { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - kdf_function = new Key_hkdf_function(kdf_options); - #else - return 1; -@@ -87,7 +87,7 @@ Key_derivation_function::Key_derivation_function() { - options_valid_ = false; - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) { - kdf_options_ = kdf_options; - } diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h b/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h deleted file mode 100644 index 5366bfbe1d32..000000000000 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__kdf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys_ssl/my_kdf.h.orig 2022-11-04 07:35:11 UTC -+++ mysys_ssl/my_kdf.h -@@ -61,7 +61,7 @@ class Key_derivation_function { - bool options_valid_; - }; - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - - /** Class to implement KDF method hkdf. */ - class Key_hkdf_function : public Key_derivation_function { diff --git a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c b/databases/mysql57-client/files/patch-mysys_mf__iocache2.c deleted file mode 100644 index 10663953a1d5..000000000000 --- a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mysys/mf_iocache2.c.orig 2018-10-28 11:22:04 UTC -+++ mysys/mf_iocache2.c -@@ -19,6 +19,7 @@ - - #include "mysys_priv.h" - #include "my_sys.h" -+#include "mysql/psi/mysql_file.h" - #include <m_string.h> - #include <stdarg.h> - #include <m_ctype.h> diff --git a/databases/mysql57-client/files/patch-mysys_my__symlink.c b/databases/mysql57-client/files/patch-mysys_my__symlink.c deleted file mode 100644 index 1a392a41660c..000000000000 --- a/databases/mysql57-client/files/patch-mysys_my__symlink.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mysys/my_symlink.c.orig 2017-07-19 12:10:42 UTC -+++ mysys/my_symlink.c -@@ -23,6 +23,7 @@ - #include <sys/param.h> - #include <sys/stat.h> - #endif -+#include "my_dir.h" - - /* - Reads the content of a symbolic link diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 493e407cbff5..000000000000 --- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 -+++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400 -@@ -46,6 +46,7 @@ - MESSAGE(FATAL_ERROR "Cannot concatenate files") - ENDIF() - -+IF(FALSE) - # Build mysql_fix_privilege_tables.c - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c -@@ -66,6 +67,7 @@ - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c - ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h - ) -+ENDIF() - - # If we do not have performance schema compiled in then sys will not work, - # so only create an empty sys database with an auto-generated file, -@@ -146,6 +148,7 @@ - ) - ENDIF() - -+IF(FALSE) - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -153,6 +156,7 @@ - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - ) - ENDIF() -+ENDIF() - - IF(NOT WITHOUT_SERVER) - INSTALL(FILES -@@ -326,6 +330,8 @@ - GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -411,19 +417,7 @@ - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -- IF(WITH_SYSTEMD) -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- ) -- ELSE() -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- mysqld_multi -- mysqld_safe -- ) -- ENDIF() -+ SET(BIN_SCRIPTS mysql_config) - - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") diff --git a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc b/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc deleted file mode 100644 index 567a7da1628c..000000000000 --- a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/auth/sha2_password_common.cc -+++ sql/auth/sha2_password_common.cc -@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, - DBUG_RETURN(true); - } - m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); --#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) - EVP_MD_CTX_cleanup(md_context); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - EVP_MD_CTX_reset(md_context); diff --git a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 282cffdbcbc5..000000000000 --- a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC -+++ storage/myisam/mi_dynrec.c -@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my - DBUG_RETURN(1); - } - /* -- I wonder if it is good to use MAP_NORESERVE. From the Linux man page: -- MAP_NORESERVE -- Do not reserve swap space for this mapping. When swap space is -- reserved, one has the guarantee that it is possible to modify the -- mapping. When swap space is not reserved one might get SIGSEGV -- upon a write if no physical memory is available. -+ MAP_NORESERVE is unimplemented in FreeBSD - */ - info->s->file_map= (uchar*) - my_mmap(0, (size_t) size, - info->s->mode==O_RDONLY ? PROT_READ : - PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE, -+ MAP_SHARED, - info->dfile, 0L); - if (info->s->file_map == (uchar*) MAP_FAILED) - { diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 405d4f734914..000000000000 --- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC -+++ support-files/CMakeLists.txt -@@ -47,6 +47,7 @@ IF(UNIX) - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF (FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -59,9 +60,11 @@ IF(UNIX) - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() -+ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - -+IF(FALSE) - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -74,3 +77,4 @@ IF(UNIX) - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() |