<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120590] trunk/dports/databases/mysql56</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120590">120590</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-06-02 11:08:58 -0700 (Mon, 02 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>databases/mysql56:
- Update to version 5.6.19.
- Patch mysql_secure_installation to find mysql client. Closes #40606
- Use bundled yassl by default.
- Patch scripts/* files that do not find configuration, support and binary files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesmysql56Portfile">trunk/dports/databases/mysql56/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmysql56filespatchscriptsmysql_install_dbplindiff">trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesmysql56Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql56/Portfile (120589 => 120590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/Portfile 2014-06-02 14:41:18 UTC (rev 120589)
+++ trunk/dports/databases/mysql56/Portfile 2014-06-02 18:08:58 UTC (rev 120590)
</span><span class="lines">@@ -6,10 +6,10 @@
</span><span class="cx">
</span><span class="cx"> name mysql56
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 5.6.16
</del><ins>+version 5.6.19
</ins><span class="cx"> # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
</span><span class="cx"> # version bump.
</span><del>-set revision_client 3
</del><ins>+set revision_client 0
</ins><span class="cx"> set revision_server 0
</span><span class="cx"> set revision_innodb_memcached_plugin 0
</span><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="lines">@@ -31,10 +31,9 @@
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff
</span><span class="cx">
</span><del>- # Fix some mysql_install_db paths.
- # Using reinplace since mysql_install_db.pl.in appears broken with regard to using SYSCONDIR
- # and SUPPORTFILESDIR.
- patchfiles-append patch-scripts-mysql_install_db.pl.in.diff
</del><ins>+ # Patch scripts/* files that do not find configuration, support and binary files.
+ patchfiles-append patch-scripts-mysql_install_db.pl.in.diff \
+ patch-scripts-mysql_secure_installation.pl.in.diff
</ins><span class="cx">
</span><span class="cx"> # Don't allow mysql to set the compiler to g++
</span><span class="cx"> # See http://bazaar.launchpad.net/~mysql/mysql-server/5.6/revision/4223.1.4
</span><span class="lines">@@ -52,8 +51,8 @@
</span><span class="cx"> configure.compiler gcc
</span><span class="cx"> }
</span><span class="cx">
</span><del>- checksums rmd160 11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
- sha256 70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
</del><ins>+ checksums rmd160 3cc8acbef87c98f5221307f9b8351bd7d2f7f7e3 \
+ sha256 80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
</ins><span class="cx">
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="lines">@@ -77,6 +76,8 @@
</span><span class="cx"> ${worksrcpath}/scripts/mysql_install_db.pl.in
</span><span class="cx"> reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
</span><span class="cx"> ${worksrcpath}/scripts/mysql_install_db.pl.in
</span><ins>+ reinplace "s|@BINDIR@|${prefix}/lib/${name}/bin|g" \
+ ${worksrcpath}/scripts/mysql_secure_installation.pl.in
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.dir ${worksrcpath}/build_macports
</span><span class="lines">@@ -181,12 +182,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant openssl description {Enable OpenSSL support} {}
- # Until yassl builds use MacPorts openssl.
- # Getting mysql56 to build with yassl would make the binaries distributable.
- # When mysql56 builds with yassl remove "true" from the "if" statement below or
- # put the contents of the "if" block into the openssl variant block.
- if { true || [variant_isset openssl] } {
</del><ins>+ variant openssl description {Enable OpenSSL support} {
</ins><span class="cx"> configure.args-delete -DWITH_SSL:STRING=bundled
</span><span class="cx"> configure.args-append -DWITH_SSL:STRING=${prefix}
</span><span class="cx"> depends_lib-append port:openssl
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql56filespatchscriptsmysql_install_dbplindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff (120589 => 120590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff 2014-06-02 14:41:18 UTC (rev 120589)
+++ trunk/dports/databases/mysql56/files/patch-scripts-mysql_install_db.pl.in.diff 2014-06-02 18:08:58 UTC (rev 120590)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>---- a/scripts/mysql_install_db.pl.in 2013-06-20 08:22:33.000000000 -0700
-+++ b/scripts/mysql_install_db.pl.in 2013-06-20 19:36:15.000000000 -0700
-@@ -428,10 +428,10 @@
- # This will be the default config file
- # ----------------------------------------------------------------------
</del><ins>+--- a/scripts/mysql_install_db.pl.in 2014-05-12 23:43:21.000000000 -0430
++++ b/scripts/mysql_install_db.pl.in 2014-05-12 23:49:54.000000000 -0430
+@@ -460,10 +460,10 @@
</ins><span class="cx">
</span><del>--$config_file= "$basedir/my.cnf";
-+$config_file= "$basedir@SYSCONFDIR@/my.cnf";
</del><ins>+ my $cnfext = ( $^O =~ m/^(MSWin32|cygwin)$/ ) ? "ini" : "cnf";
</ins><span class="cx">
</span><del>- my $cfg_template= find_in_basedir($opt,"file","my-default.cnf",
-- "share","share/mysql","support-files");
-+ "@SUPPORTFILESDIR@","share","share/mysql","support-files");
- -e $cfg_template or cannot_find_file("my-default.cnf");
</del><ins>+-$config_file= "$basedir/my.$cnfext";
++$config_file= "$basedir@SYSCONFDIR@/my.$cnfext";
</ins><span class="cx">
</span><ins>+ my $cfg_template= find_in_basedir($opt,"file","my-default.$cnfext",
+- ".", "share","share/mysql","support-files");
++ "@SUPPORTFILESDIR@",".", "share","share/mysql","support-files");
+ -e $cfg_template or cannot_find_file("my-default.$cnfext");
+
</ins><span class="cx"> $copy_cfg_file= $config_file;
</span></span></pre>
</div>
</div>
</body>
</html>