From owner-svn-ports-all@freebsd.org Thu Jul 11 18:14:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FCF615DA96A; Thu, 11 Jul 2019 18:14:37 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C53038B489; Thu, 11 Jul 2019 18:14:36 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A09AA262C; Thu, 11 Jul 2019 18:14:36 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6BIEa91076701; Thu, 11 Jul 2019 18:14:36 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6BIEZOj076694; Thu, 11 Jul 2019 18:14:35 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201907111814.x6BIEZOj076694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 11 Jul 2019 18:14:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506424 - in head/databases: percona57-client/files percona57-server percona57-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/databases: percona57-client/files percona57-server percona57-server/files X-SVN-Commit-Revision: 506424 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C53038B489 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2019 18:14:37 -0000 Author: pi Date: Thu Jul 11 18:14:35 2019 New Revision: 506424 URL: https://svnweb.freebsd.org/changeset/ports/506424 Log: databases/percona57-{server,client}: upgrade 5.7.21-20 -> 5.7.26-29 - Fixes several CVEs, see https://vuxml.FreeBSD.org/freebsd/d3d02d3a-2242-11e9-b95c-b499baebfeaf.html for the list PR: 236570 Submitted by: Igor Zabelin Approved by: feld (maintainer timeout) MFH: 2019Q3 Added: head/databases/percona57-client/files/patch-mysys_mf__iocache2.c (contents, props changed) Modified: head/databases/percona57-client/files/patch-cmake_plugin.cmake head/databases/percona57-server/Makefile head/databases/percona57-server/distinfo head/databases/percona57-server/files/patch-cmake_plugin.cmake head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt head/databases/percona57-server/pkg-plist Modified: head/databases/percona57-client/files/patch-cmake_plugin.cmake ============================================================================== --- head/databases/percona57-client/files/patch-cmake_plugin.cmake Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-client/files/patch-cmake_plugin.cmake Thu Jul 11 18:14:35 2019 (r506424) @@ -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}) +@@ -278,13 +278,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Added: head/databases/percona57-client/files/patch-mysys_mf__iocache2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-client/files/patch-mysys_mf__iocache2.c Thu Jul 11 18:14:35 2019 (r506424) @@ -0,0 +1,10 @@ +--- mysys/mf_iocache2.c.orig 2019-02-18 09:11:31.000000000 +0300 ++++ mysys/mf_iocache2.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include "mysql/psi/mysql_file.h" + + /* + Copy contents of an IO_CACHE to a file. Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona57-server/Makefile Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-server/Makefile Thu Jul 11 18:14:35 2019 (r506424) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.7.21-20 -PORTREVISION?= 3 +DISTVERSION= 5.7.26-29 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ SF/boost/boost/1.59.0:boost Modified: head/databases/percona57-server/distinfo ============================================================================== --- head/databases/percona57-server/distinfo Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-server/distinfo Thu Jul 11 18:14:35 2019 (r506424) @@ -1,5 +1,5 @@ -TIMESTAMP = 1519339070 -SHA256 (percona-server-5.7.21-20.tar.gz) = 842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6 -SIZE (percona-server-5.7.21-20.tar.gz) = 82479778 +TIMESTAMP = 1560188655 +SHA256 (percona-server-5.7.26-29.tar.gz) = 0deb6d8a6eb910286a585c60beecd5fb8ce38fc2a5134adf45e418efbe4ed6b5 +SIZE (percona-server-5.7.26-29.tar.gz) = 84327421 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Modified: head/databases/percona57-server/files/patch-cmake_plugin.cmake ============================================================================== --- head/databases/percona57-server/files/patch-cmake_plugin.cmake Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-server/files/patch-cmake_plugin.cmake Thu Jul 11 18:14:35 2019 (r506424) @@ -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}) +@@ -278,13 +278,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) Modified: head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt ============================================================================== --- head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Thu Jul 11 18:14:35 2019 (r506424) @@ -1,18 +1,21 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2019-02-18 09:11:31.000000000 +0300 +++ libmysql/authentication_ldap/CMakeLists.txt -@@ -52,8 +52,10 @@ ELSE () - SET(SASL_LIBRARY "sasl2") - ENDIF () +@@ -106,11 +106,13 @@ + ENDIF() + MESSAGE(STATUS "SASL_LIBRARY = ${SASL_LIBRARY}") -MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client - auth_ldap_sasl_client.cc log_client.cc - LINK_LIBRARIES ${SASL_LIBRARY} -- MODULE_ONLY +- CLIENT_ONLY MODULE_ONLY - MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") +IF (WITH_AUTHENTICATION_LDAP) + MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client + auth_ldap_sasl_client.cc log_client.cc + LINK_LIBRARIES ${SASL_LIBRARY} -+ MODULE_ONLY ++ CLIENT_ONLY MODULE_ONLY + MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") +ENDIF() + + IF(WIN32) + GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME) Modified: head/databases/percona57-server/pkg-plist ============================================================================== --- head/databases/percona57-server/pkg-plist Thu Jul 11 18:10:35 2019 (r506423) +++ head/databases/percona57-server/pkg-plist Thu Jul 11 18:14:35 2019 (r506424) @@ -146,6 +146,7 @@ lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/test_security_context.so lib/mysql/plugin/test_udf_services.so +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 @@ -162,7 +163,6 @@ man/man1/mysqlman.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql.server.1.gz -man/man1/mysqltest.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/perror.1.gz