svn commit: r439718 - in branches/2017Q2/databases: mysql57-client mysql57-client/files mysql57-server mysql57-server/files

Mahdi Mokhtari mmokhi at FreeBSD.org
Sat Apr 29 05:47:33 UTC 2017 

Author: mmokhi
Date: Sat Apr 29 05:47:30 2017
New Revision: 439718
URL: https://svnweb.freebsd.org/changeset/ports/439718

Log:
  MFH: r438699
  
  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
  
  PR:             218934
  Approved by:	ports-secteam (feld)

Modified:
  branches/2017Q2/databases/mysql57-client/Makefile
  branches/2017Q2/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
  branches/2017Q2/databases/mysql57-server/Makefile
  branches/2017Q2/databases/mysql57-server/distinfo
  branches/2017Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
  branches/2017Q2/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
  branches/2017Q2/databases/mysql57-server/pkg-plist
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/databases/mysql57-client/Makefile
==============================================================================
--- branches/2017Q2/databases/mysql57-client/Makefile	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-client/Makefile	Sat Apr 29 05:47:30 2017	(r439718)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	2
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)

Modified: branches/2017Q2/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
==============================================================================
--- branches/2017Q2/databases/mysql57-client/files/patch-support-files_CMakeLists.txt	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-client/files/patch-support-files_CMakeLists.txt	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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: branches/2017Q2/databases/mysql57-server/Makefile
==============================================================================
--- branches/2017Q2/databases/mysql57-server/Makefile	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-server/Makefile	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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: branches/2017Q2/databases/mysql57-server/distinfo
==============================================================================
--- branches/2017Q2/databases/mysql57-server/distinfo	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-server/distinfo	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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: branches/2017Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
==============================================================================
--- branches/2017Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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: branches/2017Q2/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
==============================================================================
--- branches/2017Q2/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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: branches/2017Q2/databases/mysql57-server/pkg-plist
==============================================================================
--- branches/2017Q2/databases/mysql57-server/pkg-plist	Sat Apr 29 05:44:25 2017	(r439717)
+++ branches/2017Q2/databases/mysql57-server/pkg-plist	Sat Apr 29 05:47:30 2017	(r439718)
@@ -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

More information about the svn-ports-branches mailing list