aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-06-30 01:32:12 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-06-30 01:40:48 +0000
commit1fb68a4d5483cd0ac802a916d240def524eabce7 (patch)
treeb3c894091146e3ad49b6c5c91c49738cab3d0fa2
parent68b6a7c4553e64d9e600752a4022eb6837b84958 (diff)
downloadports-1fb68a4.tar.gz
ports-1fb68a4.zip
databases/mysql56-*: Sunset
2023-06-30 databases/mysql56-*: Upstream support ended in February 2021 Approved by: portmgr (blanket)
-rw-r--r--MOVED2
-rw-r--r--Mk/Uses/mysql.mk1
-rw-r--r--Mk/bsd.default-versions.mk2
-rw-r--r--databases/Makefile2
-rw-r--r--databases/ateam_mysql57_ldap_auth/Makefile2
-rw-r--r--databases/mysql-connector-odbc-80/Makefile2
-rw-r--r--databases/mysql56-client/Makefile35
-rw-r--r--databases/mysql56-client/files/patch-CMakeLists.txt40
-rw-r--r--databases/mysql56-client/files/patch-client_CMakeLists.txt43
-rw-r--r--databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake20
-rw-r--r--databases/mysql56-client/files/patch-cmake_ssl.cmake54
-rw-r--r--databases/mysql56-client/files/patch-extra_CMakeLists.txt32
-rw-r--r--databases/mysql56-client/files/patch-include-CMakeLists.txt10
-rw-r--r--databases/mysql56-client/files/patch-include_my_compare.h11
-rw-r--r--databases/mysql56-client/files/patch-include_myisam.h11
-rw-r--r--databases/mysql56-client/files/patch-man_CMakeLists.txt15
-rw-r--r--databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc74
-rw-r--r--databases/mysql56-client/files/patch-mysys_ssl_my_default.cc61
-rw-r--r--databases/mysql56-client/files/patch-scripts_CMakeLists.txt93
-rw-r--r--databases/mysql56-client/files/patch-sql-common_client.c15
-rw-r--r--databases/mysql56-client/files/patch-sql_mysqld.cc65
-rw-r--r--databases/mysql56-client/files/patch-support-files_CMakeLists.txt40
-rw-r--r--databases/mysql56-client/files/patch-vio_vio.c11
-rw-r--r--databases/mysql56-client/files/patch-vio_viossl.c20
-rw-r--r--databases/mysql56-client/files/patch-vio_viosslfactories.c38
-rw-r--r--databases/mysql56-client/pkg-message16
-rw-r--r--databases/mysql56-client/pkg-plist111
-rw-r--r--databases/mysql56-server/Makefile160
-rw-r--r--databases/mysql56-server/distinfo3
-rw-r--r--databases/mysql56-server/files/extra-patch-config.h.cmake12
-rw-r--r--databases/mysql56-server/files/my.cnf.sample.in61
-rw-r--r--databases/mysql56-server/files/mysql-server.in79
-rw-r--r--databases/mysql56-server/files/patch-CMakeLists.txt42
-rw-r--r--databases/mysql56-server/files/patch-client_CMakeLists.txt65
-rw-r--r--databases/mysql56-server/files/patch-cmake_plugin.cmake12
-rw-r--r--databases/mysql56-server/files/patch-cmake_ssl.cmake26
-rw-r--r--databases/mysql56-server/files/patch-extra_CMakeLists.txt13
-rw-r--r--databases/mysql56-server/files/patch-include_CMakeLists.txt15
-rw-r--r--databases/mysql56-server/files/patch-include_my_compare.h11
-rw-r--r--databases/mysql56-server/files/patch-include_myisam.h11
-rw-r--r--databases/mysql56-server/files/patch-libmysql_CMakeLists.txt42
-rw-r--r--databases/mysql56-server/files/patch-libservices_CMakeLists.txt9
-rw-r--r--databases/mysql56-server/files/patch-man_CMakeLists.txt11
-rw-r--r--databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc74
-rw-r--r--databases/mysql56-server/files/patch-mysys_ssl_my_default.cc61
-rw-r--r--databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc11
-rw-r--r--databases/mysql56-server/files/patch-scripts_CMakeLists.txt36
-rw-r--r--databases/mysql56-server/files/patch-scripts_mysqld_safe.sh24
-rw-r--r--databases/mysql56-server/files/patch-sql-common_client.c15
-rw-r--r--databases/mysql56-server/files/patch-sql_CMakeLists.txt18
-rw-r--r--databases/mysql56-server/files/patch-sql_mysqld.cc65
-rw-r--r--databases/mysql56-server/files/patch-sql_sys_vars.cc38
-rw-r--r--databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc13
-rw-r--r--databases/mysql56-server/files/patch-support-files_CMakeLists.txt12
-rw-r--r--databases/mysql56-server/files/patch-vio_vio.c11
-rw-r--r--databases/mysql56-server/files/patch-vio_viossl.c20
-rw-r--r--databases/mysql56-server/files/patch-vio_viosslfactories.c38
-rw-r--r--databases/mysql56-server/files/pkg-message.in16
-rw-r--r--databases/mysql56-server/pkg-descr2
-rw-r--r--databases/mysql56-server/pkg-plist138
-rw-r--r--www/typo3-11/Makefile2
-rw-r--r--www/typo3-12/Makefile2
62 files changed, 7 insertions, 1987 deletions
diff --git a/MOVED b/MOVED
index df37482a2daf..c204af06bb26 100644
--- a/MOVED
+++ b/MOVED
@@ -7662,3 +7662,5 @@ databases/mysql-q4m||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysqlbigram||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/ateam_mysql_ldap_auth||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
databases/mysqlwsrep56-server||2023-06-30|Has expired: Requires upstream EOL MySQL 5.6
+databases/mysql56-server||2023-06-30|Has expired: Upstream support ended in February 2021
+databases/mysql56-client||2023-06-30|Has expired: Upstream support ended in February 2021
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
index bc718fb4a853..680ac025ed80 100644
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -64,7 +64,6 @@ DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
# MySQL client version currently supported.
# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
-MYSQL56_LIBVER= 18
MYSQL57_LIBVER= 20
MYSQL57p_LIBVER= 20
MYSQL80_LIBVER= 21
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 3d9a566d52ef..5d4006f68e69 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -93,7 +93,7 @@ LUAJIT_DEFAULT?= luajit-devel
. endif
# Possible values: 5.10, 5.20, 6.8
MONO_DEFAULT?= 5.10
-# Possible values: 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w
+# Possible values: 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.7p, 5.7w
MYSQL_DEFAULT?= 8.0
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
diff --git a/databases/Makefile b/databases/Makefile
index a0843cb5ec25..10f0fffdd9e5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -209,8 +209,6 @@
SUBDIR += mysql-connector-odbc-80
SUBDIR += mysql-udf
SUBDIR += mysql2pgsql
- SUBDIR += mysql56-client
- SUBDIR += mysql56-server
SUBDIR += mysql57-client
SUBDIR += mysql57-server
SUBDIR += mysql80-client
diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile
index 62b9ecfe9967..67cda11fe743 100644
--- a/databases/ateam_mysql57_ldap_auth/Makefile
+++ b/databases/ateam_mysql57_ldap_auth/Makefile
@@ -10,7 +10,7 @@ WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-IGNORE_WITH_MYSQL= 56 80 101m 102m 103m
+IGNORE_WITH_MYSQL= 80 101m 102m 103m
LIB_DEPENDS= libconfig.so:devel/libconfig
diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile
index d19d0dc17b65..ad1aa90358a4 100644
--- a/databases/mysql-connector-odbc-80/Makefile
+++ b/databases/mysql-connector-odbc-80/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libodbc.so:databases/unixODBC \
libzstd.so:archivers/zstd
USES= cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
-IGNORE_WITH_MYSQL= 56 57 101m 102m 103m 57p 57w
+IGNORE_WITH_MYSQL= 57 101m 102m 103m 57p 57w
USE_LDCONFIG= yes
CMAKE_ARGS= -DWITH_UNIXODBC=1 -DDISABLE_GUI=1
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
deleted file mode 100644
index b612203bbfb6..000000000000
--- a/databases/mysql56-client/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-PORTNAME= mysql
-PORTREVISION= 0
-PKGNAMESUFFIX= 56-client
-
-COMMENT= Multithreaded SQL database (client)
-
-LICENSE+= LGPL21
-
-DEPRECATED= Upstream support ended in February 2021
-EXPIRATION_DATE= 2023-06-30
-
-BROKEN_sparc64= Does not build: reports unsupported compiler
-
-MASTERDIR= ${.CURDIR}/../mysql56-server
-
-PKGMESSAGE= ${.CURDIR}/pkg-message
-PATCHDIR= ${.CURDIR}/files
-PLIST= ${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL= mysql5[0-57-9]-client \
- mysql[0-46-9][0-9]-client \
- mariadb[0-9][0-9]-client \
- percona[0-9][0-9]-client
-
-CMAKE_ARGS+= -DWITHOUT_SERVER=1
-
-USE_LDCONFIG+= ${PREFIX}/lib/mysql
-
-MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
- mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
- mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY= yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql56-client/files/patch-CMakeLists.txt b/databases/mysql56-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 3a2856f26e6d..000000000000
--- a/databases/mysql56-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
-+++ CMakeLists.txt
-@@ -481,8 +481,8 @@ ENDIF()
-
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
-
- IF(UNIX)
- ADD_SUBDIRECTORY(man)
-@@ -552,18 +552,17 @@ ELSE()
- SET(CPACK_GENERATOR "TGZ")
- ENDIF()
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
-
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
-
- 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}
-@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- PATTERN "sp-imp-spec.txt" EXCLUDE
- )
- ENDIF()
-+ENDIF()
-
- INCLUDE(CPack)
-
diff --git a/databases/mysql56-client/files/patch-client_CMakeLists.txt b/databases/mysql56-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index f9abf51f399c..000000000000
--- a/databases/mysql56-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- client/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100
-+++ client/CMakeLists.txt 2016-04-19 17:30:13.344558659 +0200
-@@ -37,9 +37,11 @@ IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -81,8 +87,6 @@ IF(WIN32)
- ENDIF(WIN32)
-
- SET_TARGET_PROPERTIES (
-- mysql_plugin
-- mysql_upgrade
- mysqlcheck
- mysqldump
- mysqlimport
diff --git a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake b/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
deleted file mode 100644
index f22178ade70a..000000000000
--- a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig 2020-01-01 21:24:49.736077000 +0100
-+++ cmake/build_configurations/compiler_options.cmake 2020-01-01 21:25:22.307418000 +0100
-@@ -32,7 +32,7 @@ IF(UNIX)
-
- # Default GCC flags
- IF(CMAKE_COMPILER_IS_GNUCC)
-- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+ SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
- # Disable inline optimizations for valgrind testing to avoid false positives
- IF(WITH_VALGRIND)
- SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}")
-@@ -47,7 +47,7 @@ IF(UNIX)
- IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
- SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -std=gnu++03")
- ENDIF()
-- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+ SET(COMMON_CXX_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing")
- # Disable inline optimizations for valgrind testing to avoid false positives
- IF(WITH_VALGRIND)
- SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
diff --git a/databases/mysql56-client/files/patch-cmake_ssl.cmake b/databases/mysql56-client/files/patch-cmake_ssl.cmake
deleted file mode 100644
index ea7b6a9be138..000000000000
--- a/databases/mysql56-client/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
---- cmake/ssl.cmake.orig 2021-01-05 17:19:59.000000000 +0700
-+++ cmake/ssl.cmake 2023-06-13 13:07:00.168639000 +0700
-@@ -169,6 +169,25 @@ MACRO (MYSQL_CHECK_SSL)
- ENDIF()
-
- IF(OPENSSL_INCLUDE_DIR)
-+ FOREACH(version_part
-+ OPENSSL_VERSION_MAJOR
-+ OPENSSL_VERSION_MINOR
-+ OPENSSL_VERSION_PATCH
-+ )
-+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" ${version_part}
-+ REGEX "^#[\t ]*define[\t ]+${version_part}[\t ]+([0-9]+).*")
-+ STRING(REGEX REPLACE
-+ "^.*${version_part}[\t ]+([0-9]+).*" "\\1"
-+ ${version_part} "${${version_part}}")
-+ ENDFOREACH()
-+
-+ IF(OPENSSL_VERSION_MAJOR VERSION_EQUAL 3)
-+ # OpenSSL 3
-+ SET(OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_MAJOR}")
-+ SET(OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_MINOR}")
-+ SET(OPENSSL_FIX_VERSION "${OPENSSL_VERSION_PATCH}")
-+ SET(OPENSSL_FOUND TRUE)
-+ ELSE()
- # Verify version number. Version information looks like:
- # #define OPENSSL_VERSION_NUMBER 0x1000103fL
- # Encoded as MNNFFPPS: major minor fix patch status
-@@ -188,14 +207,22 @@ MACRO (MYSQL_CHECK_SSL)
- "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
- )
-+ ENDIF()
- ENDIF()
-- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-- ADD_DEFINITIONS(-DHAVE_TLSv13)
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+ IF(HAVE_TLS1_3_VERSION)
-+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
- ENDIF()
- 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/mysql56-client/files/patch-extra_CMakeLists.txt b/databases/mysql56-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index cdfc77b55aaa..000000000000
--- a/databases/mysql56-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- extra/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
-+++ extra/CMakeLists.txt
-@@ -35,6 +35,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/
-@@ -60,6 +61,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)
-@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
- MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
- TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
- ENDIF()
-+ENDIF()
-
- IF(UNIX)
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
- TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
- TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
diff --git a/databases/mysql56-client/files/patch-include-CMakeLists.txt b/databases/mysql56-client/files/patch-include-CMakeLists.txt
deleted file mode 100644
index d34ccda7fb7a..000000000000
--- a/databases/mysql56-client/files/patch-include-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig 2014-01-14 23:38:00.000000000 +0800
-+++ include/CMakeLists.txt 2014-02-28 04:51:50.269412818 +0800
-@@ -35,6 +35,7 @@
-
- SET(HEADERS
- ${HEADERS_ABI}
-+ hash.h
- my_dbug.h
- m_string.h
- my_sys.h
diff --git a/databases/mysql56-client/files/patch-include_my_compare.h b/databases/mysql56-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql56-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
- 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/mysql56-client/files/patch-include_myisam.h b/databases/mysql56-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql56-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
- 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/mysql56-client/files/patch-man_CMakeLists.txt b/databases/mysql56-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 066b1e4252b0..000000000000
--- a/databases/mysql56-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
-+++ man/CMakeLists.txt
-@@ -14,11 +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 MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
-+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
- IF(MAN1_FILES)
- IF(MAN1_EXCLUDE)
- LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc
deleted file mode 100644
index 0d1dea6cf6cb..000000000000
--- a/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- const unsigned char *key, uint32 key_length,
- enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX stack_ctx;
- EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
- return MY_AES_BAD_DATA;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-
-@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
- goto aes_error; /* Error */
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- aes_error:
- /* need to explicitly clean up the error if we want to ignore it */
- ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- const unsigned char *key, uint32 key_length,
- enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX stack_ctx;
- EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
- return MY_AES_BAD_DATA;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-
-@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
- goto aes_error; /* Error */
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- aes_error:
- /* need to explicitly clean up the error if we want to ignore it */
- ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
diff --git a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index fa06468ce959..000000000000
--- a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
-+++ mysys_ssl/my_default.cc
-@@ -110,7 +110,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;
-
-@@ -903,6 +903,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++;
-@@ -1241,7 +1249,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);
- }
- }
- }
-@@ -1400,13 +1409,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
-
-@@ -1477,7 +1481,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/mysql56-client/files/patch-scripts_CMakeLists.txt b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 9d16479b0067..000000000000
--- a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
---- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
-+++ scripts/CMakeLists.txt
-@@ -71,6 +71,7 @@ IF(UNIX)
- )
- ENDIF()
-
-+IF(FALSE)
- INSTALL(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
- ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@ INSTALL(FILES
- ${FIX_PRIVILEGES_SQL}
- DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
-
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -168,6 +170,7 @@ ENDIF()
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
-
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
- DESTINATION ${INSTALL_BINDIR}
- COMPONENT Server
- )
-+ENDIF()
-
- ENDIF(UNIX)
-
-@@ -228,6 +232,7 @@ ELSE()
- SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
-
-+IF(FALSE)
- IF(UNIX)
- SET(EXT)
- ELSE()
-@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
- DESTINATION ${DEST}
- COMPONENT Server
- )
-+ENDIF()
-
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(sysconfdir ${prefix})
-@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
- 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()
-@@ -353,17 +361,9 @@ ELSE()
- SET(BIN_SCRIPTS
- msql2mysql
- mysql_config
-- mysql_fix_extensions
-- mysql_setpermission
-- mysql_zap
- mysqlaccess
- mysqlaccess.conf
-- mysql_convert_table_format
- mysql_find_rows
-- mysqlhotcopy
-- mysqldumpslow
-- mysqld_multi
-- mysqld_safe
- )
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -387,6 +387,7 @@ ELSE()
- )
- ENDFOREACH()
-
-+IF(FALSE)
- # Input files with pl.in extension - drop the extension completely
- SET(PLIN_FILES mysql_secure_installation)
- FOREACH(file ${PLIN_FILES})
-@@ -399,6 +400,7 @@ ELSE()
- INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
- ENDFOREACH()
- ENDIF()
-+ENDIF()
-
- # Install libgcc as mylibgcc.a
- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
diff --git a/databases/mysql56-client/files/patch-sql-common_client.c b/databases/mysql56-client/files/patch-sql-common_client.c
deleted file mode 100644
index cfc168b75a53..000000000000
--- a/databases/mysql56-client/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- sql-common/client.c.orig 2019-11-26 16:53:45 UTC
-+++ sql-common/client.c
-@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
- goto error;
- }
-
-- cn= (char *) ASN1_STRING_data(cn_asn1);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+ cn= (const char *) ASN1_STRING_data(cn_asn1);
-+#else
-+ cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif
-
- // There should not be any NULL embedded in the CN
- if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/databases/mysql56-client/files/patch-sql_mysqld.cc b/databases/mysql56-client/files/patch-sql_mysqld.cc
deleted file mode 100644
index debee80ea2ce..000000000000
--- a/databases/mysql56-client/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC
-+++ sql/mysqld.cc
-@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
- *opt_ssl_crlpath= NULL;
-
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/crypto.h>
- typedef struct CRYPTO_dynlock_value
- {
-@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
- mysql_mutex_destroy(&LOCK_connection_count);
- #ifdef HAVE_OPENSSL
- mysql_mutex_destroy(&LOCK_des_key_file);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- for (int i= 0; i < CRYPTO_num_locks(); ++i)
- mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
- OPENSSL_free(openssl_stdlocks);
-@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
-
- // Clean up errors now, before possibly waiting for a new connection.
- #ifndef EMBEDDED_LIBRARY
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-@@ -4252,7 +4252,7 @@ static int init_thread_environment()
- #ifdef HAVE_OPENSSL
- mysql_mutex_init(key_LOCK_des_key_file,
- &LOCK_des_key_file, MY_MUTEX_INIT_FAST);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
- sizeof(openssl_lock_t));
- for (int i= 0; i < CRYPTO_num_locks(); ++i)
-@@ -4301,7 +4301,7 @@ static int init_thread_environment()
- OpenSSL 1.1 supports native platform threads,
- so we don't need the following callback functions.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- static unsigned long openssl_id_function()
- {
-@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
- 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();
-@@ -4392,7 +4392,7 @@ static int init_ssl()
- opt_ssl_cipher, &error,
- opt_ssl_crl, opt_ssl_crlpath);
- DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- if (!ssl_acceptor_fd)
diff --git a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt b/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index eb31e58fb36d..000000000000
--- a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- support-files/CMakeLists.txt.orig 2017-03-18 06:43:12 UTC
-+++ support-files/CMakeLists.txt
-@@ -44,11 +44,13 @@ ELSE()
- SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
-
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
- ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
- DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
-
- IF(UNIX)
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -57,6 +59,7 @@ IF(UNIX)
- SET (PIDOF "pgrep -d' ' -f")
- ENDIF()
- SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
- FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
- ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -73,8 +76,10 @@ IF(UNIX)
- IF(INSTALL_SUPPORTFILESDIR)
- INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
- ENDIF()
-+ENDIF()
-
- INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
- CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
- CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-
-@@ -99,3 +104,4 @@ IF(UNIX)
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
- GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql56-client/files/patch-vio_vio.c b/databases/mysql56-client/files/patch-vio_vio.c
deleted file mode 100644
index 042c4d65e8f2..000000000000
--- a/databases/mysql56-client/files/patch-vio_vio.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vio/vio.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/vio.c
-@@ -394,7 +394,7 @@ void vio_end(void)
- {
- #if defined(HAVE_OPENSSL)
- // This one is needed on the client side
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- ERR_free_strings();
diff --git a/databases/mysql56-client/files/patch-vio_viossl.c b/databases/mysql56-client/files/patch-vio_viossl.c
deleted file mode 100644
index 54a6280525fc..000000000000
--- a/databases/mysql56-client/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/viossl.c
-@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
- DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
- SSL_clear(ssl);
- SSL_set_fd(ssl, sd);
--#if defined(SSL_OP_NO_COMPRESSION)
-+#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
- #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
- sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
-@@ -403,7 +403,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/mysql56-client/files/patch-vio_viosslfactories.c b/databases/mysql56-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index dd1293395898..000000000000
--- a/databases/mysql56-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/viosslfactories.c
-@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
- DH_free(dh);
- return NULL;
- }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- dh->p= p;
- dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- struct st_VioSSLFd *ssl_fd;
- /* MySQL 5.6 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 */
- SSL_OP_NO_TICKET;
-@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- DBUG_RETURN(0);
-
- if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSLv23_client_method() :
- SSLv23_server_method()
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-
- SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
-
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
- /*
- MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
- */
diff --git a/databases/mysql56-client/pkg-message b/databases/mysql56-client/pkg-message
deleted file mode 100644
index a71ac478bbf5..000000000000
--- a/databases/mysql56-client/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-EOM
-}
-]
diff --git a/databases/mysql56-client/pkg-plist b/databases/mysql56-client/pkg-plist
deleted file mode 100644
index d0d4b77569ad..000000000000
--- a/databases/mysql56-client/pkg-plist
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.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_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/get_password.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_validate_password.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-lib/mysql/libmysqlservices.a
-share/man/man1/comp_err.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_config_editor.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
deleted file mode 100644
index 91e17a296adb..000000000000
--- a/databases/mysql56-server/Makefile
+++ /dev/null
@@ -1,160 +0,0 @@
-PORTNAME?= mysql
-PORTVERSION= 5.6.51
-PORTREVISION?= 0
-CATEGORIES= databases
-MASTER_SITES= MYSQL/MySQL-5.6
-PKGNAMESUFFIX?= 56-server
-
-MAINTAINER= joneum@FreeBSD.org
-COMMENT?= Multithreaded SQL database (server)
-WWW= https://www.mysql.com/
-
-LICENSE= GPLv2
-
-DEPRECATED= Upstream support ended in February 2021
-EXPIRATION_DATE= 2023-06-30
-
-BROKEN_armv6= qemu: uncaught target signal 11 (Segmentation fault) - core dumped
-
-SLAVEDIRS= databases/mysql56-client
-USES= bison:build cmake:noninja compiler:c++11-lib cpe groff:run \
- libedit localbase perl5 shebangfix ssl
-IGNORE_SSL= openssl30 openssl31
-IGNORE_SSL_REASON= Upstream only supports OpenSSL 1.0.1 upto 1.1.X
-
-CPE_VENDOR= oracle
-
-USE_PERL5= run
-
-MY_DBDIR= /var/db/mysql
-MY_SECDIR= /var/db/mysql_secure
-MY_TMPDIR= /var/db/mysql_tmpdir
-
-LIB_DEPENDS+= libevent.so:devel/libevent \
- liblz4.so:archivers/liblz4
-
-CMAKE_BUILD_TYPE= Release
-
-CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
- -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
- -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
- -DINSTALL_DOCDIR="share/doc/mysql" \
- -DINSTALL_DOCREADMEDIR="share/doc/mysql" \
- -DINSTALL_INCLUDEDIR="include/mysql" \
- -DINSTALL_INFODIR="${INFO_PATH}" \
- -DINSTALL_LIBDIR="lib/mysql" \
- -DINSTALL_MANDIR="share/man" \
- -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
- -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
- -DINSTALL_MYSQLSHAREDIR="share/mysql" \
- -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
- -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
- -DINSTALL_SBINDIR="libexec" \
- -DINSTALL_SCRIPTDIR="bin" \
- -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
- -DINSTALL_SHAREDIR="share" \
- -DINSTALL_SQLBENCHDIR="share/mysql" \
- -DINSTALL_SUPPORTFILESDIR="share/mysql" \
- -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
- -DWITH_BOOST="${WRKSRC}/boost" \
- -DWITH_EDITLINE=system \
- -DWITH_LIBEVENT=system \
- -DWITH_LZ4=system \
- -DWITH_ZLIB=system \
- -DWITH_SSL=${OPENSSLBASE} \
- -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
- -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
- -DINSTALL_MYSQLTESTDIR=0
-
-SHEBANG_FILES= scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-SUB_LIST= MY_DBDIR=${MY_DBDIR} \
- MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
- MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USES+= mysql:56
-
-CONFLICTS_INSTALL= mysql*-server \
- mysqlwsrep*-server \
- mariadb*-server \
- percona*-server
-
-USE_RC_SUBR= mysql-server
-
-SUB_FILES= my.cnf.sample pkg-message
-
-USERS= mysql
-GROUPS= mysql
-
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-
-MMAN1= 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
-
-CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
-
-OPTIONS_GROUP= STORAGE
-OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
-OPTIONS_SUB= YES
-STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server)
-ARCHIVE_DESC= Compile "Archive Storage" statically in server
-BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server
-EXAMPLE_DESC= Compile "Example Storage" statically in server
-FEDERATED_DESC= Compile "Federated Storage" statically in server
-INNOBASE_DESC= Compile "InnoDB Storage" statically in server
-PARTITION_DESC= Compile "Partitioning support Storage" statically in server
-PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server
-
-ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1
-BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1
-EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1
-FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1
-INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1
-PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1
-PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1
-
-OPTIONS_GROUP+= FEATURES
-OPTIONS_GROUP_FEATURES= PERFSCHM
-FEATURES_DESC= Default features knobs
-PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage)
-OPTIONS_DEFAULT+= PERFSCHM
-
-PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
-PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
-FEDERATED_SUB_LIST+= FEDER="--federated"
-FEDERATED_SUB_LIST_OFF+= FEDER=""
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
- @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-.if !defined(CLIENT_ONLY)
-post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
- ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
- ${MKDIR} ${STAGEDIR}${MY_SECDIR}
- ${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-.endif
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo
deleted file mode 100644
index c5be53f998dc..000000000000
--- a/databases/mysql56-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611992804
-SHA256 (mysql-5.6.51.tar.gz) = 262ccaf2930fca1f33787505dd125a7a04844f40d3421289a51974b5935d9abc
-SIZE (mysql-5.6.51.tar.gz) = 32411131
diff --git a/databases/mysql56-server/files/extra-patch-config.h.cmake b/databases/mysql56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql56-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/mysql56-server/files/my.cnf.sample.in b/databases/mysql56-server/files/my.cnf.sample.in
deleted file mode 100644
index 5d8056748079..000000000000
--- a/databases/mysql56-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,61 +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
-log-slave-updates = 1
-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_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/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in
deleted file mode 100644
index a7bc29daa5ce..000000000000
--- a/databases/mysql56-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} --force"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
- [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-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/mysql56-server/files/patch-CMakeLists.txt b/databases/mysql56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 23cca022fbb1..000000000000
--- a/databases/mysql56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- CMakeLists.txt.orig 2020-01-01 20:46:13.771078000 +0100
-+++ CMakeLists.txt 2020-01-01 20:49:28.631677000 +0100
-@@ -558,12 +558,10 @@ IF(UNIX)
- ENDIF()
-
- IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(tests)
- 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()
-
-@@ -572,10 +570,7 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
-
- IF(NOT WITHOUT_SERVER)
-- ADD_SUBDIRECTORY(mysql-test)
-- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
- ADD_SUBDIRECTORY(support-files)
-- ADD_SUBDIRECTORY(sql-bench)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
-@@ -634,6 +629,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
- INSTALL(FILES
- README
-@@ -652,6 +648,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/mysql56-server/files/patch-client_CMakeLists.txt b/databases/mysql56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 1714bbfadb6a..000000000000
--- a/databases/mysql56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200
-+++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200
-@@ -31,17 +31,20 @@
- COPY_OPENSSL_DLLS(copy_openssl_client)
-
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-
-@@ -50,17 +53,21 @@
-
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-
-+IF(FALSE)
- 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)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-
-@@ -73,6 +80,7 @@
-
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
-+ENDIF()
-
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -82,11 +90,6 @@
- SET_TARGET_PROPERTIES (
- mysql_plugin
- mysql_upgrade
-- mysqlcheck
-- mysqldump
-- mysqlimport
-- mysqlshow
-- mysqlslap
- PROPERTIES HAS_CXX TRUE)
-
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql56-server/files/patch-cmake_plugin.cmake b/databases/mysql56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index da0ed4222758..000000000000
--- a/databases/mysql56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig 2019-03-15 07:38:15 UTC
-+++ cmake/plugin.cmake
-@@ -212,9 +212,6 @@ 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})
- # 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"
diff --git a/databases/mysql56-server/files/patch-cmake_ssl.cmake b/databases/mysql56-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 52db9e37d987..000000000000
--- a/databases/mysql56-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
---- cmake/ssl.cmake.orig 2019-11-26 16:53:45 UTC
-+++ cmake/ssl.cmake
-@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL)
- OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
- )
- ENDIF()
-- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
-- ADD_DEFINITIONS(-DHAVE_TLSv13)
-+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+ IF(HAVE_TLS1_3_VERSION)
-+ #ADD_DEFINITIONS(-DHAVE_TLSv13)
- ENDIF()
- 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/mysql56-server/files/patch-extra_CMakeLists.txt b/databases/mysql56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 6bd2fd069171..000000000000
--- a/databases/mysql56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt 2013-02-13 14:35:11.000000000 +0100
-@@ -102,8 +102,10 @@
- TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
- TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
- ENDIF()
-+ENDIF()
-
diff --git a/databases/mysql56-server/files/patch-include_CMakeLists.txt b/databases/mysql56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5d5e96a0f1d7..000000000000
--- a/databases/mysql56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100
-@@ -65,10 +65,12 @@
- ${HEADERS_GEN_CONFIGURE}
- )
-
-+IF(FALSE)
- 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/mysql56-server/files/patch-include_my_compare.h b/databases/mysql56-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql56-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig 2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h 2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
- 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/mysql56-server/files/patch-include_myisam.h b/databases/mysql56-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
- 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/mysql56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 4b4c58856b9f..000000000000
--- a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- libmysql/CMakeLists.txt.orig 2020-01-01 21:38:55.670126000 +0100
-+++ libmysql/CMakeLists.txt 2020-01-01 21:47:51.799099000 +0100
-@@ -205,7 +205,7 @@ IF(WIN32)
- ENDIF()
-
- # Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
-
- # Visual Studio users need debug static library for debug projects
-@@ -234,20 +234,23 @@ IF(UNIX)
- ENDMACRO()
- ENDIF()
-
-+IF(FALSE)
- IF(UNIX)
- GET_TARGET_NAME(mysqlclient lib_name)
- INSTALL_SYMLINK(mysqlclient
- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
- ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
-
- IF(NOT DISABLE_SHARED)
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
- EXPORTS ${CLIENT_API_FUNCTIONS}
-- COMPONENT SharedLibraries)
-+ COMPONENT SharedLibraries NOINSTALL)
- TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+ IF(FALSE)
- IF(UNIX)
- # libtool compatability
- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
- ${INSTALL_LIBDIR} SharedLibraries)
- ENDFOREACH()
- ENDIF()
-+ ENDIF()
- ENDIF()
diff --git a/databases/mysql56-server/files/patch-libservices_CMakeLists.txt b/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
- my_thread_scheduler_service.c)
-
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysql56-server/files/patch-man_CMakeLists.txt b/databases/mysql56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/mysql56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200
-@@ -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/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc
deleted file mode 100644
index 0d1dea6cf6cb..000000000000
--- a/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- const unsigned char *key, uint32 key_length,
- enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX stack_ctx;
- EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
- return MY_AES_BAD_DATA;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-
-@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
- goto aes_error; /* Error */
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- aes_error:
- /* need to explicitly clean up the error if we want to ignore it */
- ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- const unsigned char *key, uint32 key_length,
- enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX stack_ctx;
- EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
- return MY_AES_BAD_DATA;
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-
-@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
- goto aes_error; /* Error */
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
-@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- aes_error:
- /* need to explicitly clean up the error if we want to ignore it */
- ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- EVP_CIPHER_CTX_free(ctx);
diff --git a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index fa06468ce959..000000000000
--- a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
-+++ mysys_ssl/my_default.cc
-@@ -110,7 +110,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;
-
-@@ -903,6 +903,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++;
-@@ -1241,7 +1249,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);
- }
- }
- }
-@@ -1400,13 +1409,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
-
-@@ -1477,7 +1481,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/mysql56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
deleted file mode 100644
index 653f03095030..000000000000
--- a/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000
-+++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000
-@@ -16,6 +16,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.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/mysql56-server/files/patch-scripts_CMakeLists.txt b/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index ef7b3a1b506b..000000000000
--- a/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100
-@@ -264,6 +264,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()
-@@ -314,15 +316,10 @@
- # On Unix, most of the files end up in the bin directory
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(BIN_SCRIPTS
-- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_zap
-- mysqlaccess
-- mysqlaccess.conf
- mysql_convert_table_format
-- mysql_find_rows
- mysqlhotcopy
- mysqldumpslow
- mysqld_multi
-@@ -331,7 +328,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/mysql56-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
-
- if test -z "$MYSQL_HOME"
- then
-- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
- then
- log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
-
-@@ -254,7 +254,7 @@
- then
- log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
- MYSQL_HOME=$DATADIR
- else
- MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql56-server/files/patch-sql-common_client.c b/databases/mysql56-server/files/patch-sql-common_client.c
deleted file mode 100644
index cfc168b75a53..000000000000
--- a/databases/mysql56-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- sql-common/client.c.orig 2019-11-26 16:53:45 UTC
-+++ sql-common/client.c
-@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
- goto error;
- }
-
-- cn= (char *) ASN1_STRING_data(cn_asn1);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+ cn= (const char *) ASN1_STRING_data(cn_asn1);
-+#else
-+ cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif
-
- // There should not be any NULL embedded in the CN
- if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/databases/mysql56-server/files/patch-sql_CMakeLists.txt b/databases/mysql56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 2eeb4edfd51c..000000000000
--- a/databases/mysql56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200
-+++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200
-@@ -423,6 +423,7 @@
-
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt )
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -467,6 +468,7 @@
- INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
-
- ADD_CUSTOM_TARGET(show-dist-name
- COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/mysql56-server/files/patch-sql_mysqld.cc b/databases/mysql56-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index debee80ea2ce..000000000000
--- a/databases/mysql56-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- sql/mysqld.cc.orig 2019-11-26 16:53:45 UTC
-+++ sql/mysqld.cc
-@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
- *opt_ssl_crlpath= NULL;
-
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/crypto.h>
- typedef struct CRYPTO_dynlock_value
- {
-@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
- mysql_mutex_destroy(&LOCK_connection_count);
- #ifdef HAVE_OPENSSL
- mysql_mutex_destroy(&LOCK_des_key_file);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- for (int i= 0; i < CRYPTO_num_locks(); ++i)
- mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
- OPENSSL_free(openssl_stdlocks);
-@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
-
- // Clean up errors now, before possibly waiting for a new connection.
- #ifndef EMBEDDED_LIBRARY
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-@@ -4252,7 +4252,7 @@ static int init_thread_environment()
- #ifdef HAVE_OPENSSL
- mysql_mutex_init(key_LOCK_des_key_file,
- &LOCK_des_key_file, MY_MUTEX_INIT_FAST);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
- sizeof(openssl_lock_t));
- for (int i= 0; i < CRYPTO_num_locks(); ++i)
-@@ -4301,7 +4301,7 @@ static int init_thread_environment()
- OpenSSL 1.1 supports native platform threads,
- so we don't need the following callback functions.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- static unsigned long openssl_id_function()
- {
-@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
- 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();
-@@ -4392,7 +4392,7 @@ static int init_ssl()
- opt_ssl_cipher, &error,
- opt_ssl_crl, opt_ssl_crlpath);
- DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- if (!ssl_acceptor_fd)
diff --git a/databases/mysql56-server/files/patch-sql_sys_vars.cc b/databases/mysql56-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/mysql56-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
- "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",
-@@ -1401,7 +1401,7 @@
- "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));
-
-@@ -1416,7 +1416,7 @@
- "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));
-
-@@ -2257,7 +2257,7 @@
- "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));
-
- /** propagates changes to the relevant flag of @@optimizer_switch */
diff --git a/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc b/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
deleted file mode 100644
index 1b4ba6429308..000000000000
--- a/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/handler/i_s.cc.orig 2020-03-09 10:37:59 UTC
-+++ storage/innobase/handler/i_s.cc
-@@ -43,6 +43,10 @@ Created July 18, 2007 Vasil Dimov
- #include <sql_plugin.h>
- #include <mysql/innodb_priv.h>
-
-+#include <string>
-+#include <sstream>
-+#include <iostream>
-+
- #include "btr0pcur.h"
- #include "btr0types.h"
- #include "dict0dict.h"
diff --git a/databases/mysql56-server/files/patch-support-files_CMakeLists.txt b/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
- INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
- ENDIF()
-
-+IF(FALSE)
- INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
- CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
- CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
- CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/mysql56-server/files/patch-vio_vio.c b/databases/mysql56-server/files/patch-vio_vio.c
deleted file mode 100644
index 042c4d65e8f2..000000000000
--- a/databases/mysql56-server/files/patch-vio_vio.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vio/vio.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/vio.c
-@@ -394,7 +394,7 @@ void vio_end(void)
- {
- #if defined(HAVE_OPENSSL)
- // This one is needed on the client side
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- ERR_free_strings();
diff --git a/databases/mysql56-server/files/patch-vio_viossl.c b/databases/mysql56-server/files/patch-vio_viossl.c
deleted file mode 100644
index 54a6280525fc..000000000000
--- a/databases/mysql56-server/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/viossl.c
-@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
- DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
- SSL_clear(ssl);
- SSL_set_fd(ssl, sd);
--#if defined(SSL_OP_NO_COMPRESSION)
-+#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER)
- SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
- #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
- sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
-@@ -403,7 +403,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/mysql56-server/files/patch-vio_viosslfactories.c b/databases/mysql56-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index dd1293395898..000000000000
--- a/databases/mysql56-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- vio/viosslfactories.c.orig 2019-11-26 16:53:45 UTC
-+++ vio/viosslfactories.c
-@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
- DH_free(dh);
- return NULL;
- }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- dh->p= p;
- dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- struct st_VioSSLFd *ssl_fd;
- /* MySQL 5.6 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 */
- SSL_OP_NO_TICKET;
-@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- DBUG_RETURN(0);
-
- if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- SSLv23_client_method() :
- SSLv23_server_method()
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-
- SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
-
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
- /*
- MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
- */
diff --git a/databases/mysql56-server/files/pkg-message.in b/databases/mysql56-server/files/pkg-message.in
deleted file mode 100644
index 70f7b439a1dd..000000000000
--- a/databases/mysql56-server/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Please keep in mind that the default location for my.cnf will be changed
-from "/var/db/mysql/my.cnf" to "%%ETCDIR%%/my.cnf" in the near
-future. If you do not want to move your my.cnf to the new location then
-you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
-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
-}
-]
diff --git a/databases/mysql56-server/pkg-descr b/databases/mysql56-server/pkg-descr
deleted file mode 100644
index 25356d859e88..000000000000
--- a/databases/mysql56-server/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
diff --git a/databases/mysql56-server/pkg-plist b/databases/mysql56-server/pkg-plist
deleted file mode 100644
index 5b83cf5b58e2..000000000000
--- a/databases/mysql56-server/pkg-plist
+++ /dev/null
@@ -1,138 +0,0 @@
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/libdaemon_example.so
-%%EXAMPLE%%lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_udf_services.so
-%%EXAMPLE%%lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-libexec/mysqld
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/myisam_ftdump.1.gz
-share/man/man1/myisamchk.1.gz
-share/man/man1/myisamlog.1.gz
-share/man/man1/myisampack.1.gz
-share/man/man1/mysql.server.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_fix_extensions.1.gz
-share/man/man1/mysql_install_db.1.gz
-share/man/man1/mysql_plugin.1.gz
-share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-share/man/man1/mysql_tzinfo_to_sql.1.gz
-share/man/man1/mysql_upgrade.1.gz
-share/man/man1/mysql_zap.1.gz
-share/man/man1/mysqlbug.1.gz
-share/man/man1/mysqld_multi.1.gz
-share/man/man1/mysqld_safe.1.gz
-share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlman.1.gz
-share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-share/man/man1/resolve_stack_dump.1.gz
-share/man/man1/resolveip.1.gz
-share/man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%ETCDIR%%/my.cnf.sample
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/www/typo3-11/Makefile b/www/typo3-11/Makefile
index 7e4b4193ad07..dbe76f6b11fb 100644
--- a/www/typo3-11/Makefile
+++ b/www/typo3-11/Makefile
@@ -13,7 +13,7 @@ WWW= https://typo3.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-IGNORE_WITH_MYSQL= 56 101m
+IGNORE_WITH_MYSQL= 101m
USES= cpe php:web,flavors shebangfix
USE_PHP= ctype dom fileinfo filter intl session simplexml \
diff --git a/www/typo3-12/Makefile b/www/typo3-12/Makefile
index f813816f7ea4..c96b3f1e4c96 100644
--- a/www/typo3-12/Makefile
+++ b/www/typo3-12/Makefile
@@ -13,7 +13,7 @@ WWW= https://typo3.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-IGNORE_WITH_MYSQL= 56 57 101m 102m
+IGNORE_WITH_MYSQL= 57 101m 102m
IGNORE_WITH_PHP= 80 82 83
USES= cpe php:web,flavors shebangfix