Date: Mon, 13 May 2019 19:30:23 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r501589 - in branches/2019Q2/databases: mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201905131930.x4DJUNhr076350@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Mon May 13 19:30:22 2019 New Revision: 501589 URL: https://svnweb.freebsd.org/changeset/ports/501589 Log: MFH: r500373 databases/mysql57-{client, server}: Update to latest release 5.7.26 This update includes: Bugfix: - InnoDB: Optimized internal temporary tables did not support in-place UPDATE operations - InnoDB: A function called by a CREATE TABLE thread attempted access after free() - InnoDB: The INDEX_LENGTH value in INFORMATION_SCHEMA.TABLES was not updated when adding an index - The authentication_ldap_simple plugin could enforce authentication incorrectly More info: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-26.html Security Fix: CVE-2019-2632, CVE-2019-1559, CVE-2018-3123, and other fixes. More info: https://www.oracle.com/technetwork/security-advisory/cpuapr2019-5072813.html#AppendixMSQL PR: 237399 Reported by: Brent Busby <brent@jfi.uchicago.edu> Sponsored by: The FreeBSD Foundation Approved by: ports-secteam (feld, CVE-patch blanket) Modified: branches/2019Q2/databases/mysql57-client/files/patch-cmake_plugin.cmake branches/2019Q2/databases/mysql57-server/Makefile branches/2019Q2/databases/mysql57-server/distinfo branches/2019Q2/databases/mysql57-server/files/patch-cmake_plugin.cmake branches/2019Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt branches/2019Q2/databases/mysql57-server/pkg-plist Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/databases/mysql57-client/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2019Q2/databases/mysql57-client/files/patch-cmake_plugin.cmake Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-client/files/patch-cmake_plugin.cmake Mon May 13 19:30:22 2019 (r501589) @@ -1,25 +1,25 @@ --- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake @@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) -+ IF(CMAKE_BUILD_TYPE MATCHES "Debug") -+ INSTALL_DEBUG_TARGET(${target} -+ DESTINATION ${INSTALL_PLUGINDIR}/debug -+ COMPONENT ${INSTALL_COMPONENT}) -+ # Add installed files to list for RPMs -+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ ENDIF() - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Modified: branches/2019Q2/databases/mysql57-server/Makefile ============================================================================== --- branches/2019Q2/databases/mysql57-server/Makefile Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-server/Makefile Mon May 13 19:30:22 2019 (r501589) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.25 +PORTVERSION= 5.7.26 PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 Modified: branches/2019Q2/databases/mysql57-server/distinfo ============================================================================== --- branches/2019Q2/databases/mysql57-server/distinfo Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-server/distinfo Mon May 13 19:30:22 2019 (r501589) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548095639 -SHA256 (mysql-boost-5.7.25.tar.gz) = 354c427c8679c6a4774f60723ea211e54b4383307764d240940f960d110bf5cf -SIZE (mysql-boost-5.7.25.tar.gz) = 49107578 +TIMESTAMP = 1556318914 +SHA256 (mysql-boost-5.7.26.tar.gz) = effca6d3aceebc286a9fb046257330d125cc2f4def87081c286bfc4df3d974d1 +SIZE (mysql-boost-5.7.26.tar.gz) = 51098338 Modified: branches/2019Q2/databases/mysql57-server/files/patch-cmake_plugin.cmake ============================================================================== --- branches/2019Q2/databases/mysql57-server/files/patch-cmake_plugin.cmake Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-server/files/patch-cmake_plugin.cmake Mon May 13 19:30:22 2019 (r501589) @@ -1,25 +1,25 @@ --- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake @@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) - MYSQL_INSTALL_TARGETS(${target} - DESTINATION ${INSTALL_PLUGINDIR} - COMPONENT ${INSTALL_COMPONENT}) -- INSTALL_DEBUG_TARGET(${target} -- DESTINATION ${INSTALL_PLUGINDIR}/debug -- COMPONENT ${INSTALL_COMPONENT}) -+ IF(CMAKE_BUILD_TYPE MATCHES "Debug") -+ INSTALL_DEBUG_TARGET(${target} -+ DESTINATION ${INSTALL_PLUGINDIR}/debug -+ COMPONENT ${INSTALL_COMPONENT}) -+ # Add installed files to list for RPMs -+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ ENDIF() - # Add installed files to list for RPMs - FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" -- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") -+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Modified: branches/2019Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt ============================================================================== --- branches/2019Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Mon May 13 19:30:22 2019 (r501589) @@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES(SYSTEM - ${BOOST_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIRS} - ${LIBEVENT_INCLUDE_DIR} + ${LIBEVENT_INCLUDE_DIRS} + ${SSL_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} ) Modified: branches/2019Q2/databases/mysql57-server/pkg-plist ============================================================================== --- branches/2019Q2/databases/mysql57-server/pkg-plist Mon May 13 19:27:31 2019 (r501588) +++ branches/2019Q2/databases/mysql57-server/pkg-plist Mon May 13 19:30:22 2019 (r501589) @@ -29,6 +29,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/group_replication.so %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so +lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libtest_framework.so lib/mysql/plugin/libtest_services.so @@ -64,8 +65,8 @@ lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so -lib/mysql/plugin/keyring_udf.so lib/mysql/plugin/test_udf_services.so +%%EXAMPLE%%lib/mysql/plugin/udf_example.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905131930.x4DJUNhr076350>