From owner-svn-ports-head@freebsd.org Sun Oct 28 22:31:56 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8CF4210E3B81; Sun, 28 Oct 2018 22:31:56 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4241073599; Sun, 28 Oct 2018 22:31:56 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 233BB259BA; Sun, 28 Oct 2018 22:31:56 +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 w9SMVuR5050039; Sun, 28 Oct 2018 22:31:56 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SMVtp9050034; Sun, 28 Oct 2018 22:31:55 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201810282231.w9SMVtp9050034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Sun, 28 Oct 2018 22:31:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483359 - in head/databases: mysql57-client/files mysql57-server mysql57-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/databases: mysql57-client/files mysql57-server mysql57-server/files X-SVN-Commit-Revision: 483359 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 22:31:56 -0000 Author: mmokhi Date: Sun Oct 28 22:31:54 2018 New Revision: 483359 URL: https://svnweb.freebsd.org/changeset/ports/483359 Log: databases/mysql57-{client, server}: Update to 5.7.24 Delete merged-to-upstream FreeBSD patches, edit half-merged ones. Upstream bugfixes: Regression of Bug #27753193 (segfault on ALTER TABLE adding primary key, InnoDB) Query interruption during a lock wait caused an error: Bug #28068293 Raised assertion during an OPTIMIZE TABLE operation for InnoDB: Bug #27753193 More info on update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-24.html PR: 232685 Reported by: Markus Kohlmeyer Sponsored by: The FreeBSD Foundation Added: head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c (contents, props changed) Deleted: head/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Modified: head/databases/mysql57-server/Makefile head/databases/mysql57-server/distinfo head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Added: head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c Sun Oct 28 22:31:54 2018 (r483359) @@ -0,0 +1,10 @@ +--- mysys/mf_iocache2.c.orig 2018-10-28 11:22:04 UTC ++++ mysys/mf_iocache2.c +@@ -19,6 +19,7 @@ + + #include "mysys_priv.h" + #include "my_sys.h" ++#include "mysql/psi/mysql_file.h" + #include + #include + #include Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Sun Oct 28 22:00:18 2018 (r483358) +++ head/databases/mysql57-server/Makefile Sun Oct 28 22:31:54 2018 (r483359) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.23 -PORTREVISION?= 1 +PORTVERSION= 5.7.24 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Modified: head/databases/mysql57-server/distinfo ============================================================================== --- head/databases/mysql57-server/distinfo Sun Oct 28 22:00:18 2018 (r483358) +++ head/databases/mysql57-server/distinfo Sun Oct 28 22:31:54 2018 (r483359) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533936896 -SHA256 (mysql-boost-5.7.23.tar.gz) = d05700ec5c1c6dae9311059dc1713206c29597f09dbd237bf0679b3c6438e87a -SIZE (mysql-boost-5.7.23.tar.gz) = 49025014 +TIMESTAMP = 1540720845 +SHA256 (mysql-boost-5.7.24.tar.gz) = b980dced9c9eb3385cca44870facc220504ca011196c5a19c2bfe43d3f5d6212 +SIZE (mysql-boost-5.7.24.tar.gz) = 49110448 Modified: head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt ============================================================================== --- head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun Oct 28 22:00:18 2018 (r483358) +++ head/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Sun Oct 28 22:31:54 2018 (r483359) @@ -1,18 +1,16 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-10-04 05:48:22 UTC +++ libmysql/authentication_ldap/CMakeLists.txt -@@ -52,8 +52,10 @@ ELSE () - SET(SASL_LIBRARY "sasl2") - ENDIF () +@@ -106,11 +106,13 @@ ELSE() + ENDIF() --MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -- auth_ldap_sasl_client.cc log_client.cc -- LINK_LIBRARIES ${SASL_LIBRARY} -- MODULE_ONLY -- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") + MESSAGE(STATUS "SASL_LIBRARY = ${SASL_LIBRARY}") +IF (WITH_AUTHENTICATION_LDAP) -+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -+ auth_ldap_sasl_client.cc log_client.cc -+ LINK_LIBRARIES ${SASL_LIBRARY} -+ MODULE_ONLY -+ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") -+ENDIF() + MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client + auth_ldap_sasl_client.cc log_client.cc + LINK_LIBRARIES ${SASL_LIBRARY} + CLIENT_ONLY MODULE_ONLY + MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF () + + IF(WIN32) + GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME) Modified: head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt ============================================================================== --- head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Sun Oct 28 22:00:18 2018 (r483358) +++ head/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Sun Oct 28 22:31:54 2018 (r483359) @@ -1,11 +1,10 @@ --- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ rapid/plugin/x/CMakeLists.txt -@@ -92,14 +92,14 @@ ELSE() +@@ -92,13 +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} )