git: 438a30ec44e2 - main - cleanup: Remove expired ports:
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Oct 2023 09:30:35 UTC
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=438a30ec44e27e6c183b085f4a5c6479e1bcbbad commit 438a30ec44e27e6c183b085f4a5c6479e1bcbbad Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-10-01 09:30:03 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-10-01 09:30:03 +0000 cleanup: Remove expired ports: 2023-10-01 databases/percona57-pam-for-mysql: Upstream EOL reaches on 2023-10-01 2023-10-01 databases/percona57-server: Upstream EOL reaches on 2023-10-01 2023-10-01 databases/percona57-client: Upstream EOL reaches on 2023-10-01 --- MOVED | 3 + databases/Makefile | 3 - databases/percona57-client/Makefile | 51 ------ .../percona57-client/files/patch-CMakeLists.txt | 36 ---- .../files/patch-client_CMakeLists.txt | 44 ----- .../percona57-client/files/patch-client__mysql.cc | 40 ----- ...e_build__configurations_compiler__options.cmake | 20 --- .../files/patch-cmake_os_DragonFly.cmake | 27 --- .../files/patch-cmake_os_FreeBSD.cmake | 25 --- .../files/patch-cmake_plugin.cmake | 25 --- .../percona57-client/files/patch-cmake_ssl.cmake | 23 --- .../percona57-client/files/patch-configure.cmake | 15 -- .../files/patch-extra_CMakeLists.txt | 33 ---- .../files/patch-include_CMakeLists.txt | 10 -- .../files/patch-include_my__compare.h | 11 -- .../files/patch-include_my__openssl.h | 11 -- .../percona57-client/files/patch-include_myisam.h | 11 -- .../percona57-client/files/patch-include_mysql.h | 13 -- .../files/patch-man_CMakeLists.txt | 13 -- .../files/patch-mysys__ssl_my__crypt.cc | 39 ----- .../files/patch-mysys__ssl_my__default.cc | 31 ---- .../files/patch-mysys_mf__iocache2.c | 10 -- .../files/patch-scripts_CMakeLists.txt | 72 -------- .../files/patch-sql_auth_sha2__password__common.cc | 12 -- .../files/patch-support-files_CMakeLists.txt | 27 --- .../percona57-client/files/patch-vio_viosocket.c | 13 -- .../percona57-client/files/patch-vio_viossl.c | 20 --- .../files/patch-vio_viosslfactories.c | 45 ----- databases/percona57-client/pkg-plist | 144 ---------------- databases/percona57-pam-for-mysql/Makefile | 31 ---- databases/percona57-pam-for-mysql/files/pam.conf | 12 -- ...e_build__configurations_compiler__options.cmake | 20 --- .../files/patch-cmake_os_DragonFly.cmake | 27 --- .../files/patch-cmake_os_FreeBSD.cmake | 25 --- databases/percona57-pam-for-mysql/pkg-descr | 1 - databases/percona57-pam-for-mysql/pkg-message | 16 -- databases/percona57-pam-for-mysql/pkg-plist | 4 - databases/percona57-server/Makefile | 188 --------------------- databases/percona57-server/distinfo | 5 - .../files/extra-patch-config.h.cmake | 29 ---- databases/percona57-server/files/extrapatch-tokudb | 95 ----------- databases/percona57-server/files/mysql-server.in | 84 --------- .../percona57-server/files/patch-CMakeLists.txt | 40 ----- .../files/patch-client_CMakeLists.txt | 83 --------- ...e_build__configurations_compiler__options.cmake | 20 --- .../files/patch-cmake_os_DragonFly.cmake | 27 --- .../files/patch-cmake_os_FreeBSD.cmake | 25 --- .../files/patch-cmake_plugin.cmake | 25 --- .../percona57-server/files/patch-cmake_ssl.cmake | 23 --- .../percona57-server/files/patch-configure.cmake | 15 -- .../files/patch-include_CMakeLists.txt | 19 --- .../files/patch-include_my__compare.h | 11 -- .../files/patch-include_my__openssl.h | 11 -- .../percona57-server/files/patch-include_myisam.h | 11 -- .../percona57-server/files/patch-include_mysql.h | 13 -- .../files/patch-libmysql_CMakeLists.txt | 29 ---- ...ch-libmysql_authentication__ldap_CMakeLists.txt | 20 --- .../files/patch-libservices_CMakeLists.txt | 9 - .../files/patch-man_CMakeLists.txt | 13 -- .../files/patch-mysys__ssl_my__crypt.cc | 39 ----- .../files/patch-mysys__ssl_my__default.cc | 31 ---- ...gcs_src_bindings_xcom_xcom_xcom_ssl_transport.c | 37 ---- .../files/patch-scripts_CMakeLists.txt | 45 ----- .../files/patch-sql_auth_sha2__password__common.cc | 12 -- .../files/patch-sql_locks_shared__spin__lock.cc | 11 -- .../percona57-server/files/patch-sql_mysqld.cc | 38 ----- .../percona57-server/files/patch-sql_sys__vars.cc | 38 ----- .../files/patch-storage_innobase_include_srv0mon.h | 13 -- .../files/patch-storage_myisam_mi__dynrec.c | 23 --- .../files/patch-storage_rocksdb_CMakeLists.txt | 60 ------- .../files/patch-support-files_CMakeLists.txt | 12 -- .../percona57-server/files/patch-vio_viosocket.c | 13 -- .../percona57-server/files/patch-vio_viossl.c | 20 --- .../files/patch-vio_viosslfactories.c | 45 ----- databases/percona57-server/pkg-descr | 2 - databases/percona57-server/pkg-message | 15 -- databases/percona57-server/pkg-plist | 187 -------------------- 77 files changed, 3 insertions(+), 2396 deletions(-) diff --git a/MOVED b/MOVED index 7eb647fb81af..322b2dd8bd52 100644 --- a/MOVED +++ b/MOVED @@ -7923,3 +7923,6 @@ net-p2p/transmission-gtk|net-p2p/transmission-components@gtk|2023-09-30|Moved fo net-p2p/transmission-qt|net-p2p/transmission-components@qt|2023-09-30|Moved for metaport net-p2p/transmission-utils|net-p2p/transmission-components@utils|2023-09-30|Moved for metaport databases/percona-pam-for-mysql||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01 +databases/percona57-pam-for-mysql||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01 +databases/percona57-server||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01 +databases/percona57-client||2023-10-01|Has expired: Upstream EOL reaches on 2023-10-01 diff --git a/databases/Makefile b/databases/Makefile index 4c116f92229b..59f7d3ab59ad 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -543,9 +543,6 @@ SUBDIR += pecl-redis SUBDIR += pecl-rrd SUBDIR += percona-toolkit - SUBDIR += percona57-client - SUBDIR += percona57-pam-for-mysql - SUBDIR += percona57-server SUBDIR += pg-gvm SUBDIR += pg.el SUBDIR += pgFormatter diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile deleted file mode 100644 index c7491369167f..000000000000 --- a/databases/percona57-client/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -PORTNAME= percona -PORTREVISION?= 0 -PKGNAMESUFFIX= 57-client - -COMMENT= Multithreaded SQL database (client) - -LICENSE= GPLv2+ - -MASTERDIR= ${.CURDIR}/../percona57-server - -OPTIONS_EXCLUDE=TOKUDB - -PKGMESSAGE= ${.CURDIR}/pkg-message -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= mysql*-client \ - mariadb*-client \ - percona5[0-68-9]-client - -CMAKE_ARGS+= -DWITHOUT_SERVER=1 - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -MANPAGES= comp_err.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ - mysql_waitpid.1 mysqladmin.1 mysqlbinlog.1 \ - mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 - -CLIENT_ONLY= yes - -OPTIONS_GROUP+= PLUGINS -PLUGINS_DESC= Default Client Plugins -OPTIONS_GROUP_PLUGINS= SASLCLIENT -SASLCLIENT_DESC= SASL client plugin module -SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP -SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASLCLIENT_USES= ldap -OPTIONS_DEFAULT+= SASLCLIENT -OPTIONS_SUB= yes - -# Percona renamed the libraries, until we decide how to deal with it create some symlinks -# to prevent breaking installed ports. -post-install: - ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so - ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.20 - ${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a - ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so - ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 - ${LN} -s perconaserverclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mysqlclient.pc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/percona57-client/files/patch-CMakeLists.txt b/databases/percona57-client/files/patch-CMakeLists.txt deleted file mode 100644 index 86b3aeb04103..000000000000 --- a/databases/percona57-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ CMakeLists.txt -@@ -613,8 +613,8 @@ ENDIF() - - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(client) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) -+ADD_SUBDIRECTORY(support-files) - - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -684,14 +684,13 @@ ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() - ADD_SUBDIRECTORY(packaging/WiX) --ADD_SUBDIRECTORY(packaging/solaris) - - IF(UNIX) -- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() - # - # RPM installs documentation directly from the source tree - # -+IF(FALSE) - IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -714,6 +713,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE - ) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/percona57-client/files/patch-client_CMakeLists.txt b/databases/percona57-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index e61b2322f95c..000000000000 --- a/databases/percona57-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ ---- client/CMakeLists.txt.orig 2018-02-16 07:57:38 UTC -+++ client/CMakeLists.txt -@@ -48,6 +48,7 @@ IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) - ENDIF(UNIX) - -+IF(FALSE) - IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade - upgrade/program.cc -@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS( - TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) - ENDIF() -+ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) - ADD_DEPENDENCIES(mysqltest GenError) -+ENDIF() - - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) -@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - ADD_COMPILE_FLAGS( -@@ -124,7 +130,6 @@ IF(WIN32) - ENDIF(WIN32) - - SET_TARGET_PROPERTIES ( -- mysql_plugin - mysqlcheck - mysqldump - mysqlimport diff --git a/databases/percona57-client/files/patch-client__mysql.cc b/databases/percona57-client/files/patch-client__mysql.cc deleted file mode 100644 index cfa890924934..000000000000 --- a/databases/percona57-client/files/patch-client__mysql.cc +++ /dev/null @@ -1,40 +0,0 @@ ---- client/mysql.cc.orig 2017-04-01 14:33:18 UTC -+++ client/mysql.cc -@@ -1903,11 +1903,11 @@ static void usage(int version) - #endif - - #ifdef HAVE_READLINE -- printf("%s Ver %s Distrib %s, for %s (%s) using %s %s\n", -+ printf("%s Ver %s Distrib %s Percona, for %s (%s) using %s %s\n", - my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE, - readline, rl_library_version); - #else -- printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, -+ printf("%s Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER, - MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); - #endif - -y@@ -2858,15 +2858,18 @@ static void initialize_readline (char *name) - - /* Tell the completer that we want a crack first. */ - #if defined(USE_NEW_XLINE_INTERFACE) -- rl_attempted_completion_function= &new_mysql_completion; -- rl_completion_entry_function= &no_completion; -- -+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; -+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; -+/* - rl_add_defun("magic-space", &fake_magic_space, -1); -+*/ - #elif defined(USE_LIBEDIT_INTERFACE) - setlocale(LC_ALL,""); /* so as libedit use isprint */ -- rl_attempted_completion_function= &new_mysql_completion; -- rl_completion_entry_function= &no_completion; -+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; -+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; -+/* - rl_add_defun("magic-space", &fake_magic_space, -1); -+*/ - #else - rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; - rl_completion_entry_function= &no_completion; diff --git a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake deleted file mode 100644 index 4eca5cfb5df9..000000000000 --- a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2016-08-25 11:52:06 UTC -+++ cmake/build_configurations/compiler_options.cmake -@@ -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-client/files/patch-cmake_os_DragonFly.cmake b/databases/percona57-client/files/patch-cmake_os_DragonFly.cmake deleted file mode 100644 index 83c154ee3bcf..000000000000 --- a/databases/percona57-client/files/patch-cmake_os_DragonFly.cmake +++ /dev/null @@ -1,27 +0,0 @@ ---- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC -+++ cmake/os/DragonFly.cmake -@@ -0,0 +1,24 @@ -+INCLUDE(CheckCSourceRuns) -+ -+# We require at least GCC 4.4 or Clang 3.3. -+IF(NOT FORCE_UNSUPPORTED_COMPILER) -+ IF(CMAKE_COMPILER_IS_GNUCC) -+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion -+ OUTPUT_VARIABLE GCC_VERSION) -+ IF(GCC_VERSION VERSION_LESS 4.4) -+ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") -+ ENDIF() -+ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ CHECK_C_SOURCE_RUNS(" -+ int main() -+ { -+ return (__clang_major__ < 3) || -+ (__clang_major__ == 3 && __clang_minor__ < 3); -+ }" HAVE_SUPPORTED_CLANG_VERSION) -+ IF(NOT HAVE_SUPPORTED_CLANG_VERSION) -+ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") -+ ENDIF() -+ ELSE() -+ MESSAGE(FATAL_ERROR "Unsupported compiler!") -+ ENDIF() -+ENDIF() diff --git a/databases/percona57-client/files/patch-cmake_os_FreeBSD.cmake b/databases/percona57-client/files/patch-cmake_os_FreeBSD.cmake deleted file mode 100644 index 9e9043f341ae..000000000000 --- a/databases/percona57-client/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-client/files/patch-cmake_plugin.cmake b/databases/percona57-client/files/patch-cmake_plugin.cmake deleted file mode 100644 index a52ef25c7b24..000000000000 --- a/databases/percona57-client/files/patch-cmake_plugin.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC -+++ cmake/plugin.cmake -@@ -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-client/files/patch-cmake_ssl.cmake b/databases/percona57-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 7a73266ce4c8..000000000000 --- a/databases/percona57-client/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-client/files/patch-configure.cmake b/databases/percona57-client/files/patch-configure.cmake deleted file mode 100644 index 81ab9495aac3..000000000000 --- a/databases/percona57-client/files/patch-configure.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.cmake.orig 2018-01-16 23:26:09 UTC -+++ configure.cmake -@@ -43,6 +43,12 @@ IF(UNIX) - ENDIF() - - -+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ SET(CMAKE_SHARED_LIBRARY_C_FLAGS -+ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%") -+ENDIF() -+ -+ - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) - ## We will be using gcc to generate .so files - ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS diff --git a/databases/percona57-client/files/patch-extra_CMakeLists.txt b/databases/percona57-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 50f6e806e8be..000000000000 --- a/databases/percona57-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- extra/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ extra/CMakeLists.txt -@@ -45,6 +45,7 @@ ENDIF() - - ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h - ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys -+ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ - COMMAND comp_err - --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets - --out-dir=${PROJECT_BINARY_DIR}/sql/share/ -@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY - ENDIF() - - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) - SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() -+ENDIF() - -+IF(FALSE) - IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - ENDIF() -+ENDIF() - - # In published release builds on Solaris, we need to bundle gcc source. - # PB2 will take care of putting it in extra/ when needed diff --git a/databases/percona57-client/files/patch-include_CMakeLists.txt b/databases/percona57-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 488de8104854..000000000000 --- a/databases/percona57-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- include/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ include/CMakeLists.txt -@@ -38,6 +38,7 @@ SET(HEADERS_ABI - - SET(HEADERS - ${HEADERS_ABI} -+ hash.h - my_dbug.h - m_string.h - my_sys.h diff --git a/databases/percona57-client/files/patch-include_my__compare.h b/databases/percona57-client/files/patch-include_my__compare.h deleted file mode 100644 index 608e15dd8751..000000000000 --- a/databases/percona57-client/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-client/files/patch-include_my__openssl.h b/databases/percona57-client/files/patch-include_my__openssl.h deleted file mode 100644 index 43ddb2935038..000000000000 --- a/databases/percona57-client/files/patch-include_my__openssl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_openssl.h.orig 2020-03-23 17:35:17 UTC -+++ include/my_openssl.h -@@ -51,7 +51,7 @@ extern "C" { - */ - static inline int mysql_OPENSSL_init() - { --#if defined(HAVE_STATIC_OPENSSL) -+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER) - return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); - #else - return SSL_library_init(); diff --git a/databases/percona57-client/files/patch-include_myisam.h b/databases/percona57-client/files/patch-include_myisam.h deleted file mode 100644 index 96bc58628416..000000000000 --- a/databases/percona57-client/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-client/files/patch-include_mysql.h b/databases/percona57-client/files/patch-include_mysql.h deleted file mode 100644 index 906bdb42c4fb..000000000000 --- a/databases/percona57-client/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-client/files/patch-man_CMakeLists.txt b/databases/percona57-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index e02a804949d8..000000000000 --- a/databases/percona57-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC -+++ man/CMakeLists.txt -@@ -15,10 +15,6 @@ - - # Copy man pages - FILE(GLOB MAN1_FILES *.1) --FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) --FILE(GLOB MAN1_NDB ndb*.1) --FILE(GLOB MAN8_FILES *.8) --FILE(GLOB MAN8_NDB ndb*.8) - IF(MAN1_FILES) - IF(MAN1_EXCLUDE) - LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc deleted file mode 100644 index 453c89a71c12..000000000000 --- a/databases/percona57-client/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-client/files/patch-mysys__ssl_my__default.cc b/databases/percona57-client/files/patch-mysys__ssl_my__default.cc deleted file mode 100644 index 83a127b9602c..000000000000 --- a/databases/percona57-client/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-client/files/patch-mysys_mf__iocache2.c b/databases/percona57-client/files/patch-mysys_mf__iocache2.c deleted file mode 100644 index e418e454e939..000000000000 --- a/databases/percona57-client/files/patch-mysys_mf__iocache2.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mysys/mf_iocache2.c.orig 2019-02-18 09:11:31.000000000 +0300 -+++ mysys/mf_iocache2.c -@@ -24,6 +24,7 @@ - #include <m_string.h> - #include <stdarg.h> - #include <m_ctype.h> -+#include "mysql/psi/mysql_file.h" - - /* - Copy contents of an IO_CACHE to a file. diff --git a/databases/percona57-client/files/patch-scripts_CMakeLists.txt b/databases/percona57-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index a8cb6de9fb23..000000000000 --- a/databases/percona57-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,72 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 -+++ scripts/CMakeLists.txt 2017-12-31 14:31:35.649012000 +0000 -@@ -23,6 +23,7 @@ - SET(COMPILER_ID_AND_VERSION - "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") - -+IF(FALSE) - # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) - IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) - FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") -@@ -65,7 +66,9 @@ - ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c - ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h -+ENDIF() - ) -+ENDIF() - - # If we do not have performance schema compiled in then sys will not work, - # so only create an empty sys database with an auto-generated file, -@@ -146,6 +149,7 @@ - ) - ENDIF() - -+IF(FALSE) - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -153,6 +157,7 @@ - COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution - ) - ENDIF() -+ENDIF() - - IF(NOT WITHOUT_SERVER) - INSTALL(FILES -@@ -332,6 +337,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() -@@ -417,25 +424,7 @@ - # On Unix, most of the files end up in the bin directory - SET(mysql_config_COMPONENT COMPONENT Development) - -- IF(WITH_SYSTEMD) -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- ps_tokudb_admin -- ps_mysqld_helper -- ps-admin -- ) -- ELSE() -- SET(BIN_SCRIPTS -- mysql_config -- mysqldumpslow -- mysqld_multi -- mysqld_safe -- ps_tokudb_admin -- ps_mysqld_helper -- ps-admin -- ) -- ENDIF() -+ SET(BIN_SCRIPTS mysql_config) - - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") diff --git a/databases/percona57-client/files/patch-sql_auth_sha2__password__common.cc b/databases/percona57-client/files/patch-sql_auth_sha2__password__common.cc deleted file mode 100644 index 1d2486c48d20..000000000000 --- a/databases/percona57-client/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-client/files/patch-support-files_CMakeLists.txt b/databases/percona57-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 9dd13cfbe3b7..000000000000 --- a/databases/percona57-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 -+++ support-files/CMakeLists.txt 2017-12-31 14:35:25.047786000 +0000 -@@ -47,6 +47,7 @@ - SET (PIDOF "pgrep -d' ' -f") - ENDIF() - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -59,9 +60,11 @@ - IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ENDIF() -+ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - -+IF(FALSE) - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -74,3 +77,4 @@ - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - ENDIF() -+ENDIF() diff --git a/databases/percona57-client/files/patch-vio_viosocket.c b/databases/percona57-client/files/patch-vio_viosocket.c deleted file mode 100644 index c03e19e9e86c..000000000000 --- a/databases/percona57-client/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-client/files/patch-vio_viossl.c b/databases/percona57-client/files/patch-vio_viossl.c deleted file mode 100644 index 39bcb6b765b5..000000000000 --- a/databases/percona57-client/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-client/files/patch-vio_viosslfactories.c b/databases/percona57-client/files/patch-vio_viosslfactories.c deleted file mode 100644 index b37d41d49108..000000000000 --- a/databases/percona57-client/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. diff --git a/databases/percona57-client/pkg-plist b/databases/percona57-client/pkg-plist deleted file mode 100644 index bd41108327f6..000000000000 --- a/databases/percona57-client/pkg-plist +++ /dev/null @@ -1,144 +0,0 @@ -bin/mysql -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysql_config -bin/mysql_config_editor -bin/mysqldump -bin/mysqlimport -bin/mysqlpump -bin/mysql_secure_installation -bin/mysqlshow -bin/mysqlslap -bin/mysql_ssl_rsa_setup -include/mysql/big_endian.h -include/mysql/binary_log_types.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/hash.h -include/mysql/keycache.h -include/mysql/little_endian.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/my_alloc.h -include/mysql/my_byteorder.h -include/mysql/my_command.h -include/mysql/my_compiler.h *** 1976 LINES SKIPPED ***