Pullup ticket #6585 - requested by nia

databases/mariadb106-client, databases/mariadb106-server: security fix

Revisions pulled up:
- databases/mariadb106-client/Makefile                          1.6
- databases/mariadb106-client/Makefile.common                   1.7
- databases/mariadb106-client/PLIST                             1.3
- databases/mariadb106-client/distinfo                          1.6
- databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 1.2
- databases/mariadb106-server/Makefile                          1.12

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Feb 19 09:13:21 UTC 2022

   Modified Files:
   	pkgsrc/databases/mariadb106-client: Makefile Makefile.common PLIST
   	    distinfo
   	pkgsrc/databases/mariadb106-client/patches:
   	    patch-storage_innobase_include_transactional__lock__guard.h
   	pkgsrc/databases/mariadb106-server: Makefile

   Log Message:
   mariadb106: update to 10.6.7

                             MariaDB 10.6.7 Release Notes

     InnoDB

        * Set innodb_change_buffering=none by default (MDEV-27734)

     Security

        * Fixes for the following security vulnerabilities:
             * CVE-2021-46665
             * CVE-2021-46664
             * CVE-2021-46661
             * CVE-2021-46668
             * CVE-2021-46663

                             MariaDB 10.6.6 Release Notes

   Notable Items

     InnoDB

        * --skip-symbolic-links does not disallow .isl file creation
          (MDEV-26870)
        * Indexed CHAR columns are broken with NO_PAD collations (MDEV-25440)
        * insert-intention lock conflicts with waiting ORDINARY lock
          (MDEV-27025)
        * Crash recovery improvements (MDEV-26784, MDEV-27022, MDEV-27183,
          MDEV-27610)
        * mariabackup skips valid .ibd file (MDEV-26326)
        * Allow seamless upgrade despite ROW_FORMAT=COMPRESSED (MDEV-27736)

     Galera

        * Galera updated to 26.4.11
        * Galera SST scripts should use ssl_capath (not ssl_ca) for CA directory
          (MDEV-27181)
        * Alter Sequence do not replicate to another nodes with in Galera
          Cluster (MDEV-19353)
        * Galera crash - Assertion. Possible parallel writeset problem
          (MDEV-26803)
        * CREATE TABLE with FOREIGN KEY constraint fails to apply in parallel
          (MDEV-27276)
        * Galera cluster node consider old server_id value even after
          modification of server_id [wsrep_gtid_mode=ON] (MDEV-26223)

     Replication

        * Seconds behind master corrected from artificial spikes at relay-log
          rotation (MDEV-16091)
        * Statement rollback in binlog when transaction creates or drop
          temporary table is set right (MDEV-26833)
        * CREATE-or-REPLACE SEQUENCE is made to binlog with the DDL flag to
          stabilize its parallel execution on slave (MDEV-27365)

     Security

        * Fixes for the following security vulnerabilities:
             * CVE-2022-24052
             * CVE-2022-24051
             * CVE-2022-24050
             * CVE-2022-24048
             * CVE-2021-46659

6 files changed, 14 insertions, 15 deletions

diff --git a/databases/mariadb106-client/Makefile b/databases/mariadb106-client/Makefile
index 0b2588adba8..adad805eaf7 100644
--- a/databases/mariadb106-client/Makefile
+++ b/databases/mariadb106-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/12/08 16:03:39 adam Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2022/02/23 09:36:11 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.6, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*
diff --git a/databases/mariadb106-client/Makefile.common b/databases/mariadb106-client/Makefile.common
index c5b3aae63a8..29eea6f8077 100644
--- a/databases/mariadb106-client/Makefile.common
+++ b/databases/mariadb106-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2021/11/27 23:40:27 nia Exp $
+# $NetBSD: Makefile.common,v 1.6.2.1 2022/02/23 09:36:11 bsiegert Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=	mariadb-10.6.5
+DISTNAME=	mariadb-10.6.7
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
diff --git a/databases/mariadb106-client/PLIST b/databases/mariadb106-client/PLIST
index dbe92aea203..49790f0ab42 100644
--- a/databases/mariadb106-client/PLIST
+++ b/databases/mariadb106-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/11/27 23:40:27 nia Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2022/02/23 09:36:11 bsiegert Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -233,6 +233,7 @@ include/mysql/server/sslopt-case.h
 include/mysql/server/sslopt-longopts.h
 include/mysql/server/sslopt-vars.h
 include/mysql/server/typelib.h
+lib/libmariadb.a
 lib/libmariadb.so
 lib/libmariadb.so.3
 lib/libmariadbclient.a
diff --git a/databases/mariadb106-client/distinfo b/databases/mariadb106-client/distinfo
index 93fb49f4919..1d6e1565f80 100644
--- a/databases/mariadb106-client/distinfo
+++ b/databases/mariadb106-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/11/27 23:40:27 nia Exp $
+$NetBSD: distinfo,v 1.5.2.1 2022/02/23 09:36:11 bsiegert Exp $
 
-BLAKE2s (mariadb-10.6.5.tar.gz) = 44cd77d1120c509d6df6386feda2302e544be6d90d08d3f6cd0ed39ab12ae5a5
-SHA512 (mariadb-10.6.5.tar.gz) = 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1
-Size (mariadb-10.6.5.tar.gz) = 85061860 bytes
+BLAKE2s (mariadb-10.6.7.tar.gz) = 5d4b482e6e06b337ff8180a2fe8b94b8e9f1cc1cea6b7dfe89eaa05c56eab701
+SHA512 (mariadb-10.6.7.tar.gz) = 2d26f56ea5f39b800a6f279c8411d4091b4f4d3acbf3ea1864068328d34a1437e7c46c08d3772009357fd89602e58f214266038e177c0a4fac914a5e5d01e3e6
+Size (mariadb-10.6.7.tar.gz) = 85882896 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -14,7 +14,7 @@ SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
-SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = 1db38a9c1ec3ce7274dc08cb9c5b42d474b431aa
+SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = e47938072cdbd5c21d24622d8550b2c127fbb9df
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
diff --git a/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
index 74c61df8f6e..7d5eefae75f 100644
--- a/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
+++ b/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1 2021/11/27 23:40:28 nia Exp $
+$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1.4.1 2022/02/23 09:36:11 bsiegert Exp $
 
 Strange build failures on NetBSD:
 error: 'rw_lock' is not an accessible base of 'page_hash_latch'
 
---- storage/innobase/include/transactional_lock_guard.h.orig	2021-11-05 20:03:31.000000000 +0000
+--- storage/innobase/include/transactional_lock_guard.h.orig	2022-02-10 20:17:09.000000000 +0000
 +++ storage/innobase/include/transactional_lock_guard.h
 @@ -21,12 +21,6 @@ this program; if not, write to the Free 
  #if defined __powerpc64__ && defined __clang__ && defined __linux__
  #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4
- #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64)
+ #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__)
 -#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
 -# if __GNUC__ >= 8
 -# elif defined __clang_major__ && __clang_major__ > 6
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 8860dba4331..7816c67e773 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/12/08 16:03:40 adam Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2022/02/23 09:36:11 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*