diff options
Diffstat (limited to 'databases/mysql57-server/files')
42 files changed, 0 insertions, 1044 deletions
diff --git a/databases/mysql57-server/files/extra-patch-config.h.cmake b/databases/mysql57-server/files/extra-patch-config.h.cmake deleted file mode 100644 index 3ac1add1b9ce..000000000000 --- a/databases/mysql57-server/files/extra-patch-config.h.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.cmake.orig 2014-12-05 16:24:02 UTC -+++ config.h.cmake -@@ -151,7 +151,8 @@ - #cmakedefine HAVE_FESETROUND 1 - #cmakedefine HAVE_FINITE 1 - #cmakedefine HAVE_FP_EXCEPT 1 --#cmakedefine HAVE_FPSETMASK 1 -+#cmakedefine HAVE_FPSETMASK 0 -+#cmakedefine HAVE_FEDISABLEEXCEPT 1 - #cmakedefine HAVE_FSEEKO 1 - #cmakedefine HAVE_FSYNC 1 - #cmakedefine HAVE_FTIME 1 diff --git a/databases/mysql57-server/files/my.cnf.sample.in b/databases/mysql57-server/files/my.cnf.sample.in deleted file mode 100644 index 55ba041bbc7b..000000000000 --- a/databases/mysql57-server/files/my.cnf.sample.in +++ /dev/null @@ -1,62 +0,0 @@ -[client] -port = 3306 -socket = /tmp/mysql.sock - -[mysql] -prompt = \u@\h [\d]>\_ -no_auto_rehash - -[mysqld] -user = mysql -port = 3306 -socket = /tmp/mysql.sock -bind-address = 127.0.0.1 -basedir = %%PREFIX%% -datadir = %%MY_DBDIR%% -tmpdir = %%MY_TMPDIR%% -slave-load-tmpdir = %%MY_TMPDIR%% -secure-file-priv = %%MY_SECDIR%% -log-bin = mysql-bin -log-output = TABLE -master-info-repository = TABLE -relay-log-info-repository = TABLE -relay-log-recovery = 1 -slow-query-log = 1 -server-id = 1 -sync_binlog = 1 -sync_relay_log = 1 -binlog_cache_size = 16M -expire_logs_days = 30 -default_password_lifetime = 0 -enforce-gtid-consistency = 1 -gtid-mode = ON -safe-user-create = 1 -lower_case_table_names = 1 -explicit-defaults-for-timestamp = 1 -myisam-recover-options = BACKUP,FORCE -open_files_limit = 32768 -table_open_cache = 16384 -table_definition_cache = 8192 -net_retry_count = 16384 -key_buffer_size = 256M -max_allowed_packet = 64M -query_cache_type = 0 -query_cache_size = 0 -long_query_time = 0.5 -innodb_buffer_pool_size = 1G -innodb_data_home_dir = %%MY_DBDIR%% -innodb_log_group_home_dir = %%MY_DBDIR%% -innodb_data_file_path = ibdata1:128M:autoextend -innodb_temp_data_file_path = ibtmp1:128M:autoextend -innodb_flush_method = O_DIRECT -innodb_log_file_size = 256M -innodb_log_buffer_size = 16M -innodb_write_io_threads = 8 -innodb_read_io_threads = 8 -innodb_autoinc_lock_mode = 2 -skip-symbolic-links - -[mysqldump] -max_allowed_packet = 256M -quote_names -quick diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in deleted file mode 100644 index 8f3c4858f36d..000000000000 --- a/databases/mysql57-server/files/mysql-server.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# PROVIDE: mysql -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable mysql: -# mysql_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable MySQL. -# mysql_dbdir (str): Default to "%%MY_DBDIR%%" -# Base database directory. -# mysql_confdir (str): Default to "%%ETCDIR%%" -# Base configuration directory. -# mysql_optfile (str): Server-specific option file. -# Set it in the rc.conf or default behaviour of -# `mysqld_safe` itself, will be picking -# ${mysql_confdir}/my.cnf if it exists. -# mysql_pidfile (str): Custom PID file path and name. -# Default to "${mysql_dbdir}/${hostname}.pid". -# mysql_args (str): Custom additional arguments to be passed -# to mysqld_safe (default empty). -# - -. /etc/rc.subr - -name="mysql" -rcvar=mysql_enable - -load_rc_config $name - -: ${mysql_enable="NO"} -: ${mysql_dbdir="%%MY_DBDIR%%"} -: ${mysql_confdir="%%ETCDIR%%"} -if [ -f "${mysql_confdir}/my.cnf" ]; then -: ${mysql_optfile="${mysql_confdir}/my.cnf"} -elif [ -f "${mysql_dbdir}/my.cnf" ]; then -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} -fi -if [ ! -z "${mysql_optfile}" ]; then -mysql_extra="--defaults-extra-file=${mysql_optfile}" -fi - - -mysql_user="mysql" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} -command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}" - -mysql_create_auth_tables() -{ - eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null -} - -mysql_prestart() -{ - if [ ! -d "${mysql_dbdir}/mysql/." ]; then - mysql_create_auth_tables || return 1 - fi - return 0 -} - -mysql_poststart() -{ - local timeout=15 - while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do - timeout=$(( timeout - 1 )) - sleep 1 - done - return 0 -} - -run_rc_command "$1" diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt deleted file mode 100644 index e9f84fa8f474..000000000000 --- a/databases/mysql57-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2021-07-26 19:43:45.021975000 +0200 -+++ CMakeLists.txt 2021-07-26 19:49:38.318138000 +0200 -@@ -715,12 +715,10 @@ IF(UNIX) - ENDIF() - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(testclients) - ADD_SUBDIRECTORY(sql) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - ENDIF() - -@@ -729,8 +727,6 @@ ENDIF() - ADD_SUBDIRECTORY(scripts) - - IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) -@@ -789,6 +785,7 @@ ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES - README -@@ -808,6 +805,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "mysql.info" EXCLUDE - PATTERN "sp-imp-spec.txt" EXCLUDE - ) -+ENDIF() - ENDIF() - - INCLUDE(CPack) diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index 410731e9b81f..000000000000 --- a/databases/mysql57-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200 -+++ client/CMakeLists.txt 2019-11-24 17:42:52.649644000 +0100 -@@ -38,17 +38,17 @@ - - ## Subdirectory with common client code. - ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) - - INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql mysqlclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) - ENDIF(UNIX) -+ENDIF() - - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -69,6 +69,7 @@ - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -81,10 +82,12 @@ - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -101,6 +104,7 @@ - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -116,9 +120,11 @@ - ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) - ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) - TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) - SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) -+ENDIF() - - # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". - IF(WIN32) -@@ -127,11 +133,6 @@ - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake deleted file mode 100644 index f8c13ec7c398..000000000000 --- a/databases/mysql57-server/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-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 64b809e3bd45..000000000000 --- a/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,31 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC -+++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") - ENDIF() -+ 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() - ELSE() - MESSAGE(FATAL_ERROR "Unsupported compiler!") - ENDIF() -@@ -38,4 +52,6 @@ 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-server/files/patch-cmake_plugin.cmake b/databases/mysql57-server/files/patch-cmake_plugin.cmake deleted file mode 100644 index 77b38c747b61..000000000000 --- a/databases/mysql57-server/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-server/files/patch-cmake_ssl.cmake b/databases/mysql57-server/files/patch-cmake_ssl.cmake deleted file mode 100644 index 0e70d693a90d..000000000000 --- a/databases/mysql57-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,54 +0,0 @@ ---- cmake/ssl.cmake.orig 2019-12-06 10:41:47 UTC -+++ cmake/ssl.cmake -@@ -150,22 +150,12 @@ 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) - FIND_LIBRARY(CRYPTO_LIBRARY - NAMES crypto libcrypto libeay32 - HINTS ${OPENSSL_ROOT_DIR}/lib) -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() - - IF(OPENSSL_INCLUDE_DIR) - # Verify version number. Version information looks like: -@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL) - ) - SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") - -- 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() -@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL) - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARY AND - CRYPTO_LIBRARY AND -- OPENSSL_MAJOR_VERSION STREQUAL "1" -+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" -+ ) -+ SET(OPENSSL_FOUND TRUE) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" - ) - SET(OPENSSL_FOUND TRUE) - ELSE() diff --git a/databases/mysql57-server/files/patch-include_CMakeLists.txt b/databases/mysql57-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index cb451ddc6ac4..000000000000 --- a/databases/mysql57-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ include/CMakeLists.txt -@@ -69,14 +69,13 @@ SET(HEADERS - ${HEADERS_GEN_CONFIGURE} - ) - -+IF(FALSE) - INSTALL(FILES - ../libbinlogevents/export/binary_log_types.h - DESTINATION ${INSTALL_INCLUDEDIR} -- COMPONENT Development) --INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) --INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development - PATTERN "*.h" - PATTERN "psi_abi*" EXCLUDE - ) -+ENDIF() - - diff --git a/databases/mysql57-server/files/patch-include_my__compare.h b/databases/mysql57-server/files/patch-include_my__compare.h deleted file mode 100644 index 1a64142bb658..000000000000 --- a/databases/mysql57-server/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-server/files/patch-include_my__thread__os__id.h b/databases/mysql57-server/files/patch-include_my__thread__os__id.h deleted file mode 100644 index 60b111b88a10..000000000000 --- a/databases/mysql57-server/files/patch-include_my__thread__os__id.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC -+++ include/my_thread_os_id.h -@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa - return pthread_getthreadid_np(); - #else - #ifdef HAVE_INTEGER_PTHREAD_SELF -+# ifdef __DragonFly__ -+ return syscall(SYS_lwp_gettid); -+# else - /* Unknown platform, fallback. */ - return pthread_self(); -+# endif - #else - /* Feature not available. */ - return 0; diff --git a/databases/mysql57-server/files/patch-include_my_openssl.h b/databases/mysql57-server/files/patch-include_my_openssl.h deleted file mode 100644 index 43ddb2935038..000000000000 --- a/databases/mysql57-server/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-server/files/patch-include_myisam.h b/databases/mysql57-server/files/patch-include_myisam.h deleted file mode 100644 index 0a4b795e9426..000000000000 --- a/databases/mysql57-server/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-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 2dfbc9d5acdd..000000000000 --- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2019-09-27 09:00:15.000000000 +0200 -+++ libmysql/CMakeLists.txt 2019-11-24 17:45:54.008082000 +0100 -@@ -266,7 +266,7 @@ - ADD_SUBDIRECTORY(authentication_ldap) - - # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) - TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) - - # Visual Studio users need debug static library for debug projects -@@ -312,8 +312,9 @@ - # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} - EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} -- COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries SKIP_INSTALL) - TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) -+IF(FALSE) - IF(UNIX) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -369,6 +370,7 @@ - # to initialize api_calls[] array in api_test.c - # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH() diff --git a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt deleted file mode 100644 index 109d4cc3c4d4..000000000000 --- a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2020-01-16 09:39:09.585385000 +0100 -+++ libmysql/authentication_ldap/CMakeLists.txt 2020-01-16 09:41:59.054985000 +0100 -@@ -47,6 +47,7 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H) - CROAK_AND_RETURN("Required LBER header is missing.") - ENDIF() - -+IF (WITH_AUTHENTICATION_LDAP) - MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client - auth_ldap_sasl_client.cc - log_client.cc -@@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client - CLIENT_ONLY - MODULE_ONLY - MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") -+ENDIF () - - # The plugin may need symbols which are not loaded by the client. - IF(STATIC_SASL_LIBRARY) diff --git a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt b/databases/mysql57-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index bfd6118b5648..000000000000 --- a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ libservices/CMakeLists.txt -@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES - mysql_keyring_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mysql57-server/files/patch-man_CMakeLists.txt b/databases/mysql57-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index b771ae6214f0..000000000000 --- a/databases/mysql57-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ man/CMakeLists.txt -@@ -15,8 +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) diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index ea05679341fa..000000000000 --- a/databases/mysql57-server/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-server/files/patch-mysys__ssl_my__kdf.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.cc deleted file mode 100644 index 1c8527d5c9cc..000000000000 --- a/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- mysys_ssl/my_kdf.cc.orig 2022-11-04 07:47:44 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-server/files/patch-mysys__ssl_my__kdf.h b/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.h deleted file mode 100644 index deb0d98baa4c..000000000000 --- a/databases/mysql57-server/files/patch-mysys__ssl_my__kdf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mysys_ssl/my_kdf.h.orig 2022-11-04 07:47:17 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-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc deleted file mode 100644 index 47fc0dc6b7e5..000000000000 --- a/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC -+++ plugin/password_validation/validate_password.cc -@@ -18,6 +18,8 @@ - #include <mysql/plugin_validate_password.h> - #include <mysql/service_my_plugin_log.h> - #include <mysql/service_mysql_string.h> -+/* solve clash between libc++ bitset::test() and test macro from my_global.h */ -+#undef test - #include <set> - #include <iostream> - #include <fstream> diff --git a/databases/mysql57-server/files/patch-protobuf b/databases/mysql57-server/files/patch-protobuf deleted file mode 100644 index 4326fdb49df2..000000000000 --- a/databases/mysql57-server/files/patch-protobuf +++ /dev/null @@ -1,32 +0,0 @@ -Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0. - -Reference: https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6 - ---- rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig 2021-11-29 20:09:43 UTC -+++ rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc -@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::Err - std::stringstream m_out; - - public: -- virtual void AddError(int line, int column, const string & message) -+ virtual void AddError(int line, int column, const std::string & message) - { - m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; - } - -- virtual void AddWarning(int line, int column, const string & message) -+ virtual void AddWarning(int line, int column, const std::string & message) - { - m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; - } ---- rapid/plugin/x/ngs/src/protocol_decoder.cc.orig 2021-11-29 20:09:43 UTC -+++ rapid/plugin/x/ngs/src/protocol_decoder.cc -@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request) - google::protobuf::io::CodedInputStream stream(reinterpret_cast<const uint8_t*>(request.buffer()), - static_cast<int>(request.buffer_size())); - // variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data -- stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()), -1 /*no warnings*/); -+ stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size())); - // Protobuf limits the number of nested objects when decoding messages - // lets set the value in explicit way (to ensure that is set accordingly with - // out stack size) diff --git a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h b/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h deleted file mode 100644 index 2ebc71bd239a..000000000000 --- a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h +++ /dev/null @@ -1,10 +0,0 @@ ---- rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig 2019-04-13 13:32:15 UTC -+++ rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h -@@ -29,7 +29,6 @@ - #include <google/protobuf/io/tokenizer.h> - #include <google/protobuf/io/zero_copy_stream.h> - #include <google/protobuf/wire_format_lite.h> --#include <google/protobuf/wire_format_lite_inl.h> - #include <google/protobuf/dynamic_message.h> - - #include "mysqlx_connection.pb.h" diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc deleted file mode 100644 index 42d191ec2da4..000000000000 --- a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2021-03-26 06:58:52 UTC -+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc -@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre - donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"), - 0, - NULL, NULL, -+ false, - NULL, - NULL, - NULL, -@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre - NULL, - NULL, - NULL, -- NULL, -- NULL, -+ false, - DEFAULT_THREAD_PRIORITY, - 1, false, true, true); - diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c b/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c deleted file mode 100644 index 44217e5fec58..000000000000 --- a/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c +++ /dev/null @@ -1,37 +0,0 @@ ---- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2020-03-23 17:35:17 UTC -+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c -@@ -232,7 +232,7 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, - const char* tls_version) - { - DH *dh= NULL; --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - /* We support TLS up to 1.2, so explicitly disable TLS 1.3. */ - long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3; - #else -@@ -257,14 +257,14 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, - SSL_OP_NO_TLSv1 | - SSL_OP_NO_TLSv1_1 - | SSL_OP_NO_TLSv1_2 --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - | SSL_OP_NO_TLSv1_3 - #endif /* HAVE_TLSv13 */ - ); - - SSL_CTX_set_options(ssl_ctx, ssl_ctx_options); - --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - /* We do not support TLS 1.3. - Setting empty TLS 1.3 ciphersuites disables them. */ - if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0) -@@ -529,7 +529,7 @@ int xcom_init_ssl(const char *server_key_file, const c - break e.g. ODBC clients (if the client also uses SSL). - */ - --#if defined(HAVE_STATIC_OPENSSL) -+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) - OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); - #else - SSL_library_init(); diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt deleted file mode 100644 index 5cad57c453d6..000000000000 --- a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC -+++ rapid/plugin/x/CMakeLists.txt -@@ -92,13 +92,14 @@ ELSE() - ${CMAKE_SOURCE_DIR}/include #temporary - ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql - ${CMAKE_CURRENT_BINARY_DIR}/generated -- ${SSL_INCLUDE_DIRS} -+ ${BOOST_INCLUDE_DIR} - ) - - INCLUDE_DIRECTORIES(SYSTEM -- ${BOOST_INCLUDE_DIR} - ${PROTOBUF_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIRS} -+ ${SSL_INCLUDE_DIRS} -+ ${ZLIB_INCLUDE_DIR} - ) - - IF(XPLUGIN_NO_LITE_PROTOBUF) diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake deleted file mode 100644 index 52828f00f631..000000000000 --- a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- rapid/plugin/x/mysqlx_configure.cmake.orig 2016-09-14 15:25:26 UTC -+++ rapid/plugin/x/mysqlx_configure.cmake -@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src - CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h ) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h - DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Developement) -+ENDIF() diff --git a/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt deleted file mode 100644 index d968a7daa022..000000000000 --- a/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ rapid/unittest/gunit/xplugin/CMakeLists.txt -@@ -65,7 +65,6 @@ ENDIF() - ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO) - - INCLUDE_DIRECTORIES(SYSTEM -- ${BOOST_INCLUDE_DIR} - ${PROTOBUF_INCLUDE_DIRS} - ${SSL_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIR} -@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM - ) - - INCLUDE_DIRECTORIES( -+ ${BOOST_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/testing/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include - ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs diff --git a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 6766227250a1..000000000000 --- a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 -+++ scripts/CMakeLists.txt 2019-08-01 10:10:16.206052000 -0400 -@@ -326,6 +326,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,14 +413,13 @@ - # 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 -@@ -446,7 +447,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} - ESCAPE_QUOTES @ONLY) - -- IF(INSTALL_PKGCONFIGDIR) -+ IF(FALSE) - MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") - INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} -@@ -452,7 +453,7 @@ - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh -- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) -+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) - ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} - ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) diff --git a/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt b/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt deleted file mode 100644 index b81284dda894..000000000000 --- a/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- scripts/mysqld_safe.sh.orig 2020-06-02 11:05:42 UTC -+++ scripts/mysqld_safe.sh -@@ -359,7 +359,7 @@ mysqld_ld_preload_text() { - # running mysqld. See ld.so for details. - set_malloc_lib() { - # This list is kept intentionally simple. -- malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu" -+ malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib" - malloc_lib="$1" - - # Allow --malloc-lib='' to override other settings -@@ -378,6 +378,7 @@ set_malloc_lib() { - /usr/lib64) ;; - /usr/lib/i386-linux-gnu) ;; - /usr/lib/x86_64-linux-gnu) ;; -+ /usr/local/lib) ;; - *) - log_error "--malloc-lib must be located in one of the directories: $malloc_dirs" - exit 1 diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt deleted file mode 100644 index e29d4fc10a8e..000000000000 --- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/CMakeLists.txt.orig 2021-07-26 19:53:15.028262000 +0200 -+++ sql/CMakeLists.txt 2021-07-26 19:55:42.226384000 +0200 -@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/regex - ${SSL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/sql -+ ${CMAKE_BINARY_DIR}/include -+ ${CMAKE_BINARY_DIR} - ) - - SET(CONF_SOURCES diff --git a/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc b/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc deleted file mode 100644 index 567a7da1628c..000000000000 --- a/databases/mysql57-server/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-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc deleted file mode 100644 index 2b5e80a44574..000000000000 --- a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- sql/conn_handler/socket_connection.cc.orig 2017-03-18 07:45:14 UTC -+++ sql/conn_handler/socket_connection.cc -@@ -942,22 +942,25 @@ Channel_info* Mysqld_socket_listener::li - signal(SIGCHLD, SIG_DFL); - request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, - mysql_socket_getfd(connect_sock), NULL); -- fromhost(&req); -+ void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; -+ my_fromhost(&req); - -- if (!hosts_access(&req)) -+ int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; -+ if (!my_hosts_access(&req)) - { - /* - This may be stupid but refuse() includes an exit(0) - which we surely don't want... - clean_exit() - same stupid thing ... - */ -+ char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; - syslog(LOG_AUTH | m_deny_severity, -- "refused connect from %s", eval_client(&req)); -+ "refused connect from %s", my_eval_client(&req)); - - #ifdef HAVE_LIBWRAP_PROTOTYPES - // Some distros have patched tcpd.h to have proper prototypes - if (req.sink) -- (req.sink)(req.fd); -+ ((void (*)(int)) (req.sink))(req.fd); - #else - // Some distros have not patched tcpd.h - if (req.sink) diff --git a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc deleted file mode 100644 index ca63b9f31439..000000000000 --- a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC -+++ sql/locks/shared_spin_lock.cc -@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or - #if defined(__APPLE__) - my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); - #else -- my_atomic_store64(&this->m_exclusive_owner, self); -+ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); - #endif - return (*this); - } diff --git a/databases/mysql57-server/files/patch-sql_mysqld.cc b/databases/mysql57-server/files/patch-sql_mysqld.cc deleted file mode 100644 index 75a57ce8688a..000000000000 --- a/databases/mysql57-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig 2019-09-27 09:00:15.000000000 +0200 -+++ sql/mysqld.cc 2019-11-24 17:47:52.395539000 +0100 -@@ -3419,7 +3419,7 @@ - static int init_ssl() - { - #ifdef HAVE_OPENSSL --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_malloc_init(); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - OPENSSL_malloc_init(); diff --git a/databases/mysql57-server/files/patch-sql_sys__vars.cc b/databases/mysql57-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index e21d62430970..000000000000 --- a/databases/mysql57-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC -+++ sql/sys_vars.cc -@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulong Sys_join_buffer_size( - "join_buffer_size", -@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo - "Number of seconds to wait for a block to be written to a connection " - "before aborting the write", - SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_plugin Sys_default_storage_engine( diff --git a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc deleted file mode 100644 index 8d2627e75010..000000000000 --- a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/innobase/fsp/fsp0fsp.cc.orig 2021-03-26 06:58:52 UTC -+++ storage/innobase/fsp/fsp0fsp.cc -@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info( - - if (elen == MY_AES_BAD_DATA) { - my_free(master_key); -- return(NULL); -+ return(false); - } - - /* Check checksum bytes. */ diff --git a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h deleted file mode 100644 index 8abbfcb04a31..000000000000 --- a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC -+++ storage/innobase/include/srv0mon.h -@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang - /* Required for FreeBSD so that INT64_MAX is defined. */ - #define __STDC_LIMIT_MACROS - #endif /* __STDC_LIMIT_MACROS */ -+#ifdef __DragonFly__ -+/* The hack above doen't work for dragonfly, stdint.h already imported */ -+#include <machine/int_limits.h> -+#endif - - #include <stdint.h> - diff --git a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 282cffdbcbc5..000000000000 --- a/databases/mysql57-server/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-server/files/patch-support-files_CMakeLists.txt b/databases/mysql57-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 1d1999212ed5..000000000000 --- a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ support-files/CMakeLists.txt -@@ -69,7 +69,9 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() - -+IF(FALSE) - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ENDIF() - - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) diff --git a/databases/mysql57-server/files/pkg-message.in b/databases/mysql57-server/files/pkg-message.in deleted file mode 100644 index c4a6facbf30c..000000000000 --- a/databases/mysql57-server/files/pkg-message.in +++ /dev/null @@ -1,19 +0,0 @@ -[ -{ type: install - message: <<EOM -Initial password for first time use of MySQL is saved in $HOME/.mysql_secret -ie. when you want to use "mysql -u root -p" first you should see password -in /root/.mysql_secret - -MySQL57 has a default %%ETCDIR%%/my.cnf, -remember to replace it with your own -or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf. -EOM -} -{ type: upgrade - message: <<EOM -Remember to run mysql_upgrade the first time you start the MySQL server -after an upgrade from an earlier version. -EOM -} -] |