- update to 5.7.21-20

- fix build with clang 6.0

PR:		226504
Approved by:	maintainer timeout (3 weeks)

12 files changed, 54 insertions, 141 deletions

diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
index e478572f5a37..e84e735b6df3 100644
--- a/databases/percona57-client/Makefile
+++ b/databases/percona57-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PORTREVISION?=	1
+PORTREVISION?=	0
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/percona57-client/files/patch-client_CMakeLists.txt b/databases/percona57-client/files/patch-client_CMakeLists.txt
index cf1486e4722d..e61b2322f95c 100644
--- a/databases/percona57-client/files/patch-client_CMakeLists.txt
+++ b/databases/percona57-client/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
+--- client/CMakeLists.txt.orig	2018-02-16 07:57:38 UTC
 +++ client/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
+@@ -48,6 +48,7 @@ IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
  ENDIF(UNIX)
  
@@ -8,7 +8,7 @@
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
      upgrade/program.cc
-@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
+@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS(
  TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
  ENDIF()
@@ -18,11 +18,12 @@
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
 +ENDIF()
  
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
-@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport percon
+@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
  
@@ -33,7 +34,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
-@@ -122,7 +128,6 @@ IF(WIN32)
+@@ -124,7 +130,6 @@ IF(WIN32)
  ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
diff --git a/databases/percona57-client/files/patch-cmake_plugin.cmake b/databases/percona57-client/files/patch-cmake_plugin.cmake
index 8716c1b962b4..a2905e6ca9d8 100644
--- a/databases/percona57-client/files/patch-cmake_plugin.cmake
+++ b/databases/percona57-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/percona57-client/files/patch-configure.cmake b/databases/percona57-client/files/patch-configure.cmake
new file mode 100644
index 000000000000..81ab9495aac3
--- /dev/null
+++ b/databases/percona57-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/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
deleted file mode 100644
index 05783d914af4..000000000000
--- a/databases/percona57-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/percona57-client/pkg-plist b/databases/percona57-client/pkg-plist
index 4971e8b943c0..fea1775e9543 100644
--- a/databases/percona57-client/pkg-plist
+++ b/databases/percona57-client/pkg-plist
@@ -124,7 +124,6 @@ lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.20
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.20
-lib/mysql/libmysqlservices.a
 lib/mysql/libperconaserverclient.a
 lib/mysql/libperconaserverclient.so
 lib/mysql/libperconaserverclient.so.20
diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile
index f131cf5a4bc9..84deffb1f53c 100644
--- a/databases/percona57-server/Makefile
+++ b/databases/percona57-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.7.20-18
+DISTVERSION=	5.7.21-20
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
@@ -138,7 +138,7 @@ post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
 	# issue 220865: MySQL developers forgot that FreeBSD != Linux
 	@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
-	${WRKSRC}/cmake/plugin.cmake
+	${WRKSRC}/configure.cmake
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo
index 92c2fc633301..bcb2cbb01b30 100644
--- a/databases/percona57-server/distinfo
+++ b/databases/percona57-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1514728385
-SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af
-SIZE (percona-server-5.7.20-18.tar.gz) = 82206679
+TIMESTAMP = 1519339070
+SHA256 (percona-server-5.7.21-20.tar.gz) = 842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6
+SIZE (percona-server-5.7.21-20.tar.gz) = 82479778
 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 8716c1b962b4..a2905e6ca9d8 100644
--- a/databases/percona57-server/files/patch-cmake_plugin.cmake
+++ b/databases/percona57-server/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/percona57-server/files/patch-configure.cmake b/databases/percona57-server/files/patch-configure.cmake
new file mode 100644
index 000000000000..81ab9495aac3
--- /dev/null
+++ b/databases/percona57-server/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/percona57-server/files/patch-libmysql_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
index 1e13d4796949..f7d94508b549 100644
--- a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
@@ -1,25 +1,25 @@
---- libmysql/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
+--- libmysql/CMakeLists.txt.orig	2018-03-09 22:41:36 UTC
 +++ libmysql/CMakeLists.txt
-@@ -231,7 +231,7 @@ IF(WIN32)
- ENDIF()
- 
+@@ -235,7 +235,7 @@
+ ADD_SUBDIRECTORY(authentication_ldap)
+   
  # Merge several convenience libraries into one big perconaserverclient
--MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
+-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL)
  
  # Visual Studio users need debug  static library for debug projects
  IF(MSVC)
-@@ -273,7 +273,8 @@ IF(NOT DISABLE_SHARED)
+@@ -271,7 +271,8 @@
    # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
 -    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
++    COMPONENT SharedLibraries SKIP_INSTALL)
 +IF(FALSE)
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -329,6 +330,7 @@ ENDIF()
+@@ -327,6 +328,7 @@
  # to initialize api_calls[] array in api_test.c
  #
  SET(CLIENT_API_FUNCTION_LIST "")
diff --git a/databases/percona57-server/files/patch-sql_sql__view.cc b/databases/percona57-server/files/patch-sql_sql__view.cc
deleted file mode 100644
index 91984f8b53db..000000000000
--- a/databases/percona57-server/files/patch-sql_sql__view.cc
+++ /dev/null
@@ -1,63 +0,0 @@
---- sql/sql_view.cc.orig	2016-11-27 19:44:54 UTC
-+++ sql/sql_view.cc
-@@ -773,46 +773,46 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
--  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("md5")},
--  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("updatable")},
--  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("algorithm")},
--  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("definer_user")},
--  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("definer_host")},
--  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("suid")},
--  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("with_check_option")},
--  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("timestamp")},
--  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ C_STRING_WITH_LEN("create-version")},
--  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("source")},
--  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
--  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
--  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
--  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{NullS, 0},			0,
-   FILE_OPTIONS_STRING}