<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/694757cd971a3fbf9eac97db7c60490d22959a22">https://github.com/macports/macports-ports/commit/694757cd971a3fbf9eac97db7c60490d22959a22</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 694757cd971 mariadb-10.4: update to 10.4.25
</span>694757cd971 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 694757cd971a3fbf9eac97db7c60490d22959a22
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jun 15 14:44:15 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.4: update to 10.4.25
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Bump Boost to 1.78
</span>---
 databases/mariadb-10.4/Portfile                    | 46 +++++++++++-----------
 .../mariadb-10.4/files/patch-CMakeLists.txt.diff   |  2 +-
 .../files/patch-SSL_INCLUDES_first.diff            | 26 ++++++++++++
 ...patch-libmariadb_libmariadb_CMakeLists.txt.diff |  2 +-
 4 files changed, 51 insertions(+), 25 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/Portfile b/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bee8521cfa..3d12a11ac2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> 
 name                mariadb-10.4
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             10.4.22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.4.25
</span> set version_branch  [join [lrange [split ${version} .] 0 1] .]
 # Please set revision_client and revision_server to 0 if you bump
 # version; these can be changed independently for the 2 subports, but
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ if {$subport eq $name} {
</span>     PortGroup           compiler_blacklist_versions 1.0
     PortGroup           boost 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    boost.version       1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    boost.version       1.78
</span>     compiler.cxx_standard 2011
 
     # https://trac.macports.org/ticket/60805
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,15 +54,15 @@ if {$subport eq $name} {
</span> 
     set libmariadb_github_author  MariaDB
     set libmariadb_github_project mariadb-connector-c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set libmariadb_github_branch  735a7299dbae19cc2b82b9697becaf90e9b43047
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set libmariadb_github_branch  ab7a81e79e4be4324a2d09d19d4f5249801ef665
</span> 
     set wsrep_github_author  codership
     set wsrep_github_project wsrep-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set wsrep_github_branch  22921e7082ddfb45222f21a585aa8b877e62aa8b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wsrep_github_branch  8bfce04189671eb1f06e0fa83dff8c880f31088f
</span> 
     set wsrep_api_github_author   codership
     set wsrep_api_github_project  wsrep-API
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set wsrep_api_github_branch   76cf223c690845bbf561cb820a46e06a18ad80d1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wsrep_api_github_branch   02ed17238cee97b5a3ea2495ca87b63570403f01
</span> 
     set main_distname ${distname}
     set main_distfile ${distfiles}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,21 +87,21 @@ if {$subport eq $name} {
</span>                  https://github.com/${wsrep_api_github_author}/${wsrep_api_github_project}/archive/${wsrep_api_github_branch}:tagfour
 
     checksums       ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  552762ed4cd200473ce11a63e056e65c9215672a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  a47dea1b9ebe05d0546f789f96f41b39efbd5037d9436cecb91fc11f7b0e6d9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    64081796 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  ef3a338afed4f1a7d94e7e08ce1576290e9d18cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  bbd6fc7f15611b5ff8404da6a99a5f6aa4df32384b3386fcb35116e28b01cf1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    64273056 \
</span>                     ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  c2b5c79914342ab2d546e05d6a3af51bfd540847 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  9df8813ccc64f8f206d924a2210a7d74bf3801b6a4c7ed376ffb3cd7a8420921 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    967825 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  c78575cf544d96cfba6cc9dcd5c86a43f6c26e52 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  98db207c6ae8b9553947d05891571b211ab7aab461cd8f071c4730a1302e9a48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    967973 \
</span>                     ${wsrep_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  92a588f98b396b1bad3f7099e5338b864a0d87de \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  90d26692d384342f796c16249801fec6867b3ef56efc84096207cade530ce733 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    172530 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  f5c1f52a07dcccd4babb0e4da5ddca52cd78c8e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  8a64fbb42a76c9839e2aaf43ebeb143f39c2842874084b7f1f7ba1f842b7d052 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    176413 \
</span>                     ${wsrep_api_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  847e8d58c8806437088d77d444ecfe2dcd8a76d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  214fb8701ae51bcdf8171475a93f2c28ddd56e642feb172ec5148b4d3c73d4a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    90155
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  996ddebec67793a0b15d9e2cff9aa70e7760550e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  99960eb0ccb4dff5eb354289b0a8ec2ecb0dcc246f54edf292f69f340a916ee4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    91283
</span> 
     worksrcdir   ${github.project}-${git.branch}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,8 +130,7 @@ if {$subport eq $name} {
</span> 
     depends_build-append port:bison
     depends_lib-append  port:zlib port:tcp_wrappers port:ncurses port:judy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        path:lib/libssl.dylib:openssl port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:openssl11 port:libxml2 port:pcre
</span>     depends_run-append  port:mysql_select
 
     select.group        mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,8 +148,8 @@ if {$subport eq $name} {
</span>                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \
                    patch-libmariadb_libmariadb_CMakeLists.txt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-libmariadb_mariadb_config_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   patch-cmake_mysql_version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-cmake_mysql_version.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   patch-SSL_INCLUDES_first.diff
</span> 
     # patch to provide minimum changes required for ARM64 support;
     # guessing this will be fixed in the next release.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +169,8 @@ if {$subport eq $name} {
</span>         move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     configure.args-delete \
                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
     configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,8 +192,7 @@ if {$subport eq $name} {
</span>                         -DENABLE_DTRACE:BOOL=OFF \
                         -DWITH_READLINE:BOOL=ON \
                         -DWITH_LIBWRAP:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DWITH_SSL:STRING=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        -DWITH_SSL_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        -DWITH_SSL:STRING=${prefix}/libexec/openssl11 \
</span>                         -DMYSQL_MAINTAINER_MODE:STRING=AUTO \
                         -DICONV_LIBRARIES=${prefix}/lib/libiconv.dylib \
                         -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.4/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 28568b9ae29..b13cb9e8580 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span>  SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
    ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,6 +270,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,6 +272,9 @@
</span>  ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$")
    MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO")
  ENDIF()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/files/patch-SSL_INCLUDES_first.diff b/databases/mariadb-10.4/files/patch-SSL_INCLUDES_first.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..34d01bf9cf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/files/patch-SSL_INCLUDES_first.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmariadb/libmariadb/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     win32_errmsg.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   IF(ICONV_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-     INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++     INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ADD_DEFINITIONS(-Wno-deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libmysqld/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libmysqld/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,10 +22,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/libmysqld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_BINARY_DIR}/sql 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${SSL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${SSL_INTERNAL_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${PCRE_INCLUDES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${ZLIB_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(GEN_SOURCES
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7098d13f83f..8dfa35482b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.4/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeL
</span> index e4217439..6fa6b468 100644
 --- a/libmariadb/libmariadb/CMakeLists.txt
 +++ b/libmariadb/libmariadb/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,9 +312,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,9 +316,6 @@
</span>    IF(ICONV_INCLUDE_DIR)
       INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
    ENDIF()
</pre><pre style='margin:0'>

</pre>