Pullup ticket #6584 - requested by nia

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

Revisions pulled up:
- databases/mariadb105-client/Makefile                          1.10
- databases/mariadb105-client/Makefile.common                   1.15
- databases/mariadb105-client/PLIST                             1.4
- databases/mariadb105-client/distinfo                          1.11
- databases/mariadb105-server/Makefile                          1.23

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Feb 19 09:57:51 UTC 2022

   Modified Files:
   	pkgsrc/databases/mariadb105-client: Makefile Makefile.common PLIST
   	    distinfo
   	pkgsrc/databases/mariadb105-server: Makefile

   Log Message:
   mariadb105: update to 10.5.15

                            MariaDB 10.5.15 Release Notes

   Notable Items

     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.5.14 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)

     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

5 files changed, 10 insertions, 11 deletions

diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile
index aeb55b884fd..fbd3032e772 100644
--- a/databases/mariadb105-client/Makefile
+++ b/databases/mariadb105-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/12/08 16:03:39 adam Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2022/02/23 09:36:05 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*
diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common
index 07f2b029681..7e921eccb61 100644
--- a/databases/mariadb105-client/Makefile.common
+++ b/databases/mariadb105-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.14 2021/11/27 22:52:15 nia Exp $
+# $NetBSD: Makefile.common,v 1.14.2.1 2022/02/23 09:36:05 bsiegert Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.13
+DISTNAME=	mariadb-10.5.15
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
diff --git a/databases/mariadb105-client/PLIST b/databases/mariadb105-client/PLIST
index 79da8fd9a71..a79d53ba129 100644
--- a/databases/mariadb105-client/PLIST
+++ b/databases/mariadb105-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/11/27 22:52:15 nia Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2022/02/23 09:36:05 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/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index f2c2fb8e83b..0f6bde6ed2a 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/11/27 22:52:15 nia Exp $
+$NetBSD: distinfo,v 1.10.2.1 2022/02/23 09:36:05 bsiegert Exp $
 
-BLAKE2s (mariadb-10.5.13.tar.gz) = cd1a5df60c1895ed510dbffa349a1fee6c1e01239fa22de6af6f658235aed2f1
-SHA512 (mariadb-10.5.13.tar.gz) = 5d5ac04a3c8099a982cacb98dd4c162966fc7957e11c28e8b5645e49ffcf0513b9c8956f43d215c37e5eaa34aa8db6c71cfe993c89d62cab123021ee83169e7f
-Size (mariadb-10.5.13.tar.gz) = 102047279 bytes
+BLAKE2s (mariadb-10.5.15.tar.gz) = 947a7041705c273ca23d5882a1378077701fe7ab3b8e02a2914b5a96b9258853
+SHA512 (mariadb-10.5.15.tar.gz) = ea3d99fd9ad8adc8187fb5d722ff16cde90c7cca4b3572e410814ae39e0246b7a83b4dc1e72f95de58c1c12a9563fb524dcca2dd1fb8f595cc41625a2fb0af76
+Size (mariadb-10.5.15.tar.gz) = 102803624 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 76ebd5c6b6f..a4c5c5ac2e9 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2021/12/08 16:03:39 adam Exp $
+# $NetBSD: Makefile,v 1.20.2.1 2022/02/23 09:36:05 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*