<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/dd11f0344a591089ed1850a15a6142b64c72713e">https://github.com/macports/macports-ports/commit/dd11f0344a591089ed1850a15a6142b64c72713e</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 dd11f0344a5 mariadb-10.5: update to 10.5.16
</span>dd11f0344a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dd11f0344a591089ed1850a15a6142b64c72713e
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jun 15 14:40:25 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.5: update to 10.5.16
</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.5/Portfile | 36 +++++++++++-----------
.../mariadb-10.5/files/patch-CMakeLists.txt.diff | 2 +-
...patch-libmariadb_libmariadb_CMakeLists.txt.diff | 2 +-
...atch-server_storage_perfschema_my_thread.h.diff | 12 ++++----
4 files changed, 26 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ef738d89d7..94d37d10a26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,12 +7,12 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
name mariadb-10.5
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.5.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.5.16
</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
# can be changed at the same time if that's what's required.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span> set revision_server 0
categories databases
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ if {$subport eq $name} {
</span> PortGroup boost 1.0
PortGroup openssl 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
# Not ready for openssl3 yet
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +70,11 @@ 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 f6c3d9fd2af5d17db64cc996574aa312efd70fcf
</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 edd141127c11d78ef073f9f3ca61708821f20b32
</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:#e0e0e0;'>@@ -82,7 +82,7 @@ if {$subport eq $name} {
</span>
set columnstore_github_author mariadb-corporation
set columnstore_github_project mariadb-columnstore-engine
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set columnstore_github_branch 105aeb3e1e25dbb3dee6a53425dc665c7b7332dc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_branch a509e0604f0afa4c165a449607e8b89d91ec20d2
</span>
set libmarias3_github_author mariadb-corporation
set libmarias3_github_project libmarias3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,25 +121,25 @@ if {$subport eq $name} {
</span> https://github.com/${libmarias3_github_author}/${libmarias3_github_project}/archive/${libmarias3_github_branch}:tagsix
checksums ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5674a952a58ceaa7ff54244711366383b68a47e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9610be2bcdf6feadab75a7d9b4c3a4363d3d3be2cd1d28a1707a948366232857 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 65529235 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fe0b7958b5a8aea64f9ac78df5a81c29b439a29b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9abd0aecfa1a29e5663f7dc481f1a8cc73cbe2e92a5da02f615aa759f082512f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65632597 \
</span> ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 42554f52c61fa387221266857a7599bddca79c34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 69e7757539545547bde6d994bcbaab62304569452bee845e3e1407573cbaf76b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 967901 \
</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 3cae17df2b0b9d3e4e6ba6cfcb7785fcd267cae1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 abb96e1548e39fa8b2479ed8cb3e69e5ca4c16302934b3f05eaeab928e207c7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 176349 \
</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} \
rmd160 996ddebec67793a0b15d9e2cff9aa70e7760550e \
sha256 99960eb0ccb4dff5eb354289b0a8ec2ecb0dcc246f54edf292f69f340a916ee4 \
size 91283 \
${columnstore_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b05b07f22f55205d11eebaa5b3dbd16f2cbd7578 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c6f87ce0ea1a9c02dfb67a820c5540bb831747a8f563a6f711ade337f391ca67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14602831 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 079c4d18eec41d483b429bb153a43a275db24fa3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37281acc9ab76f133f98020b3deaa94b38e8371652b6b424cf01c0c24ff0758b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14611659 \
</span> ${libmarias3_distfile} \
rmd160 bf90ab4856c1fec9272309134837f1f50fdb8de8 \
sha256 0c9ce4cc300bfefcb9dd188a46d736c0e119210c01cbfb04725b07f5330be679 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff b/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cc49cca125c..18df919e523 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/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;'>-@@ -295,6 +296,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,6 +298,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.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff b/databases/mariadb-10.5/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.5/files/patch-libmariadb_libmariadb_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/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()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-server_storage_perfschema_my_thread.h.diff b/databases/mariadb-10.5/files/patch-server_storage_perfschema_my_thread.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 57e13b02021..e3dce9e9450 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-server_storage_perfschema_my_thread.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/files/patch-server_storage_perfschema_my_thread.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ observed on macOS 10.8 and earlier.
</span> Upstream-Status: Pending
--- server/storage/perfschema/my_thread.h.orig
+++ server/storage/perfschema/my_thread.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_PTHREAD_GETTHREADID_NP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,8 @@
</span> #include <pthread_np.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdint.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef pthread_key_t thread_local_key_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef pthread_t my_thread_handle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(HAVE_INTEGER_PTHREAD_SELF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>