1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

databases/mysql56-{server client}: Update to latest 5.6.36

Also Delete patches that merged/fixed by upstream.
And fix some no-longer-valid (but needed) patches.

Reviewed by:	feld, mat (mentors)
Approved by:	feld (mentor)
Differential Revision:	https://reviews.freebsd.org/D10392
This commit is contained in:
Mahdi Mokhtari 2017-04-17 14:54:56 +00:00
parent 037b33fecb
commit 77048993fa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=438698
8 changed files with 12 additions and 94 deletions

View File

@ -2,7 +2,6 @@
# $FreeBSD$
PORTNAME= mysql
PORTREVISION?= 4
PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client)

View File

@ -1,25 +0,0 @@
--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC
+++ client/mysql.cc
@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n
#ifdef HAVE_LOCALE_H
setlocale(LC_ALL,""); /* so as libedit use isprint */
#endif
- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
- rl_completion_entry_function= &no_completion;
+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
+ /*
rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+ */
#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
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);

View File

@ -1,17 +0,0 @@
--- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC
+++ cmake/readline.cmake
@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
#include <readline.h>
int main(int argc, char **argv)
{
- typedef int MYFunction(const char*, int);
+ typedef char *MYFunction(const char*, int);
MYFunction* myf= rl_completion_entry_function;
- int res= (myf)(NULL, 0);
+ char *res= (myf)(NULL, 0);
completion_matches(0,0);
- return res;
+ return (res != NULL);
}"
EDITLINE_HAVE_COMPLETION)

View File

@ -1,6 +1,6 @@
--- support-files/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
--- support-files/CMakeLists.txt.orig 2017-03-18 06:43:12 UTC
+++ support-files/CMakeLists.txt
@@ -44,14 +44,17 @@ ELSE()
@@ -44,11 +44,13 @@ ELSE()
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
@ -13,12 +13,16 @@
+ENDIF()
IF(UNIX)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -57,6 +59,7 @@ IF(UNIX)
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 @@ IF(UNIX)
@@ -73,8 +76,10 @@ IF(UNIX)
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 @@ IF(UNIX)
@@ -99,3 +104,4 @@ IF(UNIX)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDIF()

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
PORTVERSION= 5.6.35
PORTREVISION?= 7
PORTVERSION= 5.6.36
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1484753208
SHA256 (mysql-5.6.35.tar.gz) = dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020
SIZE (mysql-5.6.35.tar.gz) = 32167628
TIMESTAMP = 1492102457
SHA256 (mysql-5.6.36.tar.gz) = 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147
SIZE (mysql-5.6.36.tar.gz) = 32192348

View File

@ -1,25 +0,0 @@
--- client/mysql.cc.orig 2016-09-30 11:41:40 UTC
+++ client/mysql.cc
@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n
#ifdef HAVE_LOCALE_H
setlocale(LC_ALL,""); /* so as libedit use isprint */
#endif
- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
- rl_completion_entry_function= &no_completion;
+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
+ /*
rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+ */
#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
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);

View File

@ -1,17 +0,0 @@
--- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC
+++ cmake/readline.cmake
@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
#include <readline.h>
int main(int argc, char **argv)
{
- typedef int MYFunction(const char*, int);
+ typedef char *MYFunction(const char*, int);
MYFunction* myf= rl_completion_entry_function;
- int res= (myf)(NULL, 0);
+ char *res= (myf)(NULL, 0);
completion_matches(0,0);
- return res;
+ return (res != NULL);
}"
EDITLINE_HAVE_COMPLETION)