cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 5.6.36-82.0

Browse Source 
PR:		219631
Submitted by:	Thomas Babut
This commit is contained in:
Florian Smeets 2017-08-01 19:14:54 +00:00
parent 1497592ce3
commit 2c69d5125f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447072
6 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
databases/percona56-client/files/patch-CMakeLists.txt
View File

@ -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)

10
databases/percona56-client/files/patch-client_mysql.cc
View File

@ -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

14
databases/percona56-client/files/patch-support-files_CMakeLists.txt
View File

@ -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()

4
databases/percona56-server/Makefile
View File

@ -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

6
databases/percona56-server/distinfo
View File

@ -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

10
databases/percona56-server/files/patch-client_mysql.cc
View File

@ -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