<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/86273f4937ff357401e1769424e4609b06fac7e7">https://github.com/macports/macports-ports/commit/86273f4937ff357401e1769424e4609b06fac7e7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 86273f4937ff357401e1769424e4609b06fac7e7
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Nov 6 10:00:44 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> mysql56: update to version 5.6.34
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Security update: See http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-34.html
</span>---
databases/mysql56/Portfile | 9 ++++----
.../files/patch-cmake-install_layout.cmake.diff | 24 +++++++++++-----------
2 files changed, 16 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql56/Portfile b/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cca5cd9..6e08703 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,14 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
name mysql56
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6.33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.34
</span> # Set revision_client and revision_server to 0 on
# version bump.
set revision_client 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span> set version_branch [join [lrange [split ${version} .] 0 1] .]
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +47,8 @@ if {$subport eq $name} {
</span> patchfiles-append patch-scripts-mysql_install_db.pl.in.diff \
patch-scripts-mysql_secure_installation.pl.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60776ec27d78b59f597e71738c5bcdea64dcba33c36fede320d5930320b1fef0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4095f4276623432d235211a445b5d5f540658b2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee90bafec6af3abe2715ccb0b3cc9345ed8d1cce025d41e6ec2b2b7a7d820823
</span>
depends_lib-append port:zlib port:tcp_wrappers
depends_run-append port:mysql_select
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql56/files/patch-cmake-install_layout.cmake.diff b/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c8a5288..5b8dbb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_layout.cmake 2013-06-10 11:26:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_layout.cmake 2013-06-10 12:37:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/install_layout.cmake 2016-09-30 06:41:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/install_layout.cmake 2016-11-06 09:41:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span> ENDIF()
SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CACHE STRING "Installation directory layout. Options are: STANDALONE (as in zip or tar.gz installer), RPM, DEB, SVR4, MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, OSX, SLES")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), WIN (as in zip installer), STANDALONE, RPM, DEB, SVR4, FREEBSD, GLIBC, MACPORTS, OSX, SLES")
</span>
IF(UNIX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(INSTALL_LAYOUT MATCHES "RPM")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(INSTALL_LAYOUT MATCHES "RPM" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@
</span> SET(CMAKE_INSTALL_PREFIX ${default_prefix}
CACHE PATH "install prefix" FORCE)
ENDIF()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(VALID_INSTALL_LAYOUTS "RPM" "STANDALONE" "DEB" "SVR4" "MACPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "OSX" "TARGZ" "SLES" "STANDALONE")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(VALID_INSTALL_LAYOUTS "RPM" "DEB" "SVR4" "FREEBSD" "GLIBC" "MACPORTS" "OSX" "TARGZ" "SLES" "STANDALONE")
</span> LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
IF(ind EQUAL -1)
MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,6 +222,35 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,6 +442,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_SECURE_FILE_PRIVDIR_SVR4 ${secure_file_priv_path})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(INSTALL_SECURE_FILE_PRIV_EMBEDDEDDIR_SVR4 ${secure_file_priv_embedded_path})
</span>
+#
+# MACPORTS layout
</pre><pre style='margin:0'>
</pre>