From owner-svn-ports-all@freebsd.org Mon Apr 17 14:58:08 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88D9AD41511; Mon, 17 Apr 2017 14:58:08 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65FEAB93; Mon, 17 Apr 2017 14:58:08 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3HEw7rK054108; Mon, 17 Apr 2017 14:58:07 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3HEw68i054101; Mon, 17 Apr 2017 14:58:06 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201704171458.v3HEw68i054101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Mon, 17 Apr 2017 14:58:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438699 - in head/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Apr 2017 14:58:08 -0000 Author: mmokhi Date: Mon Apr 17 14:58:06 2017 New Revision: 438699 URL: https://svnweb.freebsd.org/changeset/ports/438699 Log: databases/mysql57-{server client}: Update to latest 5.7.18 release Fix some no-longer-valid (but needed) patches. Reviewed by: feld, mat (mentors) Approved by: feld (mentor) Differential Revision: https://reviews.freebsd.org/D10392 Modified: head/databases/mysql57-client/Makefile head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt head/databases/mysql57-server/Makefile head/databases/mysql57-server/distinfo head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc head/databases/mysql57-server/pkg-plist Modified: head/databases/mysql57-client/Makefile ============================================================================== --- head/databases/mysql57-client/Makefile Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-client/Makefile Mon Apr 17 14:58:06 2017 (r438699) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-client/files/patch-support-files_CMakeLists.txt Mon Apr 17 14:58:06 2017 (r438699) @@ -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() Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-server/Makefile Mon Apr 17 14:58:06 2017 (r438699) @@ -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 Modified: head/databases/mysql57-server/distinfo ============================================================================== --- head/databases/mysql57-server/distinfo Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-server/distinfo Mon Apr 17 14:58:06 2017 (r438699) @@ -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 Modified: head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt ============================================================================== --- head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Mon Apr 17 14:58:06 2017 (r438699) @@ -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} Modified: head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc ============================================================================== --- head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc Mon Apr 17 14:58:06 2017 (r438699) @@ -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) Modified: head/databases/mysql57-server/pkg-plist ============================================================================== --- head/databases/mysql57-server/pkg-plist Mon Apr 17 14:54:56 2017 (r438698) +++ head/databases/mysql57-server/pkg-plist Mon Apr 17 14:58:06 2017 (r438699) @@ -136,7 +136,6 @@ man/man8/mysqld.8.gz %%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