Update to 5.7.30-25.22

PR:		247348
Submitted by:	maintainer

9 files changed, 20 insertions, 53 deletions

diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index 7a7590bb9fd7..1f3523eea3a3 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.7.28
+PORTVERSION?=	5.7.30
 DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.20
+DISTVERSIONSUFFIX?=	-25.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES+=	SF/boost/boost/1.59.0:boost
@@ -17,8 +17,6 @@ COMMENT=	MySQL database enhanced with Galera replication (server package)
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	bash:shells/bash \
-		lsof:sysutils/lsof \
-		netcat:net/netcat \
 		rsync:net/rsync \
 		socat:net/socat
 LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4
@@ -61,7 +59,6 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index a204c84196aa..3274b6ef0008 100644
--- a/databases/mysqlwsrep57-server/distinfo
+++ b/databases/mysqlwsrep57-server/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1571904382
+TIMESTAMP = 1591201597
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = ba03e5e35a1e972b3887935e1a13c93c30dfa44bb4d85b5f8dde2f9c982b3ff8
-SIZE (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = 54717971
+SHA256 (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 2fb00a0b6f644b1f37bdc2cdbee5f090fbc0377e66b06dbe1971943097a35658
+SIZE (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 54733023
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
index 24305af60efe..f6924aeca2e1 100644
--- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
+--- CMakeLists.txt.orig	2020-05-27 10:17:47 UTC
 +++ CMakeLists.txt
-@@ -730,12 +730,10 @@ IF(UNIX)
+@@ -738,12 +738,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -744,8 +742,6 @@ ENDIF()
+@@ -752,8 +750,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -804,6 +800,7 @@ ENDIF()
+@@ -812,6 +808,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,7 +30,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES
      README
-@@ -825,6 +822,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -833,6 +830,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "mysql.info" EXCLUDE
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
index 45a243aca958..0dc10db09610 100644
--- a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
+++ b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
@@ -1,6 +1,6 @@
---- cmake/ssl.cmake.orig	2019-10-21 05:21:41 UTC
+--- cmake/ssl.cmake.orig	2020-05-27 10:17:47 UTC
 +++ cmake/ssl.cmake
-@@ -202,6 +202,12 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -206,6 +206,12 @@ MACRO (MYSQL_CHECK_SSL)
         OPENSSL_MAJOR_VERSION STREQUAL "1"
        )
        SET(OPENSSL_FOUND TRUE)
diff --git a/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_chartype.h
deleted file mode 100644
index 34fbf5a45509..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_chartype.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
-+++ cmd-line-utils/libedit/chartype.h
-@@ -49,7 +49,7 @@
-   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
- #if !defined(__NetBSD__) && !defined(__sun) \
-   && !(defined(__APPLE__) && defined(__MACH__)) \
--  && !defined(__FreeBSD__) && !defined(_AIX)
-+  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_vi.c
deleted file mode 100644
index cb3e255991ab..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_vi.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
-+++ cmd-line-utils/libedit/vi.c
-@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
-  * NB: posix implies that we should enter insert mode, however
-  * this is against historical precedent...
-  */
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -928,7 +928,7 @@ protected el_action_t
- vi_alias(EditLine *el __attribute__((__unused__)),
- 	 Int c __attribute__((__unused__)))
- {
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- 	char alias_name[3];
- 	char *alias_text;
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
index 60a99e5366d6..bb3ba6a598da 100644
--- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
+--- scripts/CMakeLists.txt.orig	2020-05-27 10:17:47 UTC
 +++ scripts/CMakeLists.txt
-@@ -333,6 +333,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " )
@@ -9,7 +9,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " )
          ENDIF()
-@@ -418,14 +420,13 @@ ELSE()
+@@ -421,14 +423,13 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
@@ -25,7 +25,7 @@
        mysqldumpslow
        mysqld_multi
        mysqld_safe
-@@ -469,7 +470,7 @@ ELSE()
+@@ -472,7 +473,7 @@ ELSE()
    FOREACH(file ${BIN_SCRIPTS})
      IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
index af71a38a5654..72d6df2bab00 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
@@ -1,4 +1,4 @@
---- sql/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
+--- sql/CMakeLists.txt.orig	2020-05-27 10:17:47 UTC
 +++ sql/CMakeLists.txt
 @@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES(
    ${CMAKE_SOURCE_DIR}/regex 
@@ -9,7 +9,7 @@
    ${WSREP_INCLUDES}
    ${LZ4_INCLUDE_DIR}
  )
-@@ -647,6 +649,7 @@ ADD_CUSTOM_TARGET( 
+@@ -661,6 +663,7 @@ ADD_CUSTOM_TARGET( 
  )
  
  
@@ -17,7 +17,7 @@
  MYSQL_ADD_PLUGIN(udf_example udf_example.cc
                   MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
  IF(NOT DISABLE_SHARED)
-@@ -655,6 +658,7 @@ IF(NOT DISABLE_SHARED)
+@@ -669,6 +672,7 @@ IF(NOT DISABLE_SHARED)
        PROPERTIES LINK_FLAGS
        "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
    ENDIF()
diff --git a/databases/mysqlwsrep57-server/pkg-plist b/databases/mysqlwsrep57-server/pkg-plist
index 18fa9a6aa679..168a5abbe347 100644
--- a/databases/mysqlwsrep57-server/pkg-plist
+++ b/databases/mysqlwsrep57-server/pkg-plist
@@ -26,6 +26,7 @@ bin/wsrep_sst_rsync
 bin/wsrep_sst_xtrabackup
 bin/wsrep_sst_xtrabackup-v2
 lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/audit_log.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_pam.so
 lib/mysql/plugin/auth_test_plugin.so