git: 1fb68a4d5483 - main - databases/mysql56-*: Sunset
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Jun 2023 01:44:27 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1fb68a4d5483cd0ac802a916d240def524eabce7
commit 1fb68a4d5483cd0ac802a916d240def524eabce7
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-30 01:32:12 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-30 01:40:48 +0000
databases/mysql56-*: Sunset
2023-06-30 databases/mysql56-*: Upstream support ended in February 2021
Approved by: portmgr (blanket)
---
MOVED | 2 +
Mk/Uses/mysql.mk | 1 -
Mk/bsd.default-versions.mk | 2 +-
databases/Makefile | 2 -
databases/ateam_mysql57_ldap_auth/Makefile | 2 +-
databases/mysql-connector-odbc-80/Makefile | 2 +-
databases/mysql56-client/Makefile | 35 -----
.../mysql56-client/files/patch-CMakeLists.txt | 40 ------
.../files/patch-client_CMakeLists.txt | 43 ------
...ake_build_configurations_compiler_options.cmake | 20 ---
.../mysql56-client/files/patch-cmake_ssl.cmake | 54 -------
.../files/patch-extra_CMakeLists.txt | 32 -----
.../files/patch-include-CMakeLists.txt | 10 --
.../files/patch-include_my_compare.h | 11 --
.../mysql56-client/files/patch-include_myisam.h | 11 --
.../mysql56-client/files/patch-man_CMakeLists.txt | 15 --
.../files/patch-mysys__ssl_my__aes__openssl.cc | 74 ----------
.../files/patch-mysys_ssl_my_default.cc | 61 --------
.../files/patch-scripts_CMakeLists.txt | 93 ------------
.../mysql56-client/files/patch-sql-common_client.c | 15 --
databases/mysql56-client/files/patch-sql_mysqld.cc | 65 ---------
.../files/patch-support-files_CMakeLists.txt | 40 ------
databases/mysql56-client/files/patch-vio_vio.c | 11 --
databases/mysql56-client/files/patch-vio_viossl.c | 20 ---
.../files/patch-vio_viosslfactories.c | 38 -----
databases/mysql56-client/pkg-message | 16 ---
databases/mysql56-client/pkg-plist | 111 --------------
databases/mysql56-server/Makefile | 160 ---------------------
databases/mysql56-server/distinfo | 3 -
.../files/extra-patch-config.h.cmake | 12 --
databases/mysql56-server/files/my.cnf.sample.in | 61 --------
databases/mysql56-server/files/mysql-server.in | 79 ----------
.../mysql56-server/files/patch-CMakeLists.txt | 42 ------
.../files/patch-client_CMakeLists.txt | 65 ---------
.../mysql56-server/files/patch-cmake_plugin.cmake | 12 --
.../mysql56-server/files/patch-cmake_ssl.cmake | 26 ----
.../files/patch-extra_CMakeLists.txt | 13 --
.../files/patch-include_CMakeLists.txt | 15 --
.../files/patch-include_my_compare.h | 11 --
.../mysql56-server/files/patch-include_myisam.h | 11 --
.../files/patch-libmysql_CMakeLists.txt | 42 ------
.../files/patch-libservices_CMakeLists.txt | 9 --
.../mysql56-server/files/patch-man_CMakeLists.txt | 11 --
.../files/patch-mysys__ssl_my__aes__openssl.cc | 74 ----------
.../files/patch-mysys_ssl_my_default.cc | 61 --------
...plugin_password_validation_validate_password.cc | 11 --
.../files/patch-scripts_CMakeLists.txt | 36 -----
.../files/patch-scripts_mysqld_safe.sh | 24 ----
.../mysql56-server/files/patch-sql-common_client.c | 15 --
.../mysql56-server/files/patch-sql_CMakeLists.txt | 18 ---
databases/mysql56-server/files/patch-sql_mysqld.cc | 65 ---------
.../mysql56-server/files/patch-sql_sys_vars.cc | 38 -----
.../files/patch-storage_innobase_handler_i_s.cc | 13 --
.../files/patch-support-files_CMakeLists.txt | 12 --
databases/mysql56-server/files/patch-vio_vio.c | 11 --
databases/mysql56-server/files/patch-vio_viossl.c | 20 ---
.../files/patch-vio_viosslfactories.c | 38 -----
databases/mysql56-server/files/pkg-message.in | 16 ---
databases/mysql56-server/pkg-descr | 2 -
databases/mysql56-server/pkg-plist | 138 ------------------
www/typo3-11/Makefile | 2 +-
www/typo3-12/Makefile | 2 +-
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
*** 1496 LINES SKIPPED ***