<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/810ceb79a534c5543d6d1c2dd37af52196bc3a09">https://github.com/macports/macports-ports/commit/810ceb79a534c5543d6d1c2dd37af52196bc3a09</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 810ceb79a53 mysql8: update to 8.0.28
</span>810ceb79a53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 810ceb79a534c5543d6d1c2dd37af52196bc3a09
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Apr 10 09:19:47 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8: update to 8.0.28
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use correct openssl binary for given OpenSSL dir
</span><span style='display:block; white-space:pre;color:#404040;'> - use MacPorts libedit
</span><span style='display:block; white-space:pre;color:#404040;'> - remove cmake patch for sw_ver
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64259
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64006
</span>---
databases/mysql8/Portfile | 26 ++++++++++-----------
.../mysql8/files/patch-cmake-ssl-include.diff | 16 ++++++++++++-
.../mysql8/files/patch-package_name.cmake.diff | 27 ----------------------
databases/mysql8/files/patch-readline.cmake.diff | 10 ++++++++
4 files changed, 38 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59212cd26e3..d9c291dd01e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,11 @@
</span> PortSystem 1.0
name mysql8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.0.27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0.28
</span>
set boost_version 1.73.0
categories databases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
homepage https://dev.mysql.com
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +62,9 @@ if {$subport eq $name} {
</span> ${boost_distname}${extract.suffix}:boost
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 45e8048e46faa363597ace59f8cc66c7163150c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a7e72f899e6f24bcd479d378edd2f32f583e687f93a26291774815d5a549b97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 285550905 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e23705407afa27daad0ada9bdfdaff3636c87f49 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d869369eb6de4f2bb2db8d3b31b7b73968e356e5ffc4354f4b96658ab1e48b22 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 291424253 \
</span> ${boost_distname}${extract.suffix} \
rmd160 47f3dad1ddb5e1e9f367f05a4019d5fac48a2e3b \
sha256 9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +152,7 @@ if {$subport eq $name} {
</span> patch-cmake-install_layout.cmake.diff \
patch-cmake-sasl-disable-platform-check.diff \
patch-cmake-ssl-include.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-package_name.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-readline.cmake.diff \
</span> patch-rpcgen.cmake.diff \
patch-scripts-cmakelists.diff \
patch-sql-local-boost.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +175,8 @@ if {$subport eq $name} {
</span> ${cmake.build_dir}/macports/my.cnf
reinplace "s|@PREFIX@|${prefix}|g" \
${cmake.build_dir}/macports/macports-default.cnf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${cmake.build_dir}/macports/my.cnf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cmake.build_dir}/macports/my.cnf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cmake/readline.cmake
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,33 +307,33 @@ subport ${name_mysql}-server {
</span> build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 -o ${mysqluser} -g ${mysqluser} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 -o ${mysqluser} -g ${mysqluser} \
</span> [file dirname ${destroot}${log_file}]
touch ${destroot}${log_file}
file attributes ${destroot}${log_file} -o ${mysqluser} -g ${mysqluser}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
</span>
xinstall -m 0644 -o root -W ${workpath} \
org.macports.${subport}.plist \
${destroot}${prefix}/etc/LaunchDaemons/org.macports.${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}/Library/LaunchDaemons
</span>
ln -s ${prefix}/etc/LaunchDaemons/org.macports.${subport}/org.macports.${subport}.plist \
${destroot}/Library/LaunchDaemons/org.macports.${subport}.plist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -o root -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -o root -d \
</span> ${destroot}${prefix}/var/run
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -o ${mysqluser} -g ${mysqluser} -d \
</span> ${destroot}${prefix}/etc/${name_mysql} \
${destroot}${prefix}/var/db/${name_mysql} \
${destroot}${prefix}/var/log/${name_mysql} \
${destroot}${prefix}/var/run/${name_mysql}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 700 -o ${mysqluser} -g ${mysqluser} -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0700 -o ${mysqluser} -g ${mysqluser} -d \
</span> ${destroot}${prefix}/var/db/${name_mysql}-files \
${destroot}${prefix}/var/db/${name_mysql}-keyring
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-cmake-ssl-include.diff b/databases/mysql8/files/patch-cmake-ssl-include.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e6531241d46..4cd9fba097a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-cmake-ssl-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-cmake-ssl-include.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,25 @@ https://trac.macports.org/ticket/64115
</span> OpenSSL 1.1 include path needs to be specified with higher precedence than ${prefix}/include
since openssl shim port now makes OpenSSL 3 include headers accessible from ${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+https://trac.macports.org/ticket/64259
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also we need to use the openssl executable from the same path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index 293281cf1..96a48d06186 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,7 +313,7 @@ MACRO (MYSQL_CHECK_SSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,7 +236,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(OPENSSL_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOC "path to the openssl executable")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DOC "path to the openssl executable"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATHS ${OPENSSL_ROOT_DIR}/bin NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "OpenSSL Executable - ${OPENSSL_EXECUTABLE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(OPENSSL_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(OPENSSL_EXECUTABLE_HAS_ZLIB 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,7 +315,7 @@
</span> SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL})
ENDIF()
MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-package_name.cmake.diff b/databases/mysql8/files/patch-package_name.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00bea7af9e3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-package_name.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1af75f2c4e8058f5f64a045a81008c40a3faba65 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christopher Chavez <chrischavez@gmx.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 4 Nov 2021 16:07:20 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix configure on macOS x.y.z when y is 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The "Could not run sw_vers" error is output when building on macOS x.y.z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-when y is 0 (example: macOS 12.0.1) because CMAKE_MATCH_2 is set to "0",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which when used as a condition evaluates to false.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Check `CMAKE_MATCH_COUNT EQUAL 2` instead to know whether CMAKE_MATCH_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and CMAKE_MATCH_2 are properly set.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake/package_name.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 058b0bcbd8cb..be1af896d515 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/package_name.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +88,7 @@ MACRO(GET_PACKAGE_FILE_NAME Var)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRING(REGEX MATCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ProductVersion:[\n\t ]*([0-9]+)\\.([0-9]+)" UNUSED ${SW_VERS_PRODUCTVERSION})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IF(NOT CMAKE_MATCH_1 OR NOT CMAKE_MATCH_2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(NOT CMAKE_MATCH_COUNT EQUAL 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(FATAL_ERROR "Could not run sw_vers")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-readline.cmake.diff b/databases/mysql8/files/patch-readline.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..373dfaea848
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-readline.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/readline.cmake 2022-04-10 08:32:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/readline.cmake 2022-04-10 08:33:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Different path on FreeBSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_PATH(FOUND_EDIT_READLINE_READLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAMES edit/readline/readline.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATHS @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(FOUND_EDIT_READLINE_READLINE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
</span></pre><pre style='margin:0'>
</pre>