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 <igorz@yandex.ru>
Approved by:	feld (maintainer timeout)
MFH:		2019Q3

7 files changed, 71 insertions, 58 deletions

diff --git a/databases/percona57-client/files/patch-cmake_plugin.cmake b/databases/percona57-client/files/patch-cmake_plugin.cmake
index a2905e6ca9d8..a52ef25c7b24 100644
--- a/databases/percona57-client/files/patch-cmake_plugin.cmake
+++ b/databases/percona57-client/files/patch-cmake_plugin.cmake
@@ -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})
diff --git a/databases/percona57-client/files/patch-mysys_mf__iocache2.c b/databases/percona57-client/files/patch-mysys_mf__iocache2.c
new file mode 100644
index 000000000000..e418e454e939
--- /dev/null
+++ b/databases/percona57-client/files/patch-mysys_mf__iocache2.c
@@ -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 <m_string.h>
+ #include <stdarg.h>
+ #include <m_ctype.h>
++#include "mysql/psi/mysql_file.h"
+ 
+ /*
+   Copy contents of an IO_CACHE to a file.
diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile
index 177dcb34cbb9..9c13b54a65a4 100644
--- a/databases/percona57-server/Makefile
+++ b/databases/percona57-server/Makefile
@@ -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
diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo
index bcb2cbb01b30..017474a8a643 100644
--- a/databases/percona57-server/distinfo
+++ b/databases/percona57-server/distinfo
@@ -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
diff --git a/databases/percona57-server/files/patch-cmake_plugin.cmake b/databases/percona57-server/files/patch-cmake_plugin.cmake
index a2905e6ca9d8..a52ef25c7b24 100644
--- a/databases/percona57-server/files/patch-cmake_plugin.cmake
+++ b/databases/percona57-server/files/patch-cmake_plugin.cmake
@@ -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})
diff --git a/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
index 05783d914af4..967a4ccade85 100644
--- a/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
+++ b/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
@@ -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)
diff --git a/databases/percona57-server/pkg-plist b/databases/percona57-server/pkg-plist
index 16e8cea6c749..5b2ae8860af0 100644
--- a/databases/percona57-server/pkg-plist
+++ b/databases/percona57-server/pkg-plist
@@ -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