<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6c920041597bdd5b5c8bb02d739112f18788d8d5">https://github.com/macports/macports-ports/commit/6c920041597bdd5b5c8bb02d739112f18788d8d5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6c92004 mysql56: update to 5.6.47
</span>6c92004 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c920041597bdd5b5c8bb02d739112f18788d8d5
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Apr 18 16:15:16 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql56: update to 5.6.47
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use MacPorts' OpenSSL:
</span><span style='display:block; white-space:pre;color:#404040;'> As of MySQL 5.6.46, it is now compatible with OpenSSL 1.1.1.
</span><span style='display:block; white-space:pre;color:#404040;'> yassl is no longer bundled, and external OpenSSL is required.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove old pre-activate phase
</span>---
databases/mysql56/Portfile | 31 +++++++---------------
.../patch-cmake-install_layout.cmake-yassl.diff | 11 --------
2 files changed, 10 insertions(+), 32 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 0cfd03c..3d3b3d5 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;'>@@ -9,7 +9,7 @@ deprecated.upstream_support no
</span>
name mysql56
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6.45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.6.47
</span> # Set revision_client and revision_server to 0 on
# version bump.
set revision_client 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,6 @@ if {$subport eq $name} {
</span> patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add yasll includes and libs before prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cmake-install_layout.cmake-yassl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Fix detection of htonll/ntohll.
patchfiles-append patch-configure.cmake.diff \
patch-innodb_memcached-daemon_memcached-include-memcached-util.h.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +49,15 @@ 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 c711161babd1b8f9b7f96d88264a468972a83a0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32525559
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c580c4bab8c81db0bc9eac19223fb2b260e35f55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0919096705784c62af831bb607e99345083edd76967c8c65966728742a9127fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32388152
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tcp_wrappers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:zlib port:tcp_wrappers port:ncurses
</span> depends_run-append port:mysql_select
select.group mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +106,7 @@ if {$subport eq $name} {
</span> -DENABLE_GCOV:BOOL=OFF \
-DENABLE_DTRACE:BOOL=OFF \
-DWITH_LIBWRAP:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_SSL:STRING=bundled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL:STRING=${prefix} \
</span> -DWITH_INNODB_MEMCACHED=1 \
-DWITH_PARTITION_STORAGE_ENGINE=1
configure.cppflags-delete \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,18 +144,6 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The macports-default.cnf is installed by ${name_mysql}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 5.5.25] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff b/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00e34c0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql56/files/patch-cmake-install_layout.cmake-yassl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/install_layout.cmake 2016-02-22 12:55:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/install_layout.cmake 2016-02-22 12:56:57.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,6 +225,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # MACPORTS layout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDE_DIRECTORIES(@WORKSRCPATH@/extra/yassl/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LINK_DIRECTORIES(@WORKSRCPATH@/extra/yassl/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_BINDIR_MACPORTS "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_SBINDIR_MACPORTS "lib/@NAME@/bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(INSTALL_SCRIPTDIR_MACPORTS "lib/@NAME@/bin")
</span></pre><pre style='margin:0'>
</pre>