Date: Fri, 26 May 2017 14:33:48 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r441785 - in branches/2017Q2/databases: mysql56-client mysql56-client/files mysql56-server Message-ID: <201705261433.v4QEXmvR055320@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Fri May 26 14:33:48 2017 New Revision: 441785 URL: https://svnweb.freebsd.org/changeset/ports/441785 Log: MFH: r438698 databases/mysql56-{server client}: Update to latest 5.6.36 Also Delete patches that merged/fixed by upstream. And fix some no-longer-valid (but needed) patches. PR: 219521 Approved by: ports-secteam (with hat) Modified: branches/2017Q2/databases/mysql56-client/Makefile branches/2017Q2/databases/mysql56-client/files/patch-support-files_CMakeLists.txt branches/2017Q2/databases/mysql56-server/Makefile branches/2017Q2/databases/mysql56-server/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/databases/mysql56-client/Makefile ============================================================================== --- branches/2017Q2/databases/mysql56-client/Makefile Fri May 26 14:27:45 2017 (r441784) +++ branches/2017Q2/databases/mysql56-client/Makefile Fri May 26 14:33:48 2017 (r441785) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION?= 3 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) Modified: branches/2017Q2/databases/mysql56-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- branches/2017Q2/databases/mysql56-client/files/patch-support-files_CMakeLists.txt Fri May 26 14:27:45 2017 (r441784) +++ branches/2017Q2/databases/mysql56-client/files/patch-support-files_CMakeLists.txt Fri May 26 14:33:48 2017 (r441785) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC +--- support-files/CMakeLists.txt.orig 2017-03-18 06:43:12 UTC +++ support-files/CMakeLists.txt -@@ -44,14 +44,17 @@ ELSE() +@@ -44,11 +44,13 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -13,12 +13,16 @@ +ENDIF() IF(UNIX) + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -57,6 +59,7 @@ IF(UNIX) + SET (PIDOF "pgrep -d' ' -f") + ENDIF() SET(prefix ${CMAKE_INSTALL_PREFIX}) +IF(FALSE) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,8 +71,10 @@ IF(UNIX) +@@ -73,8 +76,10 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -29,7 +33,7 @@ CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) -@@ -94,3 +99,4 @@ IF(UNIX) +@@ -99,3 +104,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Modified: branches/2017Q2/databases/mysql56-server/Makefile ============================================================================== --- branches/2017Q2/databases/mysql56-server/Makefile Fri May 26 14:27:45 2017 (r441784) +++ branches/2017Q2/databases/mysql56-server/Makefile Fri May 26 14:33:48 2017 (r441785) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.35 -PORTREVISION?= 7 +PORTVERSION= 5.6.36 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Modified: branches/2017Q2/databases/mysql56-server/distinfo ============================================================================== --- branches/2017Q2/databases/mysql56-server/distinfo Fri May 26 14:27:45 2017 (r441784) +++ branches/2017Q2/databases/mysql56-server/distinfo Fri May 26 14:33:48 2017 (r441785) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484753208 -SHA256 (mysql-5.6.35.tar.gz) = dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 -SIZE (mysql-5.6.35.tar.gz) = 32167628 +TIMESTAMP = 1492102457 +SHA256 (mysql-5.6.36.tar.gz) = 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 +SIZE (mysql-5.6.36.tar.gz) = 32192348
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705261433.v4QEXmvR055320>