diff options
Diffstat (limited to 'databases/percona57-server/files')
35 files changed, 0 insertions, 1039 deletions
diff --git a/databases/percona57-server/files/extra-patch-config.h.cmake b/databases/percona57-server/files/extra-patch-config.h.cmake deleted file mode 100644 index 4ea465832fb4..000000000000 --- a/databases/percona57-server/files/extra-patch-config.h.cmake +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile -+++ Makefile -@@ -95,8 +95,8 @@ post-patch: - - .include <bsd.port.pre.mk> - --.if ${ARCH} == "arm" --BROKEN= Does not compile on arm -+.if ${ARCH} == "armv6" -+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake - .endif - - .include <bsd.port.post.mk> - ---- /dev/null -+++ files/extra-patch-config.h.cmake -@@ -0,0 +1,12 @@ -+--- 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/percona57-server/files/extrapatch-tokudb b/databases/percona57-server/files/extrapatch-tokudb deleted file mode 100644 index bddd008e4ea5..000000000000 --- a/databases/percona57-server/files/extrapatch-tokudb +++ /dev/null @@ -1,95 +0,0 @@ ---- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200 -+++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200 -@@ -40,8 +40,8 @@ - ENDIF () - - # check platform support, no 32 bit --IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- MESSAGE (${TOKUDB_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB") -+IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") -+ MESSAGE (${TOKUDB_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB") - RETURN () - ENDIF () - -@@ -118,5 +118,5 @@ - tokudb_thread.cc) - MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) --SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") --SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ") ---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig 2016-03-03 15:31:53.000000000 +0200 -+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt 2016-03-10 11:13:23.772664272 +0200 -@@ -69,7 +69,7 @@ - endif () - endfunction(add_space_separated_property) - --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG") - if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") - endif () ---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig 2016-03-03 15:31:53.000000000 +0200 -+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc 2016-03-08 10:40:07.000000000 +0200 -@@ -85,7 +85,7 @@ - if (oflag & O_CREAT) { - va_list ap; - va_start(ap, oflag); -- mode_t mode = va_arg(ap, mode_t); -+ mode_t mode = va_arg(ap, int); - va_end(ap); - the_manager.lock_file_op(); - fd = call_real_open(file, oflag, mode); ---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig 2016-03-03 15:31:53.000000000 +0200 -+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc 2016-03-08 10:37:19.000000000 +0200 -@@ -36,7 +36,7 @@ - - #include <string.h> - #include <pthread.h> --#include <malloc.h> -+#include <stdlib.h> - #include <stdio.h> - - #include "source_file.h" ---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig 2016-03-03 15:31:53.000000000 +0200 -+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc 2016-03-08 10:38:58.000000000 +0200 -@@ -104,7 +104,7 @@ - if (oflag & O_CREAT) { - va_list op; - va_start(op, oflag); -- mode_t mode = va_arg(op, mode_t); -+ mode_t mode = va_arg(op, int); - va_end(op); - return real_open(file, oflag, mode); - } else { ---- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-06-30 13:35:08.000000000 +0200 -+++ storage/tokudb/PerconaFT/CMakeLists.txt 2016-07-29 23:07:37.871068000 +0200 -@@ -82,7 +82,7 @@ - - install( - FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS -- DESTINATION . -+ DESTINATION ${INSTALL_DOCDIR} - COMPONENT tokukv_misc - ) - ---- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-07-29 23:30:26.557847000 +0200 -+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-07-29 23:30:32.695950000 +0200 -@@ -1,6 +1,6 @@ - set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "") - --file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh - out=$1; shift - exec \"$@\" >$out") - -@@ -8,7 +8,7 @@ - set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h" -- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb> -+ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb> - DEPENDS make_tdb) - add_custom_target(install_tdb_h DEPENDS - "${CMAKE_CURRENT_BINARY_DIR}/db.h") diff --git a/databases/percona57-server/files/mysql-server.in b/databases/percona57-server/files/mysql-server.in deleted file mode 100644 index b482eeb2a008..000000000000 --- a/databases/percona57-server/files/mysql-server.in +++ /dev/null @@ -1,84 +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. -# Default to "${mysql_confdir}/my.cnf". -# 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_dbdir}/my.cnf" ]; then -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} -else -: ${mysql_optfile="${mysql_confdir}/my.cnf"} -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 --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args}" -procname="%%PREFIX%%/libexec/mysqld" -start_precmd="${name}_prestart" -start_postcmd="${name}_poststart" -mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --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 [ -f "${mysql_dbdir}/my.cnf" ]; then - echo "" - echo "Please keep in mind that the default location for my.cnf has changed" - echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". " - echo "Please merge your existing my.cnf with the new default and move" - echo "it to \"%%ETCDIR%%/my.cnf\"." - echo "If you do not want to move your my.cnf to the new location then" - echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"." - echo "" - fi - - 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/percona57-server/files/patch-CMakeLists.txt b/databases/percona57-server/files/patch-CMakeLists.txt deleted file mode 100644 index 47c8a57168cb..000000000000 --- a/databases/percona57-server/files/patch-CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ CMakeLists.txt -@@ -621,12 +621,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() - -@@ -635,8 +633,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) -@@ -692,6 +688,7 @@ ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES - README -@@ -714,6 +711,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/percona57-server/files/patch-client_CMakeLists.txt b/databases/percona57-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index e89ab375d99c..000000000000 --- a/databases/percona57-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ ---- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ client/CMakeLists.txt -@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil - - ## Subdirectory with common client code. - ADD_SUBDIRECTORY(base) --## Subdirectory for mysqlpump code. --ADD_SUBDIRECTORY(dump) - - ## We will need libeay32.dll and ssleay32.dll when running client executables. - COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) - 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 perconaserverclient) - IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) - ENDIF(UNIX) -+ENDIF() - - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) - -@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( - mysqlbinlog.cc -@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas - - MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient) -+ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) - TARGET_LINK_LIBRARIES(mysql_secure_installation perconaserverclient) -+ENDIF() - - IF(UNIX AND NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_install_db -@@ -112,9 +118,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) - 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) -@@ -123,11 +131,6 @@ ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( - mysql_plugin -- mysqlcheck -- mysqldump -- mysqlimport -- mysqlshow -- mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake deleted file mode 100644 index 4eca5cfb5df9..000000000000 --- a/databases/percona57-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 -@@ -50,7 +50,7 @@ IF(UNIX) - IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") - IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) # gcc-9 or older -- SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}") -+ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}") - ENDIF() - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) -@@ -77,7 +77,7 @@ IF(UNIX) - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") - IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) # gcc-9 or older -- SET(COMMON_CXX_FLAGS "-fabi-version=2 ${COMMON_CXX_FLAGS}") -+ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS}") - ENDIF() - # GCC 6 has C++14 as default, set it explicitly to the old default. - EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion diff --git a/databases/percona57-server/files/patch-cmake_os_DragonFly.cmake b/databases/percona57-server/files/patch-cmake_os_DragonFly.cmake deleted file mode 100644 index 83c154ee3bcf..000000000000 --- a/databases/percona57-server/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/percona57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 9e9043f341ae..000000000000 --- a/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC -+++ cmake/os/FreeBSD.cmake -@@ -37,8 +37,20 @@ 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() - diff --git a/databases/percona57-server/files/patch-cmake_plugin.cmake b/databases/percona57-server/files/patch-cmake_plugin.cmake deleted file mode 100644 index a52ef25c7b24..000000000000 --- a/databases/percona57-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 -@@ -278,13 +278,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/percona57-server/files/patch-cmake_ssl.cmake b/databases/percona57-server/files/patch-cmake_ssl.cmake deleted file mode 100644 index 7a73266ce4c8..000000000000 --- a/databases/percona57-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,23 +0,0 @@ ---- cmake/ssl.cmake.orig 2022-08-05 18:25:13 UTC -+++ cmake/ssl.cmake -@@ -246,7 +246,8 @@ MACRO (MYSQL_CHECK_SSL) - ) - SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") - -- IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0") -+ 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) -@@ -258,8 +259,7 @@ MACRO (MYSQL_CHECK_SSL) - ENDIF() - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARY AND -- CRYPTO_LIBRARY AND -- (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3") -+ CRYPTO_LIBRARY - ) - SET(OPENSSL_FOUND TRUE) - ELSE() - diff --git a/databases/percona57-server/files/patch-configure.cmake b/databases/percona57-server/files/patch-configure.cmake deleted file mode 100644 index 81ab9495aac3..000000000000 --- a/databases/percona57-server/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/percona57-server/files/patch-include_CMakeLists.txt b/databases/percona57-server/files/patch-include_CMakeLists.txt deleted file mode 100644 index c047677002a0..000000000000 --- a/databases/percona57-server/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- include/CMakeLists.txt.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-include_my__compare.h b/databases/percona57-server/files/patch-include_my__compare.h deleted file mode 100644 index 608e15dd8751..000000000000 --- a/databases/percona57-server/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-include_my__openssl.h b/databases/percona57-server/files/patch-include_my__openssl.h deleted file mode 100644 index 43ddb2935038..000000000000 --- a/databases/percona57-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/percona57-server/files/patch-include_myisam.h b/databases/percona57-server/files/patch-include_myisam.h deleted file mode 100644 index 96bc58628416..000000000000 --- a/databases/percona57-server/files/patch-include_myisam.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/myisam.h.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-include_mysql.h b/databases/percona57-server/files/patch-include_mysql.h deleted file mode 100644 index 906bdb42c4fb..000000000000 --- a/databases/percona57-server/files/patch-include_mysql.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/mysql.h.orig 2023-02-28 17:21:35 UTC -+++ include/mysql.h -@@ -46,7 +46,10 @@ extern "C" { - #ifndef MYSQL_ABI_CHECK - #include <sys/types.h> - #endif -+#ifndef HAVE_TYPE_MY_BOOL -+#define HAVE_TYPE_MY_BOOL - typedef char my_bool; -+#endif - #if !defined(_WIN32) - #define STDCALL - #else diff --git a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index d66517c9ed59..000000000000 --- a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC -+++ libmysql/CMakeLists.txt -@@ -235,7 +235,7 @@ - ADD_SUBDIRECTORY(authentication_ldap) - - # Merge several convenience libraries into one big perconaserverclient --MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) - TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK}) - - # Visual Studio users need debug static library for debug projects -@@ -271,7 +271,8 @@ - # 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 -@@ -327,6 +328,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/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt deleted file mode 100644 index 805875fb1787..000000000000 --- a/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2019-02-18 09:11:31.000000000 +0300 -+++ libmysql/authentication_ldap/CMakeLists.txt -@@ -47,7 +47,8 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H) - CROAK_AND_RETURN("Required LBER header is missing.") - ENDIF() - --MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -+IF (WITH_AUTHENTICATION_LDAP) -+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client - auth_ldap_sasl_client.cc - log_client.cc - LINK_LIBRARIES -@@ -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/percona57-server/files/patch-libservices_CMakeLists.txt b/databases/percona57-server/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index c9190039e613..000000000000 --- a/databases/percona57-server/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-man_CMakeLists.txt b/databases/percona57-server/files/patch-man_CMakeLists.txt deleted file mode 100644 index 0d3487cbefe6..000000000000 --- a/databases/percona57-server/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ man/CMakeLists.txt -@@ -14,9 +14,7 @@ - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - # 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 MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) - FILE(GLOB MAN8_FILES *.8) - FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc deleted file mode 100644 index 453c89a71c12..000000000000 --- a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc +++ /dev/null @@ -1,39 +0,0 @@ ---- mysys_ssl/my_crypt.cc.orig 2019-05-16 05:06:00 UTC -+++ mysys_ssl/my_crypt.cc -@@ -26,7 +26,7 @@ - #include <boost/move/unique_ptr.hpp> - #include <boost/core/noncopyable.hpp> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) - #define RAND_OpenSSL() RAND_SSLeay() - #endif -@@ -80,7 +80,7 @@ class MyEncryptionCTX : private boost::noncopyable (pr - - MyEncryptionCTX::MyEncryptionCTX() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - ctx= new EVP_CIPHER_CTX(); - EVP_CIPHER_CTX_init(ctx); - #else -@@ -91,7 +91,8 @@ MyEncryptionCTX::MyEncryptionCTX() - MyEncryptionCTX::~MyEncryptionCTX() - { - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) - EVP_CIPHER_CTX_cleanup(ctx); - delete ctx; - ERR_remove_thread_state(0); -@@ -340,7 +341,7 @@ int my_aes_crypt(const my_aes_mode mode, int flags, - res2= my_aes_crypt_finish(ctx, dst + d1, &d2); - if (res1 || res2) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* in case of failure clear error queue */ - ERR_remove_thread_state(0); - #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__default.cc b/databases/percona57-server/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index 83a127b9602c..000000000000 --- a/databases/percona57-server/files/patch-mysys__ssl_my__default.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- mysys_ssl/my_default.cc.orig 2016-11-27 19:44:54 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; - -@@ -1416,7 +1416,10 @@ static const char **init_default_directo - - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) -+ { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); -+ } - #endif /* DEFAULT_SYSCONFDIR */ - - #endif -@@ -1488,7 +1491,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/percona57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c b/databases/percona57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c deleted file mode 100644 index f4cadfc93dff..000000000000 --- a/databases/percona57-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 -@@ -230,7 +230,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 -@@ -255,14 +255,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) -@@ -527,7 +527,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/percona57-server/files/patch-scripts_CMakeLists.txt b/databases/percona57-server/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 27ef3bb01f37..000000000000 --- a/databases/percona57-server/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 -+++ scripts/CMakeLists.txt 2017-12-31 14:59:46.762799000 +0000 -@@ -332,6 +332,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() -@@ -419,7 +421,6 @@ - - IF(WITH_SYSTEMD) - SET(BIN_SCRIPTS -- mysql_config - mysqldumpslow - ps_tokudb_admin - ps_mysqld_helper -@@ -427,7 +428,6 @@ - ) - ELSE() - SET(BIN_SCRIPTS -- mysql_config - mysqldumpslow - mysqld_multi - mysqld_safe -@@ -443,7 +443,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} -@@ -464,7 +464,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/percona57-server/files/patch-sql_auth_sha2__password__common.cc b/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc deleted file mode 100644 index 1d2486c48d20..000000000000 --- a/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- sql/auth/sha2_password_common.cc.orig 2019-05-16 05:06:00 UTC -+++ sql/auth/sha2_password_common.cc -@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig - 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 < 0x02070000fL) - EVP_MD_CTX_cleanup(md_context); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - EVP_MD_CTX_reset(md_context); diff --git a/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc deleted file mode 100644 index ca63b9f31439..000000000000 --- a/databases/percona57-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/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc deleted file mode 100644 index c967c9ea01b1..000000000000 --- a/databases/percona57-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/mysqld.cc.orig 2022-08-05 18:25:13 UTC -+++ sql/mysqld.cc -@@ -1531,6 +1531,16 @@ static void clean_up_mutexes() - ****************************************************************************/ - - /* Initialise proxy protocol. */ -+ -+/* At least OpenBSD and NexentaCore do not -+* define s6_addr32 for user land settings. -+*/ -+#if !defined s6_addr32 && defined __sun__ -+# define s6_addr32 _S6_un._S6_u32 -+#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ ) -+# define s6_addr32 __u6_addr.__u6_addr32 -+#endif /* !defined s6_addr32 */ -+ - static void set_proxy() - { - const char *p; -@@ -3706,6 +3716,7 @@ static int init_ssl() - static int init_ssl() - { - #ifdef HAVE_OPENSSL -+#ifndef LIBRESSL_VERSION_NUMBER - - #if OPENSSL_VERSION_NUMBER >= 0x30000000L - int fips_mode= EVP_default_properties_is_fips_enabled(NULL) && -@@ -3726,7 +3737,9 @@ static int init_ssl() - FIPS_mode_set(0); - #endif - } --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#endif -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_malloc_init(); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - OPENSSL_malloc_init(); diff --git a/databases/percona57-server/files/patch-sql_sys__vars.cc b/databases/percona57-server/files/patch-sql_sys__vars.cc deleted file mode 100644 index 1d1cb73e49a2..000000000000 --- a/databases/percona57-server/files/patch-sql_sys__vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- sql/sys_vars.cc.orig 2016-11-27 19:44:54 UTC -+++ sql/sys_vars.cc -@@ -1804,7 +1804,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", -@@ -2696,7 +2696,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)); - -@@ -2720,7 +2720,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)); - -@@ -4406,7 +4406,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/percona57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h deleted file mode 100644 index e023ef0c7708..000000000000 --- a/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/innobase/include/srv0mon.h.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c deleted file mode 100644 index 80b7192940ca..000000000000 --- a/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt deleted file mode 100644 index 1d6bfda7483e..000000000000 --- a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ ---- storage/rocksdb/CMakeLists.txt.orig 2021-07-30 02:26:13.135102000 +0300 -+++ storage/rocksdb/CMakeLists.txt 2021-07-30 02:29:42.990461000 +0300 -@@ -23,8 +23,8 @@ - ENDIF () - - # check platform support, no 32 bit --IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- MESSAGE (${MYROCKS_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks") -+IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") -+ MESSAGE (${MYROCKS_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks") - RETURN () - ENDIF () - -@@ -166,37 +166,6 @@ - ${LZ4_INCLUDE_DIR} - ) - --# add bundled compression code --SET(ZSTD_SOURCES -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress_literals.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress_sequences.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_double_fast.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_fast.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_lazy.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_ldm.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_opt.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/hist.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress_block.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_ddict.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/cover.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/fastcover.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c -- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c --) -- - SET(ROCKSDB_SOURCES - ${ROCKSDB_SOURCES} - ${ZSTD_SOURCES} -@@ -230,7 +199,7 @@ - SET(rocksdb_static_libs ${rocksdb_static_libs} "${ROCKSDB_LIB_PATH}/${ROCKSDB_LIB_NAME}") - ENDIF() - --SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl") -+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl -llz4 -lzstd") - - MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY - LINK_LIBRARIES ${rocksdb_static_libs} diff --git a/databases/percona57-server/files/patch-support-files_CMakeLists.txt b/databases/percona57-server/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 87658305530b..000000000000 --- a/databases/percona57-server/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2016-11-27 19:44:54 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/percona57-server/files/patch-vio_viosocket.c b/databases/percona57-server/files/patch-vio_viosocket.c deleted file mode 100644 index c03e19e9e86c..000000000000 --- a/databases/percona57-server/files/patch-vio_viosocket.c +++ /dev/null @@ -1,13 +0,0 @@ ---- vio/viosocket.c.orig 2016-11-27 19:44:54 UTC -+++ vio/viosocket.c -@@ -45,6 +45,10 @@ - static void (*before_io_wait)(void)= 0; - static void (*after_io_wait)(void)= 0; - -+#ifdef __FreeBSD__ -+#define s6_addr32 __u6_addr.__u6_addr32 -+#endif -+ - /* Wait callback macros (both performance schema and threadpool */ - #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \ - do \ diff --git a/databases/percona57-server/files/patch-vio_viossl.c b/databases/percona57-server/files/patch-vio_viossl.c deleted file mode 100644 index 39bcb6b765b5..000000000000 --- a/databases/percona57-server/files/patch-vio_viossl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- vio/viossl.c.orig 2020-05-13 20:59:55 UTC -+++ vio/viossl.c -@@ -396,7 +396,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, - #if !defined(DBUG_OFF) - { - STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; -- ssl_comp_methods = SSL_COMP_get_compression_methods(); -+ ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods(); - n= sk_SSL_COMP_num(ssl_comp_methods); - DBUG_PRINT("info", ("Available compression methods:\n")); - if (n == 0) -@@ -405,7 +405,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, - for (j = 0; j < n; j++) - { - SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DBUG_PRINT("info", (" %d: %s\n", c->id, c->name)); - #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ - DBUG_PRINT("info", (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c))); diff --git a/databases/percona57-server/files/patch-vio_viosslfactories.c b/databases/percona57-server/files/patch-vio_viosslfactories.c deleted file mode 100644 index b37d41d49108..000000000000 --- a/databases/percona57-server/files/patch-vio_viosslfactories.c +++ /dev/null @@ -1,45 +0,0 @@ ---- vio/viosslfactories.c.orig 2020-05-13 20:59:55 UTC -+++ vio/viosslfactories.c -@@ -126,7 +126,7 @@ static DH *get_dh2048(void) - { - BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); - BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - dh->p= p; - dh->g= g; - if (! dh->p || ! dh->g) -@@ -500,7 +500,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - struct st_VioSSLFd *ssl_fd; - /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */ - long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 --#ifdef HAVE_TLSv13 -+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER) - | SSL_OP_NO_TLSv1_3 - #endif /* HAVE_TLSv13 */ - ; -@@ -536,7 +536,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - 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_OP_NO_TICKET -@@ -557,6 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - DBUG_RETURN(0); - } - -+#ifndef LIBRESSL_VERSION_NUMBER - SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options); - - #ifdef HAVE_TLSv13 -@@ -573,6 +574,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi - DBUG_RETURN(0); - } - #endif /* HAVE_TLSv13 */ -+#endif /* LIBRESSL_VERSION_NUMBER */ - - /* - We explicitly prohibit weak ciphers. |