<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/34ea5ea3d226db6b91e6b7e3edc2503d59fc7b3c">https://github.com/macports/macports-ports/commit/34ea5ea3d226db6b91e6b7e3edc2503d59fc7b3c</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 34ea5ea3d22 mariadb-10.4: update to 10.4.26
</span>34ea5ea3d22 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34ea5ea3d226db6b91e6b7e3edc2503d59fc7b3c
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Aug 24 09:44:33 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.4: update to 10.4.26
</span>---
databases/mariadb-10.4/Portfile | 18 ++++++++++--------
.../mariadb-10.4/files/patch-SSL_INCLUDES_first.diff | 2 +-
.../patch-libmariadb_libmariadb_CMakeLists.txt.diff | 2 +-
3 files changed, 12 insertions(+), 10 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 61a94c927ce..644b8c595ff 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.25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.4.26
</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;'>@@ -54,7 +54,7 @@ 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 ab7a81e79e4be4324a2d09d19d4f5249801ef665
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_branch 7fdb3eab66384a355475704332d11cc1ab82499a
</span>
set wsrep_github_author codership
set wsrep_github_project wsrep-lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,13 +87,13 @@ 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 ef3a338afed4f1a7d94e7e08ce1576290e9d18cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bbd6fc7f15611b5ff8404da6a99a5f6aa4df32384b3386fcb35116e28b01cf1f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64273056 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e1e45fe6686185bc4474ff36dc9e9e76b603b522 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b9d02ab2fc82e50c23a98a3bbb23603e7b4ac76226dbb8fde64c8fbd1015ec05 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64489757 \
</span> ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c78575cf544d96cfba6cc9dcd5c86a43f6c26e52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98db207c6ae8b9553947d05891571b211ab7aab461cd8f071c4730a1302e9a48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 967973 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c63e8387fa7bf3f2d6d4d7db87835f01875fcccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37902fbad5b55968e297b071819228a0b58f253d82d2813f249a7ba230d71019 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1191573 \
</span> ${wsrep_distfile} \
rmd160 f5c1f52a07dcccd4babb0e4da5ddca52cd78c8e7 \
sha256 8a64fbb42a76c9839e2aaf43ebeb143f39c2842874084b7f1f7ba1f842b7d052 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,6 +204,8 @@ if {$subport eq $name} {
</span> -DWITH_PCRE=system \
-DBISON_EXECUTABLE=${prefix}/bin/bison
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.checks.implicit_function_declaration.whitelist-append select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# proc portdestroot::destroot_finish fails to find and compress our man pages
# so borrow the compress command and run on our files now.
<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><span style='display:block; white-space:pre;color:#808080;'>index 34d01bf9cf5..4314eed0819 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.4/files/patch-SSL_INCLUDES_first.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- a/libmariadb/libmariadb/CMakeLists.txt
+++ b/libmariadb/libmariadb/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span> win32_errmsg.h)
ELSE()
IF(ICONV_INCLUDE_DIR)
<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 8dfa35482b6..dba45fa9c4a 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;'>-@@ -316,9 +316,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,9 +317,6 @@
</span> IF(ICONV_INCLUDE_DIR)
INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR})
ENDIF()
</pre><pre style='margin:0'>
</pre>