<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/2015db9b3d3d60ecb750f55cb254e914be31dabc">https://github.com/macports/macports-ports/commit/2015db9b3d3d60ecb750f55cb254e914be31dabc</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 2015db9b3d3 mariadb-10.5: update to 10.5.13
</span>2015db9b3d3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2015db9b3d3d60ecb750f55cb254e914be31dabc
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Nov 15 13:49:16 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mariadb-10.5: update to 10.5.13
</span>---
 databases/mariadb-10.5/Portfile                    | 41 +++++++++++-----------
 .../mariadb-10.5/files/patch-CMakeLists.txt.diff   |  2 +-
 .../files/patch-cmake-install_layout.cmake.diff    |  6 ++--
 .../files/patch-include_my_global.h.diff           | 13 -------
 ...patch-libmariadb_libmariadb_CMakeLists.txt.diff |  6 ++--
 .../patch-storage_innobase-fix-rw_lock_use.diff    | 17 +++++++++
 6 files changed, 44 insertions(+), 41 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 d714a400387..0eaca4afeef 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;'>@@ -6,13 +6,13 @@ legacysupport.newest_darwin_requires_legacy 10
</span> 
 name                mariadb-10.5
 set name_mysql      ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             10.5.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             10.5.13
</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:#ffe0e0;'>-set revision_server 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 0
</span> categories          databases
 platforms           darwin
 license             GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,11 +53,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  0cc16f18c1d87bbe6e360eaf578fcedeb9479114
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set libmariadb_github_branch  735a7299dbae19cc2b82b9697becaf90e9b43047
</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  c45b1eff940077e2b2f364f30ba04930f134da8d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wsrep_github_branch  22921e7082ddfb45222f21a585aa8b877e62aa8b
</span> 
     set wsrep_api_github_author   codership
     set wsrep_api_github_project  wsrep-API
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,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   4d3625bf2181e9d434eab95865e81aff14b6f37c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set columnstore_github_branch   06c83029c5251b71c233bd688a3a45a79f890aef
</span> 
     set libmarias3_github_author   mariadb-corporation
     set libmarias3_github_project  libmarias3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,25 +104,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  48e3b2ed6dae02ec4cea50d09a1751dbb05ff8d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7c120784963a817a3f69314f0a19a18b2cb514318d2c0f1cc58150187216be9a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    65323293 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  91892a19f1319f5208decbe2f76f6897c413f010 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  12ab2dddd1a1995473df833015dd9ce3e9e5ab2ca3d14cf0b7128cfdb8874c91 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    65406228 \
</span>                     ${libmariadb_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  e04d5c9aee20031b8666275e8fa9fba6a52701e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c0ba732c77deb8a1f684f3c2f77fb99769857bf60578b26d2510b364b781562c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    967008 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  c2b5c79914342ab2d546e05d6a3af51bfd540847 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  9df8813ccc64f8f206d924a2210a7d74bf3801b6a4c7ed376ffb3cd7a8420921 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    967825 \
</span>                     ${wsrep_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  033c53397caebd61b22208cf4431410a196527fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  546dedb085e09d3fb0596d851334cc97ecfa52c8ee9308606256d644d8d920e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    158962 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  92a588f98b396b1bad3f7099e5338b864a0d87de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  90d26692d384342f796c16249801fec6867b3ef56efc84096207cade530ce733 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    172530 \
</span>                     ${wsrep_api_distfile} \
                     rmd160  847e8d58c8806437088d77d444ecfe2dcd8a76d1 \
                     sha256  214fb8701ae51bcdf8171475a93f2c28ddd56e642feb172ec5148b4d3c73d4a6 \
                     size    90155 \
                     ${columnstore_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  4e6580473db16d42b282ff3ddf23cd5f36ad140e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3526786baeb83c8f4f1cdaace94f5c5cd33b17b4b5990596a36bf5b0561925be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    14601462 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  3091943713d1d71310a3ff0e7f9c3a386689fbee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  8d92c9f1a9d3d341e1d860f10e9c50c58c9b9b0f7a073bd995db28d04470ad6e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    14605237 \
</span>                     ${libmarias3_distfile} \
                     rmd160  bf90ab4856c1fec9272309134837f1f50fdb8de8 \
                     sha256  0c9ce4cc300bfefcb9dd188a46d736c0e119210c01cbfb04725b07f5330be679 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,9 +193,8 @@ if {$subport eq $name} {
</span>                    patch-cmake_mysql_version.cmake.diff \
                    patch-cmake_mysql_columnstore_version.cmake.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # patch to provide minimum changes required for ARM64 support;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # guessing this will be fixed in the next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # patchfiles-append patch-include_my_global.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # 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:#e0ffe0;'>+    # patchfiles-append patch-storage_innobase-fix-rw_lock_use.diff
</span> 
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
<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 08bd2b60908..cc49cca125c 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;'>-@@ -291,6 +292,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,6 +296,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-cmake-install_layout.cmake.diff b/databases/mariadb-10.5/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 361c81b16ec..bb3e322a720 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb-10.5/files/patch-cmake-install_layout.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/cmake/install_layout.cmake
 +++ b/cmake/install_layout.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span>  ENDIF()
  
  SET(INSTALL_LAYOUT "${INSTALL_LAYOUT}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>  
  IF(UNIX)
    IF(INSTALL_LAYOUT MATCHES "RPM")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span>      SET(CMAKE_INSTALL_PREFIX ${default_prefix}
        CACHE PATH "install prefix" FORCE)
    ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span>    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,6 +228,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,6 +226,35 @@
</span>  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  
  SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-include_my_global.h.diff b/databases/mariadb-10.5/files/patch-include_my_global.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9bb0dfd82a9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb-10.5/files/patch-include_my_global.h.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/include/my_global.h b/include/my_global.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 86ef5f88..e9c94702 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/my_global.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/my_global.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +159,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #  if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #    define SIZEOF_CHARP 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #    define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#  elif defined(__x86_64__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#  elif defined(__x86_64__) || defined(__ppc64__) || defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #    define SIZEOF_CHARP 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #    define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #  else
</span><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 432c80ebb43..7098d13f83f 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;'>@@ -9,6 +9,6 @@ index e4217439..6fa6b468 100644
</span> -  IF(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
 -    ADD_DEFINITIONS(-DLIBICONV_PLUG)
 -  ENDIF()
<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;'>- IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
</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;'>+   ENDIF()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb-10.5/files/patch-storage_innobase-fix-rw_lock_use.diff b/databases/mariadb-10.5/files/patch-storage_innobase-fix-rw_lock_use.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa2b7cbb57a
</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.5/files/patch-storage_innobase-fix-rw_lock_use.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2cb92a5f..3a819e64 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/innobase/include/buf0types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,10 +191,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /** Acquire an exclusive lock */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   inline void lock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#ifdef UNIV_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /** @return whether an exclusive lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   bool is_write_locked() const { return rw_lock::is_write_locked(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   /** @return whether any lock is being held by any thread */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   bool is_locked() const { return rw_lock::is_locked(); }
</span></pre><pre style='margin:0'>

</pre>