Date: Wed, 15 Jan 2020 21:02:13 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r523163 - in branches/2020Q1/databases: mysql80-client mysql80-server mysql80-server/files Message-ID: <202001152102.00FL2DrI055326@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Wed Jan 15 21:02:12 2020 New Revision: 523163 URL: https://svnweb.freebsd.org/changeset/ports/523163 Log: MFH: r523155 databases/mysql80-{client, server}: Update to latest release 8.0.19 - New FPROFILE_GENERATE and FPROFILE_USE CMake options are available for experimenting with profile guided optimization (PGO) with GCC. See the cmake/fprofile.cmake in a MySQL source distribution for information about using them. These options have been tested with GCC 8 and 9, and with Clang. - Enabling FPROFILE_USE also enables WITH_LTO (link time optimization). - Innodb_system_rows_read, Innodb_system_rows_inserted, Innodb_system_rows_deleted status variables were added for counting row operations on InnoDB tables that belong to system-created schemas. The new status variables are similar to the existing Innodb_rows_read, Innodb_rows_inserted, Innodb_rows_deleted status variables, which count operations on InnoDB tables that belong to both user-created and system-created schemas. - The new status variables are useful in replication environments where relay_log_info_repository and master_info_repository variables are set to TABLE, resulting in higher row operation counts on slaves due to operations performed on the slave_master_info, slave_replay_log_info, and slave_worker_info tables, which belong to the system-created mysql schema. For a valid comparison of master and slave row operation counts, operations on tables in system-created schemas can now be excluded using the count data provided by the new status variables. More infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-19.html Submitted by: fluffy Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH Security: a6cf65ad-37d2-11ea-a1c7-b499baebfeaf Approved by: ports-secteam (with hat) Added: branches/2020Q1/databases/mysql80-server/files/patch-cmake_install_layout.cmake - copied unchanged from r523155, head/databases/mysql80-server/files/patch-cmake_install_layout.cmake branches/2020Q1/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt - copied unchanged from r523155, head/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt - copied unchanged from r523155, head/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt - copied unchanged from r523155, head/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt Deleted: branches/2020Q1/databases/mysql80-server/files/patch-plugin-x-client-mysqlxclient-xmessage.h branches/2020Q1/databases/mysql80-server/files/patch-plugin-x-ngs-include-ngs-protocol-protocol_protobuf.h Modified: branches/2020Q1/databases/mysql80-client/pkg-plist branches/2020Q1/databases/mysql80-server/Makefile branches/2020Q1/databases/mysql80-server/distinfo branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc branches/2020Q1/databases/mysql80-server/pkg-plist Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/databases/mysql80-client/pkg-plist ============================================================================== --- branches/2020Q1/databases/mysql80-client/pkg-plist Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-client/pkg-plist Wed Jan 15 21:02:12 2020 (r523163) @@ -1,3 +1,4 @@ +bin/comp_err bin/my_print_defaults bin/mysql bin/mysql_config @@ -22,7 +23,9 @@ include/mysql/dur_prop.h include/mysql/errmsg.h include/mysql/field_types.h include/mysql/ft_global.h +include/mysql/guard.h include/mysql/heap.h +include/mysql/integer_digits.h include/mysql/keycache.h include/mysql/lex_string.h include/mysql/lf.h @@ -89,7 +92,6 @@ include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h include/mysql/mysql/client_plugin.h.pp include/mysql/mysql/com_data.h -include/mysql/mysql/get_password.h include/mysql/mysql/group_replication_priv.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/mysql_lex_string.h @@ -169,6 +171,7 @@ include/mysql/sql_string.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/tables_contained_in.h include/mysql/template_utils.h include/mysql/thr_cond.h include/mysql/thr_lock.h Modified: branches/2020Q1/databases/mysql80-server/Makefile ============================================================================== --- branches/2020Q1/databases/mysql80-server/Makefile Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/Makefile Wed Jan 15 21:02:12 2020 (r523163) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 8.0.18 +PORTVERSION= 8.0.19 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 Modified: branches/2020Q1/databases/mysql80-server/distinfo ============================================================================== --- branches/2020Q1/databases/mysql80-server/distinfo Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/distinfo Wed Jan 15 21:02:12 2020 (r523163) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578004259 -SHA256 (mysql-boost-8.0.18.tar.gz) = 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b -SIZE (mysql-boost-8.0.18.tar.gz) = 194953221 +TIMESTAMP = 1578922201 +SHA256 (mysql-boost-8.0.19.tar.gz) = 3622d2a53236ed9ca62de0616a7e80fd477a9a3f862ba09d503da188f53ca523 +SIZE (mysql-boost-8.0.19.tar.gz) = 264147972 Modified: branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ CMakeLists.txt -@@ -1181,10 +1181,10 @@ ENDIF() +@@ -1191,10 +1191,10 @@ ENDIF() MYSQL_CHECK_SSL() MYSQL_CHECK_SSL_DLLS() @@ -14,7 +14,7 @@ # Add lz4 library MYSQL_CHECK_LZ4() # Add icu library -@@ -1273,7 +1273,9 @@ IF(WITH_UNIT_TESTS) +@@ -1283,7 +1283,9 @@ IF(WITH_UNIT_TESTS) INCLUDE(googletest) ENDIF() @@ -25,7 +25,7 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) -@@ -1314,24 +1316,29 @@ IF(WITH_UNIT_TESTS) +@@ -1324,12 +1326,17 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() @@ -41,11 +41,11 @@ ADD_SUBDIRECTORY(libservices) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(testclients) + ADD_SUBDIRECTORY(share) + ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) ENDIF() - +@@ -1351,11 +1358,11 @@ ENDIF() # scripts/mysql_config depends on client and server targets loaded above. # It is referenced by some of the directories below, so we insert it here. ADD_SUBDIRECTORY(scripts) @@ -58,7 +58,7 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF() -@@ -1440,6 +1447,7 @@ IF(PACK_SEPARATE_COMPONENTS) +@@ -1464,6 +1471,7 @@ IF(PACK_SEPARATE_COMPONENTS) SET(CPACK_COMPONENTS_GROUPING IGNORE) ENDIF() @@ -66,7 +66,7 @@ IF(UNIX) INSTALL(FILES Docs/mysql.info -@@ -1474,6 +1482,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -1498,6 +1506,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "README.build" EXCLUDE ) Copied: branches/2020Q1/databases/mysql80-server/files/patch-cmake_install_layout.cmake (from r523155, head/databases/mysql80-server/files/patch-cmake_install_layout.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-cmake_install_layout.cmake Wed Jan 15 21:02:12 2020 (r523163, copy of r523155, head/databases/mysql80-server/files/patch-cmake_install_layout.cmake) @@ -0,0 +1,96 @@ +--- cmake/install_layout.cmake.orig 2019-12-09 19:53:17 UTC ++++ cmake/install_layout.cmake +@@ -41,6 +41,10 @@ + # Build with prefix=/usr/local/mysql, create tarball with install prefix="." + # and relative links. + # ++# FREEBSD ++# Build with prefix=/usr/local, create tarball with install prefix="." ++# and relative links. ++# + # To force a directory layout, use -DINSTALL_LAYOUT=<layout>. + # + # The default is STANDALONE. +@@ -80,7 +84,7 @@ IF(NOT INSTALL_LAYOUT) + ENDIF() + + SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}" +- CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4" ++ CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4" + ) + + IF(UNIX) +@@ -98,7 +102,7 @@ IF(UNIX) + CACHE PATH "install prefix" FORCE) + ENDIF() + SET(VALID_INSTALL_LAYOUTS +- "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE") ++ "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE") + LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind) + IF(ind EQUAL -1) + MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}." +@@ -159,6 +163,32 @@ SET(INSTALL_MYSQLKEYRINGDIR_STANDALONE "keyring") + SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path}) + + # ++# FREEBSD layout ++# ++SET(INSTALL_BINDIR_FREEBSD "bin") ++SET(INSTALL_SBINDIR_FREEBSD "bin") ++# ++SET(INSTALL_LIBDIR_FREEBSD "lib") ++SET(INSTALL_PRIV_LIBDIR_FREEBSD "lib/private") ++SET(INSTALL_PLUGINDIR_FREEBSD "lib/plugin") ++# ++SET(INSTALL_INCLUDEDIR_FREEBSD "include") ++# ++SET(INSTALL_DOCDIR_FREEBSD "docs") ++SET(INSTALL_DOCREADMEDIR_FREEBSD ".") ++SET(INSTALL_MANDIR_FREEBSD "man") ++SET(INSTALL_INFODIR_FREEBSD "docs") ++# ++SET(INSTALL_SHAREDIR_FREEBSD "share") ++SET(INSTALL_MYSQLSHAREDIR_FREEBSD "share") ++SET(INSTALL_MYSQLTESTDIR_FREEBSD "mysql-test") ++SET(INSTALL_SUPPORTFILESDIR_FREEBSD "support-files") ++# ++SET(INSTALL_MYSQLDATADIR_FREEBSD "data") ++SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD "keyring") ++SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path}) ++ ++# + # TARGZ layout + # + SET(INSTALL_BINDIR_TARGZ "bin") +@@ -345,7 +375,7 @@ ENDIF() + + # Install layout for router, follows the same pattern as above. + # +-# Supported layouts here are STANDALONE, RPM, DEB, SVR4, TARGZ ++# Supported layouts here are STANDALONE, FREEBSD, RPM, DEB, SVR4, TARGZ + + # Variables ROUTER_INSTALL_${X}DIR, where + # X = BIN, LIB and DOC is using +@@ -387,7 +417,7 @@ ENDIF() + SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}" + CACHE + STRING +- "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ") ++ "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ") + + # If are _pure_ STANDALONE we can write into data/ as it is all ours + # if we are shared STANDALONE with the the server, we shouldn't write +@@ -400,6 +430,13 @@ SET(ROUTER_INSTALL_CONFIGDIR_STANDALONE ".") + SET(ROUTER_INSTALL_DATADIR_STANDALONE "var/lib/mysqlrouter") + SET(ROUTER_INSTALL_LOGDIR_STANDALONE ".") + SET(ROUTER_INSTALL_RUNTIMEDIR_STANDALONE "run") ++# ++# FreeBSD layout ++# ++SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD "/usr/local/etc/mysqlrouter") ++SET(ROUTER_INSTALL_DATADIR_FREEBSD "/var/db/mysqlrouter") ++SET(ROUTER_INSTALL_LOGDIR_FREEBSD "/var/log/mysqlrouter") ++SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter") + # + # RPM layout + # Modified: branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-include_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +--- include/CMakeLists.txt.orig 2019-12-09 19:53:17 UTC +++ include/CMakeLists.txt -@@ -37,10 +37,171 @@ SET(HEADERS +@@ -37,10 +37,173 @@ SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h field_types.h @@ -13,7 +13,9 @@ + dur_prop.h + errmsg.h + ft_global.h ++ guard.h + heap.h ++ integer_digits.h + keycache.h + lex_string.h + lf.h @@ -110,6 +112,7 @@ + sslopt-case.h + sslopt-longopts.h + sslopt-vars.h ++ tables_contained_in.h + template_utils.h + thr_cond.h + thr_lock.h @@ -127,7 +130,6 @@ + mysql/client_authentication.h + mysql/client_plugin.h.pp + mysql/com_data.h -+ mysql/get_password.h + mysql/group_replication_priv.h + mysql/innodb_priv.h + mysql/mysql_lex_string.h Modified: branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,6 @@ --- plugin/x/client/xconnection_impl.cc.orig 2019-09-20 08:30:51 UTC +++ plugin/x/client/xconnection_impl.cc -@@ -521,6 +521,7 @@ XError Connection_impl::get_ssl_error(const int error_ +@@ -520,6 +520,7 @@ XError Connection_impl::get_ssl_error(const int error_ return XError(CR_SSL_CONNECTION_ERROR, buffer); } @@ -8,7 +8,7 @@ /** Set fips mode in openssl library, When we set fips mode ON/STRICT, it will perform following operations: -@@ -559,6 +560,7 @@ int set_fips_mode(const uint fips_mode, char err_strin +@@ -559,6 +560,7 @@ int set_fips_mode(const uint32_t fips_mode, EXIT: return rc; } @@ -16,14 +16,15 @@ XError Connection_impl::activate_tls() { if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET); -@@ -569,11 +571,13 @@ XError Connection_impl::activate_tls() { +@@ -569,12 +571,14 @@ XError Connection_impl::activate_tls() { if (!m_context->m_ssl_config.is_configured()) return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true}; +#ifndef LIBRESSL_VERSION_NUMBER char err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - if (set_fips_mode(static_cast<int>(m_context->m_ssl_config.m_ssl_fips_mode), - err_string) != 1) { + if (set_fips_mode( + static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode), + err_string) != 1) { return XError{CR_SSL_CONNECTION_ERROR, err_string, true}; } +#endif Copied: branches/2020Q1/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt (from r523155, head/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163, copy of r523155, head/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt) @@ -0,0 +1,10 @@ +--- router/src/harness/src/CMakeLists.txt.orig 2019-12-09 19:53:17 UTC ++++ router/src/harness/src/CMakeLists.txt +@@ -200,7 +200,6 @@ IF(NOT WIN32) + INSTALL(TARGETS harness-library + LIBRARY + DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router +- NAMELINK_SKIP + ) + ELSE() + INSTALL(TARGETS harness-library Copied: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt (from r523155, head/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163, copy of r523155, head/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt) @@ -0,0 +1,10 @@ +--- router/src/http/src/CMakeLists.txt.orig 2019-12-09 19:53:17 UTC ++++ router/src/http/src/CMakeLists.txt +@@ -62,7 +62,6 @@ INSTALL(TARGETS http_common + RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router + ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router + LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router +- NAMELINK_SKIP + ) + + ## split library code from the plugin to use them _passwd and tests Modified: branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_http_src_tls__context.cc Wed Jan 15 21:02:12 2020 (r523163) @@ -32,3 +32,13 @@ case 0: return TlsVersion::AUTO; default: +@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c + } + + int TlsContext::security_level() const { +-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) ++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \ ++ !defined(LIBRESSL_VERSION_NUMBER) + return SSL_CTX_get_security_level(ssl_ctx_.get()); + #else + return 0; Copied: branches/2020Q1/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt (from r523155, head/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163, copy of r523155, head/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt) @@ -0,0 +1,10 @@ +--- router/src/router/src/CMakeLists.txt.orig 2019-12-09 19:53:17 UTC ++++ router/src/router/src/CMakeLists.txt +@@ -119,7 +119,6 @@ INSTALL(TARGETS router_lib + RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router + ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router + LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router +- NAMELINK_SKIP + ) + + MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring Modified: branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-scripts_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,6 @@ --- scripts/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ scripts/CMakeLists.txt -@@ -327,7 +327,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -330,7 +330,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS) FOREACH(lib ${${target}_LIB_DEPENDS}) # Filter out "general", it is not a library, just CMake hint @@ -9,7 +9,7 @@ IF (lib MATCHES "^\\-l") SET(${var} "${${var}} ${lib} ") ELSEIF (lib MATCHES "^\\-L") -@@ -337,6 +337,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -340,6 +340,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} " ) @@ -18,12 +18,22 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -423,18 +425,23 @@ ELSE() +@@ -414,7 +416,7 @@ ELSE() + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) +- IF(INSTALL_PKGCONFIGDIR) ++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} +@@ -427,23 +429,28 @@ ELSE() + # mysqld_safe used in mtr even for systemd platforms IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow + mysqld_safe ) ELSE() SET(BIN_SCRIPTS @@ -41,24 +51,11 @@ + ) + ENDIF(NOT WITHOUT_CLIENTLIBS) + - SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) - STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") - SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig") -@@ -449,7 +456,7 @@ ELSE() - ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} - ESCAPE_QUOTES @ONLY) - -- IF(INSTALL_PKGCONFIGDIR) -+ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) - MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") - INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} -@@ -462,7 +469,7 @@ ELSE() 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) +- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY ++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY + ) + ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in Modified: branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-sql_mysqld.cc Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,6 @@ --- sql/mysqld.cc.orig 2019-09-20 08:30:51 UTC +++ sql/mysqld.cc -@@ -4797,7 +4797,7 @@ static int init_thread_environment() { +@@ -4818,7 +4818,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; @@ -9,3 +9,18 @@ #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int +@@ -4854,12 +4854,14 @@ static void init_ssl() { + } + + static int init_ssl_communication() { ++#ifndef LIBRESSL_VERSION_NUMBER + char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; + int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); + if (ret_fips_mode != 1) { + LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); + return 1; + } ++#endif /* LIBRESSL_VERSION_NUMBER */ + if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; + + #if OPENSSL_VERSION_NUMBER < 0x10100000L Modified: branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-support-files_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163) @@ -12,16 +12,16 @@ SET(localstatedir "${MYSQL_DATADIR}") -@@ -39,6 +40,7 @@ ELSE() - SET (PIDOF "pgrep -d' ' -f") - ENDIF() +@@ -45,6 +46,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.serve + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in + ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY) +IF(NOT WITHOUT_SERVER) - FOREACH(script - mysql.server - mysqld_multi.server -@@ -54,3 +56,4 @@ FOREACH(script - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - ENDFOREACH() + INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysql.server + COMPONENT Server_Scripts + DESTINATION ${INSTALL_SUPPORTFILESDIR} +@@ -62,3 +64,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro + OWNER_READ OWNER_WRITE + GROUP_READ WORLD_READ + ) +ENDIF() Modified: branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-utilities_CMakeLists.txt Wed Jan 15 21:02:12 2020 (r523163) @@ -1,6 +1,28 @@ --- utilities/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC +++ utilities/CMakeLists.txt -@@ -99,10 +99,30 @@ IF(APPLE AND HAVE_CRYPTO_DYLIB AND HAVE_OPENSSL_DYLIB) +@@ -22,13 +22,19 @@ + + ADD_WSHADOW_WARNING() + +-IF(NOT CMAKE_CROSSCOMPILING) ++IF(WITHOUT_CLIENTLIBS) + MYSQL_ADD_EXECUTABLE(comp_err + comp_err.cc + COMPONENT Server + LINK_LIBRARIES mysys ++ SKIP_INSTALL) ++ELSE(WITHOUT_CLIENTLIBS) ++ MYSQL_ADD_EXECUTABLE(comp_err ++ comp_err.cc ++ COMPONENT Server ++ LINK_LIBRARIES mysys + ) +-ENDIF() ++ENDIF(WITHOUT_CLIENTLIBS) + + MYSQL_ADD_EXECUTABLE(comp_client_err + comp_client_err.cc +@@ -120,10 +126,30 @@ IF(LINUX_INSTALL_RPATH_ORIGIN) ADD_DEPENDENCIES(comp_err copy_openssl_dlls) ENDIF() @@ -31,7 +53,7 @@ ) MYSQL_ADD_EXECUTABLE(perror perror.cc -@@ -117,14 +137,25 @@ IF(BUILD_BUNDLED_LZ4) +@@ -138,14 +164,25 @@ IF(BUILD_BUNDLED_LZ4) LINK_LIBRARIES ${LZ4_LIBRARY} mysys ) ENDIF() Modified: branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc ============================================================================== --- branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/files/patch-vio_viossl.cc Wed Jan 15 21:02:12 2020 (r523163) @@ -1,5 +1,15 @@ --- vio/viossl.cc.orig 2019-09-20 08:30:51 UTC +++ vio/viossl.cc +@@ -45,7 +45,8 @@ + BIO_set_callback_ex was added in openSSL 1.1.1 + For older openSSL, use the deprecated BIO_set_callback. + */ +-#if OPENSSL_VERSION_NUMBER >= 0x10101000L ++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \ ++ !defined(LIBRESSL_VERSION_NUMBER) + #define HAVE_BIO_SET_CALLBACK_EX + #endif + @@ -490,7 +490,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l #if !defined(DBUG_OFF) { Modified: branches/2020Q1/databases/mysql80-server/pkg-plist ============================================================================== --- branches/2020Q1/databases/mysql80-server/pkg-plist Wed Jan 15 20:58:31 2020 (r523162) +++ branches/2020Q1/databases/mysql80-server/pkg-plist Wed Jan 15 21:02:12 2020 (r523163) @@ -21,7 +21,6 @@ bin/mysqlrouter_plugin_info bin/mysqltest bin/mysqltest_safe_process bin/mysqlxtest -lib/mysql/libmysqlharness.a lib/mysql/libmysqlharness.so lib/mysql/libmysqlharness.so.1 lib/mysql/libmysqlrouter.so @@ -75,6 +74,7 @@ lib/mysql/plugin/component_test_sys_var_service_same.s lib/mysql/plugin/component_test_sys_var_service_str.so lib/mysql/plugin/component_test_system_variable_source.so lib/mysql/plugin/component_test_udf_registration.so +@comment lib/mysql/plugin/component_test_udf_services.so lib/mysql/plugin/component_udf_reg_3_func.so lib/mysql/plugin/component_udf_reg_avg_func.so lib/mysql/plugin/component_udf_reg_int_func.so @@ -91,6 +91,7 @@ lib/mysql/plugin/ddl_rewriter.so lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/ha_mock.so +lib/mysql/plugin/component_test_udf_services.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so @@ -190,7 +191,6 @@ man/man8/mysqld.8.gz %%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys -%%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys @@ -201,6 +201,8 @@ man/man8/mysqld.8.gz %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/messages_to_clients.txt +%%DATADIR%%/messages_to_error_log.txt %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysqld_multi.server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001152102.00FL2DrI055326>