Pullup ticket #6641 - requested by nia

databases/mariadb105-client: security update
databases/mariadb105-server: security update

Revisions pulled up:
- databases/mariadb105-client/Makefile.common                   1.16
- databases/mariadb105-client/distinfo                          1.13
- databases/mariadb105-client/patches/patch-CMakeLists.txt      1.2
- databases/mariadb105-server/Makefile                          1.25
- databases/mariadb105-server/PLIST                             1.10

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat May 21 10:38:26 UTC 2022

   Modified Files:
   	pkgsrc/databases/mariadb105-client: Makefile.common distinfo
   	pkgsrc/databases/mariadb105-client/patches: patch-CMakeLists.txt
   	pkgsrc/databases/mariadb105-server: Makefile PLIST

   Log Message:
   mariadb105: Update to 10.5.16

                            MariaDB 10.5.16 Release Notes

   Notable Items

     InnoDB

        * innodb_disallow_writes removed (MDEV-25975)
        * InnoDB gap locking fixes (MDEV-20605, MDEV-28422)
        * InnoDB performance improvements (MDEV-27557, MDEV-28185)

     Replication

        * Server initialization time gtid_slave_pos purge related reason of
          crashing in binlog background thread is removed (MDEV-26473)
        * Shutdown of the semisync master can't produce inconsistent state
          anymore (MDEV-11853)
        * Binlogs disappear after rsync IST (MDEV-28583)
        * autocommit=0 slave hang is eliminated (DBAAS-7828)
        * master crash is eliminated in compressed semisync replication protocol
          with packet counting amendment (MDEV-25580)
        * OPTIMIZE on a sequence does not cause counterfactual
          ER_BINLOG_UNSAFE_STATEMENT anymore (MDEV-24617)
        * Automatically generated Gtid_log_list_event is made to recognize
          within replication event group as a formal member (MDEV-28550)
        * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE using two or more
          unique key values at a time with MIXED format binlogging is corrected
          (MDEV-28310)
        * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE stops issuing
          unnessary "Unsafe statement" with MIXED binlog format (MDEV-21810)
        * Incomplete replication event groups are detected to error out by the
          slave IO thread (MDEV-27697)
        * mysqlbinlog --stop-never --raw now flushes the result file to disk
          after each processed event so the file can be listed with the actual
          bytes (MDEV-14608)

     Backup

        * Incorrect binlogs after Galera SST using rsync and mariabackup
          (MDEV-27524)
        * mariabackup does not detect multi-source replication slave
          (MDEV-21037)
        * Useless warning "InnoDB: Allocated tablespace ID <id> for <tablename>,
          old maximum was 0" during backup stage (MDEV-27343)
        * mariabackup prepare fails for incrementals if a new schema is created
          after full backup is taken (MDEV-28446)

     Optimizer

        * A SEGV in Item_field::used_tables/update_depend_map_for_order...
          (MDEV-26402)
        * ANALYZE FORMAT=JSON fields are incorrect for UNION ALL queries
          (MDEV-27699)
        * Subquery in an UPDATE query uses full scan instead of range
          (MDEV-22377)
        * Assertion `item1->type() = Item::FIELD_ITEM ... (MDEV-19398)
        * Server crashes in Expression_cache_tracker::fetch_current_stats
          (MDEV-28268)
        * MariaDB server crash at Item_subselect::init_expr_cache_tracker
          (MDEV-26164, MDEV-26047)
        * Crash with union of my_decimal type in ORDER BY clause (MDEV-25994)
        * SIGSEGV in st_join_table::cleanup (MDEV-24560)
        * Assertion `!eliminated' failed in Item_subselect::exec (MDEV-28437)

     General

        * Server error messages are now available in Chinese (MDEV-28227)
        * For RHEL/CentOS 7, non x86_64 architectures are no longer supported
          upstream and so our support will also be dropped with this release

     Security

        * Fixes for the following security vulnerabilities:
             * CVE-2022-27376
             * CVE-2022-27377
             * CVE-2022-27378
             * CVE-2022-27379
             * CVE-2022-27380
             * CVE-2022-27381
             * CVE-2022-27382
             * CVE-2022-27383
             * CVE-2022-27384
             * CVE-2022-27386
             * CVE-2022-27387
             * CVE-2022-27444
             * CVE-2022-27445
             * CVE-2022-27446
             * CVE-2022-27447
             * CVE-2022-27448
             * CVE-2022-27449
             * CVE-2022-27451
             * CVE-2022-27452
             * CVE-2022-27455
             * CVE-2022-27456
             * CVE-2022-27457
             * CVE-2022-27458


   To generate a diff of this commit:
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/mariadb105-client/Makefile.common
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb105-client/distinfo
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/databases/mariadb105-client/patches/patch-CMakeLists.txt
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/mariadb105-server/Makefile
   cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb105-server/PLIST

4 files changed, 17 insertions, 14 deletions

diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common
index 49a2cb61040..0f3ac4dd444 100644
--- a/databases/mariadb105-client/Makefile.common
+++ b/databases/mariadb105-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.15 2022/02/19 09:57:51 nia Exp $
+# $NetBSD: Makefile.common,v 1.15.2.1 2022/06/05 10:42:39 spz Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.15
+DISTNAME=	mariadb-10.5.16
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index b7bec575fac..3cb859e1e30 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2022/02/19 09:57:51 nia Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/05 10:42:39 spz Exp $
 
-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
+BLAKE2s (mariadb-10.5.16.tar.gz) = bafab69afbafc1e6dc34cd8cd7a50fa9383abb5a971ecae5762bb116479c3e75
+SHA512 (mariadb-10.5.16.tar.gz) = 28cea63cc3c5e1b236fb13593285e5d4b9aac5eaf259784e760def42bca8b09954510d39014a7a7c9e8656d61f5995a356df2f2ebb0df2696dd739ff3de5865d
+Size (mariadb-10.5.16.tar.gz) = 105798374 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
+SHA1 (patch-CMakeLists.txt) = 574131db46854715758c60ba5f026498f5b29564
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
diff --git a/databases/mariadb105-client/patches/patch-CMakeLists.txt b/databases/mariadb105-client/patches/patch-CMakeLists.txt
index e2adb5f5bb1..8917f296099 100644
--- a/databases/mariadb105-client/patches/patch-CMakeLists.txt
+++ b/databases/mariadb105-client/patches/patch-CMakeLists.txt
@@ -1,19 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1.8.1 2022/06/05 10:42:39 spz Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig	2021-05-05 21:00:18.000000000 +0000
+--- CMakeLists.txt.orig	2022-05-18 07:55:26.000000000 +0000
 +++ CMakeLists.txt
-@@ -421,8 +421,6 @@ ENDIF()
+@@ -432,8 +432,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
 -INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
 -
+ INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
- 
-@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -444,13 +442,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -27,7 +27,7 @@ Allow building a server-only configuration.
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
  ADD_SUBDIRECTORY(sql/share)
-@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -476,23 +472,26 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
diff --git a/databases/mariadb105-server/PLIST b/databases/mariadb105-server/PLIST
index f638bddd1cb..6eb57f858c3 100644
--- a/databases/mariadb105-server/PLIST
+++ b/databases/mariadb105-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2021/12/10 13:29:24 nia Exp $
+@comment $NetBSD: PLIST,v 1.9.4.1 2022/06/05 10:42:39 spz Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -47,6 +47,7 @@ bin/resolve_stack_dump
 bin/resolveip
 ${PLIST.rocksdb}bin/sst_dump
 ${PLIST.embedded}bin/test-connect-t
+bin/wsrep_sst_backup
 bin/wsrep_sst_common
 bin/wsrep_sst_mariabackup
 bin/wsrep_sst_mysqldump
@@ -352,6 +353,7 @@ share/doc/mysql/README-wsrep
 share/doc/mysql/README.md
 share/doc/mysql/THIRDPARTY
 ${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf
+share/mysql/bulgarian/errmsg.sys
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
 share/mysql/charsets/armscii8.xml
@@ -378,6 +380,7 @@ share/mysql/charsets/latin7.xml
 share/mysql/charsets/macce.xml
 share/mysql/charsets/macroman.xml
 share/mysql/charsets/swe7.xml
+share/mysql/chinese/errmsg.sys
 share/mysql/czech/errmsg.sys
 share/mysql/danish/errmsg.sys
 share/mysql/dutch/errmsg.sys