Date: Tue, 1 Aug 2017 19:14:54 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447072 - in head/databases: percona56-client/files percona56-server percona56-server/files Message-ID: <201708011914.v71JEsSa093476@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Tue Aug 1 19:14:54 2017 New Revision: 447072 URL: https://svnweb.freebsd.org/changeset/ports/447072 Log: Update to 5.6.36-82.0 PR: 219631 Submitted by: Thomas Babut Modified: head/databases/percona56-client/files/patch-CMakeLists.txt head/databases/percona56-client/files/patch-client_mysql.cc head/databases/percona56-client/files/patch-support-files_CMakeLists.txt head/databases/percona56-server/Makefile head/databases/percona56-server/distinfo head/databases/percona56-server/files/patch-client_mysql.cc Modified: head/databases/percona56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-CMakeLists.txt Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-client/files/patch-CMakeLists.txt Tue Aug 1 19:14:54 2017 (r447072) @@ -1,6 +1,6 @@ ---- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 -+++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 -@@ -471,41 +471,17 @@ +--- CMakeLists.txt.orig 2017-05-29 12:44:32.006353000 +0200 ++++ CMakeLists.txt 2017-05-29 12:46:55.502845000 +0200 +@@ -486,42 +486,17 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -38,12 +38,13 @@ - ADD_SUBDIRECTORY(packaging/rpm-fedora) - ADD_SUBDIRECTORY(packaging/rpm-sles) - ADD_SUBDIRECTORY(packaging/rpm-docker) +- ADD_SUBDIRECTORY(packaging/deb-in) -ENDIF() - INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -542,18 +518,17 @@ +@@ -558,18 +533,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -63,10 +64,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -579,6 +554,7 @@ +@@ -591,6 +565,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: head/databases/percona56-client/files/patch-client_mysql.cc ============================================================================== --- head/databases/percona56-client/files/patch-client_mysql.cc Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-client/files/patch-client_mysql.cc Tue Aug 1 19:14:54 2017 (r447072) @@ -1,6 +1,6 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n +--- client/mysql.cc.orig 2017-05-29 12:49:44.423885000 +0200 ++++ client/mysql.cc 2017-05-29 12:55:13.604765000 +0200 +@@ -2784,9 +2784,11 @@ #ifdef HAVE_LOCALE_H setlocale(LC_ALL,""); /* so as libedit use isprint */ #endif @@ -14,11 +14,11 @@ #else rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; rl_completion_entry_function= &no_completion; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const +@@ -2805,7 +2807,7 @@ int end MY_ATTRIBUTE((unused))) { if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) +-#if defined(USE_NEW_XLINE_INTERFACE) +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) return rl_completion_matches(text, new_command_generator); #else Modified: head/databases/percona56-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-support-files_CMakeLists.txt Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-client/files/patch-support-files_CMakeLists.txt Tue Aug 1 19:14:54 2017 (r447072) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100 -@@ -44,14 +44,17 @@ +--- support-files/CMakeLists.txt.orig 2017-05-09 08:31:39.000000000 +0200 ++++ support-files/CMakeLists.txt 2017-05-29 13:10:29.832994000 +0200 +@@ -44,11 +44,13 @@ SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -13,12 +13,16 @@ +ENDIF() IF(UNIX) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -57,6 +59,7 @@ + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) +IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,8 +71,10 @@ +@@ -73,8 +76,10 @@ IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -29,7 +33,7 @@ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -94,3 +99,4 @@ +@@ -99,3 +104,4 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-server/Makefile Tue Aug 1 19:14:54 2017 (r447072) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.35-80.0 -PORTREVISION?= 2 +DISTVERSION= 5.6.36-82.0 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server Modified: head/databases/percona56-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-server/distinfo Tue Aug 1 19:14:54 2017 (r447072) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489419333 -SHA256 (percona-server-5.6.35-80.0.tar.gz) = 259b5aa2c6218958c8cc55170b9381955ea60445127bf46e02aa09903af7f26b -SIZE (percona-server-5.6.35-80.0.tar.gz) = 55839147 +TIMESTAMP = 1496051683 +SHA256 (percona-server-5.6.36-82.0.tar.gz) = 4304ac45de79053128fb78f13527f483ec9cf1c9592498deeacbbe541216fc9d +SIZE (percona-server-5.6.36-82.0.tar.gz) = 56116691 Modified: head/databases/percona56-server/files/patch-client_mysql.cc ============================================================================== --- head/databases/percona56-server/files/patch-client_mysql.cc Tue Aug 1 19:06:08 2017 (r447071) +++ head/databases/percona56-server/files/patch-client_mysql.cc Tue Aug 1 19:14:54 2017 (r447072) @@ -1,6 +1,6 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n +--- client/mysql.cc.orig 2017-05-09 08:31:39.000000000 +0200 ++++ client/mysql.cc 2017-05-29 13:24:38.665722000 +0200 +@@ -2784,9 +2784,11 @@ #ifdef HAVE_LOCALE_H setlocale(LC_ALL,""); /* so as libedit use isprint */ #endif @@ -14,11 +14,11 @@ #else rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; rl_completion_entry_function= &no_completion; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const +@@ -2805,7 +2807,7 @@ int end MY_ATTRIBUTE((unused))) { if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) +-#if defined(USE_NEW_XLINE_INTERFACE) +#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) return rl_completion_matches(text, new_command_generator); #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708011914.v71JEsSa093476>