From owner-svn-ports-all@freebsd.org Tue May 10 02:12:22 2016 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 BF77AB35CB4; Tue, 10 May 2016 02:12:22 +0000 (UTC) (envelope-from junovitch@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 82044143F; Tue, 10 May 2016 02:12:22 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4A2CLax022392; Tue, 10 May 2016 02:12:21 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4A2CLk4022386; Tue, 10 May 2016 02:12:21 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201605100212.u4A2CLk4022386@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 10 May 2016 02:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414912 - in branches/2016Q2/databases: mysql56-client/files mysql56-server X-SVN-Group: ports-branches 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.22 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: Tue, 10 May 2016 02:12:22 -0000 Author: junovitch Date: Tue May 10 02:12:21 2016 New Revision: 414912 URL: https://svnweb.freebsd.org/changeset/ports/414912 Log: MFH: r413653 Update to 5.6.30 release. PR: 209344 Reported by: Fabiano Sidler Approved by: ports-secteam (with hat) Security: https://vuxml.FreeBSD.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html Modified: branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt branches/2016Q2/databases/mysql56-server/Makefile branches/2016Q2/databases/mysql56-server/distinfo Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000 -@@ -492,8 +492,8 @@ +--- CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ CMakeLists.txt 2016-04-19 17:30:13.343558770 +0200 +@@ -475,8 +475,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,7 +10,7 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -546,18 +546,17 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -30,10 +30,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +596,6 @@ +@@ -579,6 +578,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-client_CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,7 +1,7 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ client/CMakeLists.txt 2016-04-19 17:30:13.344558659 +0200 +@@ -37,9 +37,11 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) @@ -12,8 +12,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -32,7 +32,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ +@@ -81,8 +87,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( Modified: branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- cmake/build_configurations/compiler_options.cmake.orig 2014-12-05 10:49:17.394216277 +0000 -+++ cmake/build_configurations/compiler_options.cmake 2014-12-05 10:50:58.144209859 +0000 -@@ -25,7 +25,7 @@ +--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-03 16:35:33.000000000 +0100 ++++ cmake/build_configurations/compiler_options.cmake 2016-04-19 17:30:13.345558666 +0200 +@@ -25,7 +25,7 @@ IF(UNIX) # Default GCC flags IF(CMAKE_COMPILER_IS_GNUCC) @@ -9,7 +9,7 @@ # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ IF(UNIX) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") ENDIF() IF(CMAKE_COMPILER_IS_GNUCXX) Modified: branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt ============================================================================== --- branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-client/files/patch-extra_CMakeLists.txt Tue May 10 02:12:21 2016 (r414912) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 -@@ -60,6 +60,7 @@ +--- extra/CMakeLists.txt.orig 2016-03-03 16:35:33.000000000 +0100 ++++ extra/CMakeLists.txt 2016-04-19 17:37:34.634528313 +0200 +@@ -60,6 +60,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -96,11 +97,14 @@ +@@ -96,10 +97,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) ENDIF() @@ -16,9 +16,8 @@ IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) Modified: branches/2016Q2/databases/mysql56-server/Makefile ============================================================================== --- branches/2016Q2/databases/mysql56-server/Makefile Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-server/Makefile Tue May 10 02:12:21 2016 (r414912) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.27 +PORTVERSION= 5.6.30 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 Modified: branches/2016Q2/databases/mysql56-server/distinfo ============================================================================== --- branches/2016Q2/databases/mysql56-server/distinfo Tue May 10 01:57:37 2016 (r414911) +++ branches/2016Q2/databases/mysql56-server/distinfo Tue May 10 02:12:21 2016 (r414912) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.27.tar.gz) = 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d -SIZE (mysql-5.6.27.tar.gz) = 33327156 +SHA256 (mysql-5.6.30.tar.gz) = 48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb +SIZE (mysql-5.6.30.tar.gz) = 32223818