Date: Sun, 31 Dec 2017 15:28:55 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457697 - in head/databases: percona57-client percona57-client/files percona57-pam-for-mysql percona57-server percona57-server/files Message-ID: <201712311528.vBVFSthI097811@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sun Dec 31 15:28:55 2017 New Revision: 457697 URL: https://svnweb.freebsd.org/changeset/ports/457697 Log: databases/percona57-{client,pam-for-mysql,server}: Update to 5.7.20-18 Release notes: https://www.percona.com/doc/percona-server/5.7/release-notes/Percona-Server-5.7.20-18.html MFH: 2017Q4 Deleted: head/databases/percona57-server/files/patch-sql_json__dom.h head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc Modified: head/databases/percona57-client/Makefile head/databases/percona57-client/files/patch-client__mysql.cc head/databases/percona57-client/files/patch-scripts_CMakeLists.txt head/databases/percona57-client/files/patch-support-files_CMakeLists.txt head/databases/percona57-pam-for-mysql/Makefile head/databases/percona57-server/Makefile head/databases/percona57-server/distinfo head/databases/percona57-server/files/patch-scripts_CMakeLists.txt head/databases/percona57-server/pkg-plist Modified: head/databases/percona57-client/Makefile ============================================================================== --- head/databases/percona57-client/Makefile Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-client/Makefile Sun Dec 31 15:28:55 2017 (r457697) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 3 +PORTREVISION?= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/percona57-client/files/patch-client__mysql.cc ============================================================================== --- head/databases/percona57-client/files/patch-client__mysql.cc Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-client/files/patch-client__mysql.cc Sun Dec 31 15:28:55 2017 (r457697) @@ -28,12 +28,3 @@ #else rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; rl_completion_entry_function= &no_completion; -@@ -2886,7 +2888,7 @@ static char **new_mysql_completion(const char *text, - int end MY_ATTRIBUTE((unused))) - { - if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) -+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) - return rl_completion_matches(text, new_command_generator); - #else - return completion_matches((char *)text, (CPFunction *)new_command_generator); Modified: head/databases/percona57-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/percona57-client/files/patch-scripts_CMakeLists.txt Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-client/files/patch-scripts_CMakeLists.txt Sun Dec 31 15:28:55 2017 (r457697) @@ -1,23 +1,24 @@ ---- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ scripts/CMakeLists.txt -@@ -19,7 +19,7 @@ IF(NOT CMAKE_CROSSCOMPILING) - TARGET_LINK_LIBRARIES(comp_sql) - ENDIF() +--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ scripts/CMakeLists.txt 2017-12-31 14:31:35.649012000 +0000 +@@ -23,6 +23,7 @@ + SET(COMPILER_ID_AND_VERSION + "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") -- +IF(FALSE) # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts) IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") -@@ -63,6 +63,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs +@@ -65,7 +66,9 @@ + ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ++ENDIF() ) +ENDIF() # If we do not have performance schema compiled in then sys will not work, # so only create an empty sys database with an auto-generated file, -@@ -143,6 +144,7 @@ IF(NOT WITHOUT_SERVER) +@@ -146,6 +149,7 @@ ) ENDIF() @@ -25,7 +26,7 @@ IF(UNIX) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -150,6 +152,7 @@ IF(UNIX) +@@ -153,6 +157,7 @@ COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution ) ENDIF() @@ -33,7 +34,7 @@ IF(NOT WITHOUT_SERVER) INSTALL(FILES -@@ -347,6 +350,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -332,6 +337,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -42,7 +43,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,21 +435,7 @@ ELSE() +@@ -417,25 +424,7 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) @@ -51,6 +52,8 @@ - mysql_config - mysqldumpslow - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ELSE() - SET(BIN_SCRIPTS @@ -59,6 +62,8 @@ - mysqld_multi - mysqld_safe - ps_tokudb_admin +- ps_mysqld_helper +- ps-admin - ) - ENDIF() + SET(BIN_SCRIPTS mysql_config) Modified: head/databases/percona57-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/percona57-client/files/patch-support-files_CMakeLists.txt Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-client/files/patch-support-files_CMakeLists.txt Sun Dec 31 15:28:55 2017 (r457697) @@ -1,24 +1,14 @@ ---- support-files/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - SET(inifile my-default) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -+ENDIF() - - IF(UNIX) +--- support-files/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ support-files/CMakeLists.txt 2017-12-31 14:35:25.047786000 +0000 +@@ -47,6 +47,7 @@ + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) -+IF(FALSE) ++ IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,9 +71,11 @@ IF(UNIX) +@@ -59,9 +60,11 @@ IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -30,7 +20,7 @@ SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR}) SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) -@@ -83,3 +88,4 @@ IF(UNIX) +@@ -74,3 +77,4 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Modified: head/databases/percona57-pam-for-mysql/Makefile ============================================================================== --- head/databases/percona57-pam-for-mysql/Makefile Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-pam-for-mysql/Makefile Sun Dec 31 15:28:55 2017 (r457697) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= percona57 -PORTREVISION?= 2 +PORTREVISION?= 0 PKGNAMESUFFIX= -pam-for-mysql COMMENT= PAM plugin for MySQL Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona57-server/Makefile Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-server/Makefile Sun Dec 31 15:28:55 2017 (r457697) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.7.16-10 -PORTREVISION?= 5 +DISTVERSION= 5.7.20-18 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ SF/boost/boost/1.59.0:boost @@ -83,6 +83,7 @@ USES+= libedit # Currently do nothing special USES+= libedit .else +LIB_DEPENDS+= libcurl.so:ftp/curl # MySQL-Server part OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED Modified: head/databases/percona57-server/distinfo ============================================================================== --- head/databases/percona57-server/distinfo Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-server/distinfo Sun Dec 31 15:28:55 2017 (r457697) @@ -1,5 +1,5 @@ -TIMESTAMP = 1481662079 -SHA256 (percona-server-5.7.16-10.tar.gz) = 1e88233d4bc5fd9a6910f2cc01ad5aca7d751f036cdba5a1c9954e1e25300347 -SIZE (percona-server-5.7.16-10.tar.gz) = 74341476 +TIMESTAMP = 1514728385 +SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af +SIZE (percona-server-5.7.20-18.tar.gz) = 82206679 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Modified: head/databases/percona57-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/percona57-server/files/patch-scripts_CMakeLists.txt Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-server/files/patch-scripts_CMakeLists.txt Sun Dec 31 15:28:55 2017 (r457697) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC -+++ scripts/CMakeLists.txt -@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000 ++++ scripts/CMakeLists.txt 2017-12-31 14:59:46.762799000 +0000 +@@ -332,6 +332,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -9,13 +9,15 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -432,13 +434,11 @@ ELSE() +@@ -419,7 +421,6 @@ IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow ps_tokudb_admin + ps_mysqld_helper +@@ -427,7 +428,6 @@ ) ELSE() SET(BIN_SCRIPTS @@ -23,7 +25,7 @@ mysqldumpslow mysqld_multi mysqld_safe -@@ -473,7 +473,7 @@ ELSE() +@@ -464,7 +464,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh Modified: head/databases/percona57-server/pkg-plist ============================================================================== --- head/databases/percona57-server/pkg-plist Sun Dec 31 14:48:36 2017 (r457696) +++ head/databases/percona57-server/pkg-plist Sun Dec 31 15:28:55 2017 (r457697) @@ -15,6 +15,8 @@ bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysqlxtest bin/perror +bin/ps-admin +bin/ps_mysqld_helper bin/ps_tokudb_admin bin/replace bin/resolveip @@ -65,7 +67,6 @@ bin/zlib_decompress %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/my-default.cnf %%DATADIR%%/mysqld_multi.server %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql_security_commands.sql @@ -86,6 +87,7 @@ bin/zlib_decompress %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%DATADIR%%/uninstall_rewriter.sql +include/mysql/mysqlx_ername.h include/mysql/mysqlx_error.h include/mysql/mysqlx_version.h @dir lib/mysql/plugin/debug @@ -98,10 +100,13 @@ lib/mysql/plugin/adt_null.so lib/mysql/plugin/audit_log.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/connection_control.so lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/group_replication.so lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so lib/mysql/plugin/keyring_udf.so +lib/mysql/plugin/keyring_vault.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712311528.vBVFSthI097811>