Index: databases/mysql56-client/Makefile =================================================================== --- databases/mysql56-client/Makefile +++ databases/mysql56-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 4 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) Index: databases/mysql56-client/files/patch-client_mysql.cc =================================================================== --- databases/mysql56-client/files/patch-client_mysql.cc +++ /dev/null @@ -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); Index: databases/mysql56-client/files/patch-cmake_readline.cmake =================================================================== --- databases/mysql56-client/files/patch-cmake_readline.cmake +++ /dev/null @@ -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 - 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) - Index: databases/mysql56-client/files/patch-support-files_CMakeLists.txt =================================================================== --- databases/mysql56-client/files/patch-support-files_CMakeLists.txt +++ databases/mysql56-client/files/patch-support-files_CMakeLists.txt @@ -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() Index: databases/mysql56-server/Makefile =================================================================== --- databases/mysql56-server/Makefile +++ databases/mysql56-server/Makefile @@ -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 Index: databases/mysql56-server/distinfo =================================================================== --- databases/mysql56-server/distinfo +++ databases/mysql56-server/distinfo @@ -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 Index: databases/mysql56-server/files/patch-client_mysql.cc =================================================================== --- databases/mysql56-server/files/patch-client_mysql.cc +++ /dev/null @@ -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); Index: databases/mysql56-server/files/patch-cmake_readline.cmake =================================================================== --- databases/mysql56-server/files/patch-cmake_readline.cmake +++ /dev/null @@ -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 - 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) - Index: databases/mysql57-client/Makefile =================================================================== --- databases/mysql57-client/Makefile +++ databases/mysql57-client/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Index: databases/mysql57-client/files/patch-support-files_CMakeLists.txt =================================================================== --- databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ databases/mysql57-client/files/patch-support-files_CMakeLists.txt @@ -1,24 +1,14 @@ ---- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- support-files/CMakeLists.txt.orig 2017-03-18 07:45:14 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) +@@ -47,6 +47,7 @@ IF(UNIX) + 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(UNIX) 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 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Index: databases/mysql57-server/Makefile =================================================================== --- databases/mysql57-server/Makefile +++ databases/mysql57-server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.17 -PORTREVISION?= 4 +PORTVERSION= 5.7.18 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Index: databases/mysql57-server/distinfo =================================================================== --- databases/mysql57-server/distinfo +++ databases/mysql57-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483356681 -SHA256 (mysql-boost-5.7.17.tar.gz) = b75bba87199ef6a6ccc5dfbcaf70949009dc12089eafad8c5254afc9002aa903 -SIZE (mysql-boost-5.7.17.tar.gz) = 61480982 +TIMESTAMP = 1492018141 +SHA256 (mysql-boost-5.7.18.tar.gz) = ae6f5e2cf7b936496cf60260cd7fd5a0862c21f48cd240448021c4ea067a0f0c +SIZE (mysql-boost-5.7.18.tar.gz) = 61612105 Index: databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt =================================================================== --- databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt +++ databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt @@ -1,9 +1,9 @@ ---- rapid/plugin/x/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ rapid/plugin/x/CMakeLists.txt -@@ -91,14 +91,14 @@ ELSE() - ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include +@@ -92,14 +92,14 @@ ELSE() ${CMAKE_SOURCE_DIR}/include #temporary ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql + ${CMAKE_CURRENT_BINARY_DIR}/generated - ${SSL_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} Index: databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== --- databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc +++ databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc @@ -1,6 +1,6 @@ ---- sql/conn_handler/socket_connection.cc.orig 2016-03-28 18:06:12 UTC +--- sql/conn_handler/socket_connection.cc.orig 2017-03-18 07:45:14 UTC +++ sql/conn_handler/socket_connection.cc -@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li +@@ -942,22 +942,25 @@ Channel_info* Mysqld_socket_listener::li signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, mysql_socket_getfd(connect_sock), NULL); @@ -22,9 +22,11 @@ - "refused connect from %s", eval_client(&req)); + "refused connect from %s", my_eval_client(&req)); + #ifdef HAVE_LIBWRAP_PROTOTYPES + // Some distros have patched tcpd.h to have proper prototypes if (req.sink) - (req.sink)(req.fd); + ((void (*)(int)) (req.sink))(req.fd); - - mysql_socket_shutdown(listen_sock, SHUT_RDWR); - mysql_socket_close(listen_sock); + #else + // Some distros have not patched tcpd.h + if (req.sink) Index: databases/mysql57-server/pkg-plist =================================================================== --- databases/mysql57-server/pkg-plist +++ databases/mysql57-server/pkg-plist @@ -136,7 +136,6 @@ %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_security_commands.sql