Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jul 2017 15:04:24 +0000 (UTC)
From:      Mahdi Mokhtari <mmokhi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r446589 - in branches/2017Q3/databases: mysql57-client mysql57-client/files mysql57-server
Message-ID:  <201707251504.v6PF4O77038980@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmokhi
Date: Tue Jul 25 15:04:23 2017
New Revision: 446589
URL: https://svnweb.freebsd.org/changeset/ports/446589

Log:
  MFH: r446203
  
  databases/mysql57-{client/server}: Update to 5.7.19
  ChangeLog for this update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-19.html
  
  PR:		220849
  Reviewed by:	mat (mentor)
  Approved by:	mat (mentor)
  Sponsored by:	Netzkommune GmbH
  Differential Revision:	https://reviews.freebsd.org/D11656
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c
     - copied unchanged from r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c
Modified:
  branches/2017Q3/databases/mysql57-client/Makefile
  branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt
  branches/2017Q3/databases/mysql57-server/Makefile
  branches/2017Q3/databases/mysql57-server/distinfo
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/databases/mysql57-client/Makefile
==============================================================================
--- branches/2017Q3/databases/mysql57-client/Makefile	Tue Jul 25 14:43:31 2017	(r446588)
+++ branches/2017Q3/databases/mysql57-client/Makefile	Tue Jul 25 15:04:23 2017	(r446589)
@@ -23,7 +23,8 @@ CONFLICTS_INSTALL=	mysql5[0-68-9]-client-* \
 			mariadb[0-9][0-9]-client-* \
 			percona[0-9][0-9]-client-*
 
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
+		-DWITH_NDBCLUSTER=1
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 

Modified: branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt
==============================================================================
--- branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt	Tue Jul 25 14:43:31 2017	(r446588)
+++ branches/2017Q3/databases/mysql57-client/files/patch-CMakeLists.txt	Tue Jul 25 15:04:23 2017	(r446589)
@@ -1,7 +1,17 @@
---- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- CMakeLists.txt.orig	2017-06-22 14:13:19 UTC
 +++ CMakeLists.txt
-@@ -606,8 +606,8 @@ ENDIF()
+@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
+   SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
+   # Add storage engines and plugins.
+   CONFIGURE_PLUGINS()
+-ELSE()
+-  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
+-  ADD_SUBDIRECTORY(storage/ndb)
+ ENDIF()
  
+ ADD_SUBDIRECTORY(include)
+@@ -647,8 +644,8 @@ ENDIF()
+ 
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
 -ADD_SUBDIRECTORY(sql/share)
@@ -10,7 +20,7 @@
  
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
-@@ -676,14 +676,13 @@ ELSE()
+@@ -719,14 +716,13 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -26,7 +36,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Copied: branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c (from r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q3/databases/mysql57-client/files/patch-mysys_my__symlink.c	Tue Jul 25 15:04:23 2017	(r446589, copy of r446203, head/databases/mysql57-client/files/patch-mysys_my__symlink.c)
@@ -0,0 +1,10 @@
+--- mysys/my_symlink.c.orig	2017-07-19 12:10:42 UTC
++++ mysys/my_symlink.c
+@@ -23,6 +23,7 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #endif
++#include "my_dir.h"
+ 
+ /*
+   Reads the content of a symbolic link

Modified: branches/2017Q3/databases/mysql57-server/Makefile
==============================================================================
--- branches/2017Q3/databases/mysql57-server/Makefile	Tue Jul 25 14:43:31 2017	(r446588)
+++ branches/2017Q3/databases/mysql57-server/Makefile	Tue Jul 25 15:04:23 2017	(r446589)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.18
+PORTVERSION=	5.7.19
 PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7

Modified: branches/2017Q3/databases/mysql57-server/distinfo
==============================================================================
--- branches/2017Q3/databases/mysql57-server/distinfo	Tue Jul 25 14:43:31 2017	(r446588)
+++ branches/2017Q3/databases/mysql57-server/distinfo	Tue Jul 25 15:04:23 2017	(r446589)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492018141
-SHA256 (mysql-boost-5.7.18.tar.gz) = ae6f5e2cf7b936496cf60260cd7fd5a0862c21f48cd240448021c4ea067a0f0c
-SIZE (mysql-boost-5.7.18.tar.gz) = 61612105
+TIMESTAMP = 1500470016
+SHA256 (mysql-boost-5.7.19.tar.gz) = 22e5034e40e0731eff521b7aaf7584b76297a69875ee50026b12f2bfac3e1bca
+SIZE (mysql-boost-5.7.19.tar.gz) = 48799895



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707251504.v6PF4O77038980>