Pullup ticket #6640 - requested by nia

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

Revisions pulled up:
- databases/mariadb106-client/Makefile.common                   1.8
- databases/mariadb106-client/distinfo                          1.9
- databases/mariadb106-client/patches/patch-CMakeLists.txt      1.3
- databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 1.3
- databases/mariadb106-server/Makefile                          1.15
- databases/mariadb106-server/PLIST                             1.7

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat May 21 09:36:03 UTC 2022

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

   Log Message:
   mariadb106: update to 10.6.8

                             MariaDB 10.6.8 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, MDEV-27767,
          MDEV-28313, MDEV-28137, MDEV-28465, MDEV-26789)
        * Backup regression fixes (MDEV-27919)
        * InnoDB portability: FreeBSD futexes (MDEV-26476), POWER and s390x
          transactional memory (MDEV-27956)
        * ALTER TABLE: Fixed bogus duplicate key errors (MDEV-15250)
        * DDL and crash recovery fixes (MDEV-27274, MDEV-27234, MDEV-27817)
        * Requests to recalculate persistent statistics were sometimes lost
          (MDEV-27805)

     Replication

        * Semisync-slave server recovery is refined to correctly rollback
          prepared transaction (MDEV-28461)
        * Circular semisync setup endless event circulation is handled
          (MDEV-27760)
        * Semisync-slave server recovery is extended to work on new server_id
          server (MDEV-27342)
        * 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

        * Query performance degradation in newer MariaDB versions when using
          many tables (MDEV-28073)
        * 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
        * Packages for Ubuntu 22.04 LTS "Jammy" and Fedora 36 are not yet
          available pending the resolution of MDEV-28133: Backport OpenSSL-3.0
          compatibility to 10.6 branch

     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.7 -r1.8 pkgsrc/databases/mariadb106-client/Makefile.common
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb106-client/distinfo
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt \
       pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
   cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mariadb106-server/Makefile
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb106-server/PLIST

5 files changed, 23 insertions, 20 deletions

diff --git a/databases/mariadb106-client/Makefile.common b/databases/mariadb106-client/Makefile.common
index b93799e9aab..de184e9a694 100644
--- a/databases/mariadb106-client/Makefile.common
+++ b/databases/mariadb106-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2022/02/19 09:13:21 nia Exp $
+# $NetBSD: Makefile.common,v 1.7.2.1 2022/06/05 10:11:03 spz Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=	mariadb-10.6.7
+DISTNAME=	mariadb-10.6.8
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
diff --git a/databases/mariadb106-client/distinfo b/databases/mariadb106-client/distinfo
index 0a45b4cc423..963cb77974c 100644
--- a/databases/mariadb106-client/distinfo
+++ b/databases/mariadb106-client/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2022/02/19 09:13:21 nia Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/06/05 10:11:03 spz Exp $
 
-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
+BLAKE2s (mariadb-10.6.8.tar.gz) = cef1165c096ddb486ac4eba76720639d66cea9c844ab5702f5a8b1a213898380
+SHA512 (mariadb-10.6.8.tar.gz) = b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
+Size (mariadb-10.6.8.tar.gz) = 88794744 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31
+SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
@@ -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) = e47938072cdbd5c21d24622d8550b2c127fbb9df
+SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 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-CMakeLists.txt b/databases/mariadb106-client/patches/patch-CMakeLists.txt
index 5b03e2442ef..953b099431d 100644
--- a/databases/mariadb106-client/patches/patch-CMakeLists.txt
+++ b/databases/mariadb106-client/patches/patch-CMakeLists.txt
@@ -1,19 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2021/11/27 23:40:28 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2.4.1 2022/06/05 10:11:03 spz Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig	2021-11-05 20:03:29.000000000 +0000
+--- CMakeLists.txt.orig	2022-05-18 08:34:14.000000000 +0000
 +++ CMakeLists.txt
-@@ -418,8 +418,6 @@ ENDIF()
+@@ -421,8 +421,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)
- 
-@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -433,19 +431,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configuration.
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER)
+@@ -464,23 +459,26 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -65,7 +65,7 @@ Allow building a server-only configuration.
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -557,41 +555,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -561,41 +559,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
    MESSAGE(WARNING "
  You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
  ENDIF()
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 0941f0c2e7b..c1325b25f9b 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,13 +1,13 @@
-$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.2 2022/02/19 09:13:21 nia Exp $
+$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.2.2.1 2022/06/05 10:11:03 spz 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	2022-02-10 20:17:09.000000000 +0000
+--- storage/innobase/include/transactional_lock_guard.h.orig	2022-05-18 08:34:16.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
+ #if defined __powerpc64__
+ #elif defined __s390__
  #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__)
 -#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
 -# if __GNUC__ >= 8
diff --git a/databases/mariadb106-server/PLIST b/databases/mariadb106-server/PLIST
index 8de327fc837..bfe832abf71 100644
--- a/databases/mariadb106-server/PLIST
+++ b/databases/mariadb106-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/12/10 13:29:24 nia Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2022/06/05 10:11:04 spz Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -43,6 +43,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