<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/4cb88da25f3fb9fd6a778153fe5bf040e97d30f3">https://github.com/macports/macports-ports/commit/4cb88da25f3fb9fd6a778153fe5bf040e97d30f3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4cb88da25f3fb9fd6a778153fe5bf040e97d30f3
</span>Author: Incisakura <incisakura@icloud.com>
AuthorDate: Tue Mar 22 01:27:49 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> mariadb-10.6: update to 10.6.5
</span>---
databases/mariadb-10.6/Portfile | 47 ++++++++++------------
...h-libmariadb_mariadb_config_CMakeLists.txt.diff | 13 ------
.../patch-storage_innobase-fix-rw_lock_use.diff | 17 --------
3 files changed, 22 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/Portfile b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b645606a7f6..be0a7522e5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,16 +2,17 @@
</span>
PortSystem 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> legacysupport.newest_darwin_requires_legacy 10
name mariadb-10.6
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.6.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.6.7
</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 1
</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;'>@@ -69,19 +70,19 @@ 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 0bf84c065e4cfa18764fe4823700d26a21a62483
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libmariadb_github_branch bc5e8a796447feda2d37367da8afce9f1f8cf5a2
</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 edd141127c11d78ef073f9f3ca61708821f20b32
</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 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 1b848471b84e2b8dc0c085eab796686be7e78fea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set columnstore_github_branch a0877d66ed97840658831a53c253a485e9ca5b77
</span>
set libmarias3_github_author mariadb-corporation
set libmarias3_github_project libmarias3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,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 f708a0baeebdd7a794b8789474dca70081a22121 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 767800d04613748b3d999f37faa46de6b2a466aa1546eb0111c6badb6f909e93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 48806541 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 07d1e238d57169e79f5a4f40b63cea092fa2701d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 334a18bd972b798637821503803381531fb400ac5eb91506be54dd19ae660b6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48947036 \
</span> ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2622ef32dc73b00530be27c832bf157a2af0fce5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e1b4f421e7d72f840d8ff554674df0f18876925e7f069eb17f6dc1bc7bb7aa91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1000875 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0657468d32cc0a1d9de5861f451871eadb50d626 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a64f83900f1b58f531bbc30baacd9e75b4cabe95e68f13ce3e7999a26fd156ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1001196 \
</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 3cae17df2b0b9d3e4e6ba6cfcb7785fcd267cae1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 abb96e1548e39fa8b2479ed8cb3e69e5ca4c16302934b3f05eaeab928e207c7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 176349 \
</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> ${columnstore_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 64ee3df61b9a078821e48628d6e293013f2f126c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2f6fd52c9c5d54c2f328119b89b6a6070264d6f3090e51a1d9ce0afda9ed6680 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14561798 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3ec4b4182d81fc8e9e0a1687535ebc664c229f54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9197b96d8ddc6f9c4cb8034f24ee666e62f65d19c54b2474c6e6f7af1b308529 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14581575 \
</span> ${libmarias3_distfile} \
rmd160 bf90ab4856c1fec9272309134837f1f50fdb8de8 \
sha256 0c9ce4cc300bfefcb9dd188a46d736c0e119210c01cbfb04725b07f5330be679 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,14 +205,10 @@ 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> patch-server_storage_perfschema_my_thread.h.diff \
patch-cmake_mysql_version.cmake.diff \
patch-cmake_mysql_columnstore_version.cmake.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix usage of rw_lock ; guessing this will be fixed in the next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-storage_innobase-fix-rw_lock_use.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@NAME@|${name_mysql}|g" \
${worksrcpath}/cmake/install_layout.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff b/databases/mariadb-10.6/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index db53342a996..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/files/patch-libmariadb_mariadb_config_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libmariadb/mariadb_config/CMakeLists.txt b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 60d8c58..7a66cf3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/libmariadb/mariadb_config/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(TARGETS mariadb_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION "${INSTALL_BINDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPONENT Development)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.6/files/patch-storage_innobase-fix-rw_lock_use.diff b/databases/mariadb-10.6/files/patch-storage_innobase-fix-rw_lock_use.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fa2b7cbb57a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.6/files/patch-storage_innobase-fix-rw_lock_use.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2cb92a5f..3a819e64 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,10 +191,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Acquire an exclusive lock */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void lock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** @return whether an exclusive lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_write_locked() const { return rw_lock::is_write_locked(); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</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;background:#ffe0e0;'>- /** @return whether any lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_locked() const { return rw_lock::is_locked(); }
</span></pre><pre style='margin:0'>
</pre>