From 2e596e3fc45ab341d847b9a453bb44d38261b628 Mon Sep 17 00:00:00 2001
From: Mahdi Mokhtari <mmokhi@FreeBSD.org>
Date: Sun, 28 Apr 2019 21:34:14 +0000
Subject: 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
---
 .../mysql57-client/files/patch-cmake_plugin.cmake  | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'databases/mysql57-client')

diff --git a/databases/mysql57-client/files/patch-cmake_plugin.cmake b/databases/mysql57-client/files/patch-cmake_plugin.cmake
index a2905e6ca9d8..77b38c747b61 100644
--- a/databases/mysql57-client/files/patch-cmake_plugin.cmake
+++ b/databases/mysql57-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})
+       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})
-- 
cgit v1.2.3