[pkgsrc/trunk]: pkgsrc/databases mariadb105: update to 10.5.12

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d099c151c6fd
branches:  trunk
changeset: 456741:d099c151c6fd
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Aug 07 07:48:28 2021 +0000

description:
mariadb105: update to 10.5.12

Notable Items

  InnoDB

     * InnoDB no longer acquires advisory file locks by default (MDEV-24393)
     * Encryption: Automatically disable key rotation checks for
       file_key_management plugin (MDEV-14180)
     * Some fixes from MySQL 5.7.35 (MDEV-26205)
     * Fixed scrubbing on AIX (MDEV-26110)
     * Improved page flushing performance (MDEV-25954, MDEV-25948,
       MDEV-25801, MDEV-25113, MDEV-26004)

  Optimizer

     * A query that uses ORDER BY .. LIMIT clause and "Range checked for each
       record optimization" could produce incorrect results under some
       circumstances (MDEV-25858)
     * Queries that have more than 32 equality conditions comparing columns
       of different tables ("tableX.colX=tableY.colY) could cause a stack
       overrun in the query optimizer (MDEV-17783, MDEV-23937)
     * "Condition pushdown into derived table" optimization cannot be applied
       if the expression being pushed refers to a derived table column which
       is computed from expression that has a stored function call, @session
       variable reference, or other similar construct. The fix for MDEV-25969
       makes it so that only the problematic part of the condition is not
       pushed. The rest of the condition is now pushed. (MDEV-25969)
     * A query with window function on the left side of the subquery could
       cause a crash. (MDEV-25630)
     * Fixed the issue fixed in MySQL Bug #76803: DML or locking SELECT
       statements that use outer joins could produce this warning in the
       error log: [ERROR] InnoDB: Unlock row could not find a 3 mode lock on
       the record. (MDEV-26106)

  Security

     * Fixes for the following security vulnerabilities:
          * CVE-2021-2372
          * CVE-2021-2389

diffstat:

 databases/mariadb105-client/Makefile.common                          |   4 +-
 databases/mariadb105-client/distinfo                                 |  11 +-
 databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c |  31 ----------
 databases/mariadb105-server/Makefile                                 |   3 +-
 4 files changed, 8 insertions(+), 41 deletions(-)

diffs (86 lines):

diff -r d350681ad01c -r d099c151c6fd databases/mariadb105-client/Makefile.common
--- a/databases/mariadb105-client/Makefile.common       Fri Aug 06 14:10:21 2021 +0000
+++ b/databases/mariadb105-client/Makefile.common       Sat Aug 07 07:48:28 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2021/08/05 11:21:23 nia Exp $
+# $NetBSD: Makefile.common,v 1.12 2021/08/07 07:48:28 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=      mariadb-10.5.11
+DISTNAME=      mariadb-10.5.12
 CATEGORIES=    databases
 MASTER_SITES=  https://downloads.mariadb.org/f/${DISTNAME}/source/
 MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/
diff -r d350681ad01c -r d099c151c6fd databases/mariadb105-client/distinfo
--- a/databases/mariadb105-client/distinfo      Fri Aug 06 14:10:21 2021 +0000
+++ b/databases/mariadb105-client/distinfo      Sat Aug 07 07:48:28 2021 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.4 2021/08/04 15:52:10 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/08/07 07:48:28 nia Exp $
 
-SHA1 (mariadb-10.5.11.tar.gz) = f62668be013b1ab51ab7e001d026e17257ad8d30
-RMD160 (mariadb-10.5.11.tar.gz) = 9f0cbcfdc07c7015d4b054e40b08f93179aa3b0c
-SHA512 (mariadb-10.5.11.tar.gz) = 5ccb3f3d7cedf5ff79dd8d9304f0b7f3eb99a5558b446d1baf24cabe20c709360e2c99a737024793918fd6c23fc5a9bb83ffddfb5549310774d07294a3bbddf4
-Size (mariadb-10.5.11.tar.gz) = 99037098 bytes
+SHA1 (mariadb-10.5.12.tar.gz) = 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
+RMD160 (mariadb-10.5.12.tar.gz) = cfac6715b84ce1ed8e073fefad90c47875a0346b
+SHA512 (mariadb-10.5.12.tar.gz) = c732c2033304f273900b3dcf21936e28aebb147316fcabc7efdc43b75bc47c198daacfaaae082b997d4e695139d2aeaa2619bd29935f1b6f0aa25b9b9cde9ae5
+Size (mariadb-10.5.12.tar.gz) = 101914615 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
-SHA1 (patch-mysys_crc32_crc32__arm64.c) = 0a479d4e9c6a186c631f3c0f99d15f633c8a484a
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 00cfaf5826cc97084bc77033985e6686e1ce1628
diff -r d350681ad01c -r d099c151c6fd databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c
--- a/databases/mariadb105-client/patches/patch-mysys_crc32_crc32__arm64.c      Fri Aug 06 14:10:21 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-mysys_crc32_crc32__arm64.c,v 1.1 2021/07/03 09:23:45 nia Exp $
-
-Fix building on NetBSD/aarch64.
-
---- mysys/crc32/crc32_arm64.c.orig     2021-05-05 21:00:19.000000000 +0000
-+++ mysys/crc32/crc32_arm64.c
-@@ -2,13 +2,13 @@
- #include <string.h>
- #include <stdint.h>
- 
-+static int pmull_supported;
-+
- #if defined(HAVE_ARMV8_CRC)
- 
- #if defined(__APPLE__)
- #include <sys/sysctl.h>
- 
--static int pmull_supported;
--
- int crc32_aarch64_available(void)
- {
-   int ret;
-@@ -48,8 +48,6 @@ static unsigned long getauxval(unsigned 
- # define HWCAP_PMULL (1 << 4)
- #endif
- 
--static int pmull_supported;
--
- /* ARM made crc32 default from ARMv8.1 but optional in ARMv8A
-  * Runtime check API.
-  */
diff -r d350681ad01c -r d099c151c6fd databases/mariadb105-server/Makefile
--- a/databases/mariadb105-server/Makefile      Fri Aug 06 14:10:21 2021 +0000
+++ b/databases/mariadb105-server/Makefile      Sat Aug 07 07:48:28 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2021/08/04 15:52:10 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/08/07 07:48:28 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*