databases/mysql56-{client, server}: Update to 5.7.21

This update fixes bugs like CVE-2018-2696, CVE-2018-2562, CVE-2018-2640,
CVE-2018-2668, CVE-2017-3737 (and more) in MySQL protocol by upstream.

Delete local patches (CMake plugin macros) that are merged by upstream.

PR:		225195
Sponsored by:	Netzkommune GmbH

5 files changed, 17 insertions, 39 deletions

diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt
index 66073f5d3ab1..843117b51fd6 100644
--- a/databases/mysql57-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-client_CMakeLists.txt
@@ -18,10 +18,10 @@
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
 +ENDIF()
  
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
 @@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
diff --git a/databases/mysql57-client/files/patch-cmake_plugin.cmake b/databases/mysql57-client/files/patch-cmake_plugin.cmake
index 8716c1b962b4..a2905e6ca9d8 100644
--- a/databases/mysql57-client/files/patch-cmake_plugin.cmake
+++ b/databases/mysql57-client/files/patch-cmake_plugin.cmake
@@ -1,24 +1,6 @@
 --- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
 +++ cmake/plugin.cmake
-@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN)
-     # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate
-     # an additional dependency.
-     # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported.
--    IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+    #
-+    # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case.
-+    IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-       TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES})
-     ENDIF()
-+    IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+        SET_TARGET_PROPERTIES(${target} PROPERTIES
-+          LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} "
-+        )
-+    ENDIF()
-     ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
- 
-      IF(NOT ARG_MODULE_ONLY)
-@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
      MYSQL_INSTALL_TARGETS(${target}
        DESTINATION ${INSTALL_PLUGINDIR}
        COMPONENT ${INSTALL_COMPONENT})
diff --git a/databases/mysql57-client/files/patch-configure.cmake b/databases/mysql57-client/files/patch-configure.cmake
new file mode 100644
index 000000000000..81ab9495aac3
--- /dev/null
+++ b/databases/mysql57-client/files/patch-configure.cmake
@@ -0,0 +1,15 @@
+--- configure.cmake.orig	2018-01-16 23:26:09 UTC
++++ configure.cmake
+@@ -43,6 +43,12 @@ IF(UNIX)
+ ENDIF()
+ 
+ 
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
++    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
++ENDIF()
++
++
+ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
+   ## We will be using gcc to generate .so files
+   ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
diff --git a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
deleted file mode 100644
index 05783d914af4..000000000000
--- a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- libmysql/authentication_ldap/CMakeLists.txt.orig	2017-07-20 22:54:16 UTC
-+++ libmysql/authentication_ldap/CMakeLists.txt
-@@ -52,8 +52,10 @@ ELSE ()
-   SET(SASL_LIBRARY "sasl2")
- ENDIF ()
- 
--MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
--                 auth_ldap_sasl_client.cc log_client.cc
--                 LINK_LIBRARIES ${SASL_LIBRARY}
--                 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
-+                     MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
-+ENDIF()
diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist
index 735135d59823..e4767fa87d2a 100644
--- a/databases/mysql57-client/pkg-plist
+++ b/databases/mysql57-client/pkg-plist
@@ -121,7 +121,6 @@ include/mysql/typelib.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.20
-lib/mysql/libmysqlservices.a
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.20