From owner-svn-ports-all@freebsd.org Thu Jun 18 06:57:42 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43BF5346346; Thu, 18 Jun 2020 06:57:42 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49nXnL13hFz4C8T; Thu, 18 Jun 2020 06:57:42 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1F9BA2D134; Thu, 18 Jun 2020 06:57:42 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05I6vgEp040244; Thu, 18 Jun 2020 06:57:42 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05I6veOO040237; Thu, 18 Jun 2020 06:57:40 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202006180657.05I6veOO040237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 18 Jun 2020 06:57:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539530 - in head/databases/mysqlwsrep57-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/databases/mysqlwsrep57-server: . files X-SVN-Commit-Revision: 539530 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jun 2020 06:57:42 -0000 Author: lwhsu Date: Thu Jun 18 06:57:40 2020 New Revision: 539530 URL: https://svnweb.freebsd.org/changeset/ports/539530 Log: Update to 5.7.30-25.22 PR: 247348 Submitted by: maintainer Deleted: head/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_chartype.h head/databases/mysqlwsrep57-server/files/patch-cmd-line-utils_libedit_vi.c Modified: head/databases/mysqlwsrep57-server/Makefile head/databases/mysqlwsrep57-server/distinfo head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt head/databases/mysqlwsrep57-server/pkg-plist Modified: head/databases/mysqlwsrep57-server/Makefile ============================================================================== --- head/databases/mysqlwsrep57-server/Makefile Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/Makefile Thu Jun 18 06:57:40 2020 (r539530) @@ -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 replicati 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" \ Modified: head/databases/mysqlwsrep57-server/distinfo ============================================================================== --- head/databases/mysqlwsrep57-server/distinfo Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/distinfo Thu Jun 18 06:57:40 2020 (r539530) @@ -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 Modified: head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt Thu Jun 18 06:57:40 2020 (r539530) @@ -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 ) Modified: head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake Thu Jun 18 06:57:40 2020 (r539530) @@ -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) Modified: head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt Thu Jun 18 06:57:40 2020 (r539530) @@ -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 Modified: head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt ============================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt Thu Jun 18 06:57:40 2020 (r539530) @@ -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() Modified: head/databases/mysqlwsrep57-server/pkg-plist ============================================================================== --- head/databases/mysqlwsrep57-server/pkg-plist Thu Jun 18 06:56:19 2020 (r539529) +++ head/databases/mysqlwsrep57-server/pkg-plist Thu Jun 18 06:57:40 2020 (r539530) @@ -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