CVS commit: [pkgsrc-2023Q2] pkgsrc/databases

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul 10 10:11:24 UTC 2023

Modified Files:
        pkgsrc/databases/mariadb105-client [pkgsrc-2023Q2]: Makefile
            Makefile.common PLIST distinfo
        pkgsrc/databases/mariadb105-server [pkgsrc-2023Q2]: Makefile
Removed Files:
        pkgsrc/databases/mariadb105-client/patches [pkgsrc-2023Q2]:
            patch-include_mysql_service__encryption.h

Log Message:
Pullup ticket #6774 - requested by nia
databases-mariadb105-client: security fix
databases-mariadb105-server: security fix

Revisions pulled up:
- databases/mariadb105-client/Makefile                          1.16
- databases/mariadb105-client/Makefile.common                   1.21
- databases/mariadb105-client/PLIST                             1.7
- databases/mariadb105-client/distinfo                          1.19
- databases/mariadb105-client/patches/patch-include_mysql_service__encryption.h deleted
- databases/mariadb105-server/Makefile                          1.36

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Jul  1 16:02:04 UTC 2023

   Modified Files:
        pkgsrc/databases/mariadb105-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mariadb105-server: Makefile
   Removed Files:
        pkgsrc/databases/mariadb105-client/patches:
            patch-include_mysql_service__encryption.h

   Log Message:
   mariadb105: update to 10.5.21

                            MariaDB 10.5.21 Release Notes

   Notable Items

     InnoDB

        * Server crashes in st_join_table::choose_best_splitting (MDEV-31403)
        * Crash with condition pushable into derived and containing outer
          reference (MDEV-31240)
        * InnoDB does not free UNDO after the fix of MDEV-30671 (MDEV-31234)
        * Revert "MDEV-30473 : Do not allow GET_LOCK() / RELEASE_LOCK() in
          cluster"

     Optimizer

        * Crash with condition pushable into derived and containing outer
          reference (MDEV-31403 MDEV-31240)
        * Crash with EXPLAIN EXTENDED for multi-table update of system table
          (MDEV-31224)

                            MariaDB 10.5.20 Release Notes

   Notable Items

     InnoDB

        * Crash on ROLLBACK in a ROW_FORMAT=COMPRESSED table (MDEV-30882)
        * UNIQUE USING HASH accepts duplicate entries for tricky collations
          (MDEV-30034)
        * rec_get_offsets() is not optimal (MDEV-30567)
        * Performance regression in fil_space_t::try_to_close() introduced in
          MDEV-23855 (MDEV-30775)
        * InnoDB recovery hangs when buffer pool ran out of memory (MDEV-30551)
        * InnoDB undo log truncation fails to wait for purge of history
          (MDEV-30671
        * Fix miscount of doublewrites by Innodb_data_written (MDEV-31124)

   Backup

        * mariadb-backup doesn't utilise innodb-undo-log-directory (if specified
          as a relative path) during copy-back operation (MDEV-28187)
        * mariabackup issues error messages during InnoDB tablespaces export on
          partial backup preparing (MDEV-29050)
        * mariadb-backup does not copy Aria logs if aria_log_dir_path is used
          (MDEV-30968)
        * Race condition between buffer pool flush and log file deletion in
          mariadb-backup --prepare (MDEV-30860)

     Replication

        * Fixed a deadlock on parallel slave involving full image Write event on
          the sequence engine (MDEV-29621)
        * Fixed an attempted out-of-order binlogging error on slave involving
          ALTER on the sequence engine (MDEV-31077)
        * Corrected non-versioned master to versioned slave replication on
          no-unique attribute table (MDEV-30430)
        * Mended encrypted binlog master to error out to gtid-mode slave when
          master could not decrypt a binlog file (MDEV-28798)
        * Refined optimistic parallel slave to error-exit without any hang
          (MDEV-30780)
        * Ensured SHOW-SLAVE-STATUS is processed on the parallel slave having a
          necessary mutex always intialized (MDEV-30620)
        * Fixed the slave applier to report a correct error when gtid_slave_pos
          insert fails for some (engine) reasons (MDEV-31038)

     Optimizer

        * Split Materialized optimization is improved to re-fill the
          materialized table only if necessary. The fewer number of table
          refills is taken into account when choosing query plan, too
          (MDEV-26301).
        * Queries using SELECT DISTINCT some_expression(aggregate_function())
          could produce wrong query result. (MDEV-20057)
        * A GROUP BY query with MIN(primary_key) in select list and
          primary_key<>const in the WHERE could produce wrong result when
          executed with "Using index for group-by" strategy (MDEV-30605)
        * EXPLAIN could erroneously report that Rowid Filter optimization is
          used for partitioned tables. Partitioned tables do not support it.
          (MDEV-30596)
        * A bug in selectivity computations for SINGLE/DOUBLE_PREC_HB histograms
          could cause wrong estimates to be produced. This could cause the
          optimizer to pick sub-optimal query plans (MDEV-31067).

     Security

        * Fixes for the following security vulnerabilities:
             * CVE-2022-47015


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.2.1 pkgsrc/databases/mariadb105-client/Makefile
cvs rdiff -u -r1.20 -r1.20.4.1 \
    pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.6 -r1.6.4.1 pkgsrc/databases/mariadb105-client/PLIST
cvs rdiff -u -r1.18 -r1.18.4.1 pkgsrc/databases/mariadb105-client/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mariadb105-client/patches/patch-include_mysql_service__encryption.h
cvs rdiff -u -r1.35 -r1.35.2.1 pkgsrc/databases/mariadb105-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb105-client/Makefile
diff -u pkgsrc/databases/mariadb105-client/Makefile:1.15 pkgsrc/databases/mariadb105-client/Makefile:1.15.2.1
--- pkgsrc/databases/mariadb105-client/Makefile:1.15    Wed Apr 19 08:09:25 2023
+++ pkgsrc/databases/mariadb105-client/Makefile Mon Jul 10 10:11:24 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2023/04/19 08:09:25 adam Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2023/07/10 10:11:24 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb105-client/Makefile.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.20 pkgsrc/databases/mariadb105-client/Makefile.common:1.20.4.1
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.20     Sat Mar 18 15:05:41 2023
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Mon Jul 10 10:11:24 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.20 2023/03/18 15:05:41 nia Exp $
+# $NetBSD: Makefile.common,v 1.20.4.1 2023/07/10 10:11:24 bsiegert Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=      mariadb-10.5.19
+DISTNAME=      mariadb-10.5.21
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb105-client/PLIST
diff -u pkgsrc/databases/mariadb105-client/PLIST:1.6 pkgsrc/databases/mariadb105-client/PLIST:1.6.4.1
--- pkgsrc/databases/mariadb105-client/PLIST:1.6        Sat Mar 18 15:05:41 2023
+++ pkgsrc/databases/mariadb105-client/PLIST    Mon Jul 10 10:11:24 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/03/18 15:05:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2023/07/10 10:11:24 bsiegert Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -48,6 +48,7 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_rpl.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
 include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_sys.h
@@ -74,6 +75,7 @@ include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
 include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
 include/mysql/server/my_compiler.h

Index: pkgsrc/databases/mariadb105-client/distinfo
diff -u pkgsrc/databases/mariadb105-client/distinfo:1.18 pkgsrc/databases/mariadb105-client/distinfo:1.18.4.1
--- pkgsrc/databases/mariadb105-client/distinfo:1.18    Sat Mar 18 15:05:41 2023
+++ pkgsrc/databases/mariadb105-client/distinfo Mon Jul 10 10:11:24 2023
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.18 2023/03/18 15:05:41 nia Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/07/10 10:11:24 bsiegert Exp $
 
-BLAKE2s (mariadb-10.5.19.tar.gz) = cc7735ea49b9b2f5e14a9534b26859461b977266bfa605e44201e9dfcc431f92
-SHA512 (mariadb-10.5.19.tar.gz) = 4a72ca4dfee0d3fa5432495f62c7eb03addc067e2f023b1ebe32bd1d3a0687c2c61c3316c0c4f690db4f74559bce668c6accbe137d906a52116db2bb2f454699
-Size (mariadb-10.5.19.tar.gz) = 111958233 bytes
+BLAKE2s (mariadb-10.5.21.tar.gz) = 1f2eaa28d86256bb1092c5e2578ad116ad2243317d2a087a65c49c3d0dcb0f0a
+SHA512 (mariadb-10.5.21.tar.gz) = b95d66e32153ae609450a98da2b32d7bccde80c4cb41070655084d2064d713b21ce460ce275a2b84513dec2567f44aaa2c358230bbd620ae13a0829587339e0c
+Size (mariadb-10.5.21.tar.gz) = 112102574 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 574131db46854715758c60ba5f026498f5b29564
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
-SHA1 (patch-include_mysql_service__encryption.h) = bfc2fcba9f33cc58b726f8645dc5400a0df27bd9
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-mysys_my__gethwaddr.c) = f4fd827617697ff386099defc839fe8d082e6c3e
 SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 5c7978b5bec79bbc09d3ebeb69dd85f3e6f8a423

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.35 pkgsrc/databases/mariadb105-server/Makefile:1.35.2.1
--- pkgsrc/databases/mariadb105-server/Makefile:1.35    Sun Apr 23 14:26:14 2023
+++ pkgsrc/databases/mariadb105-server/Makefile Mon Jul 10 10:11:24 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2023/04/23 14:26:14 adam Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2023/07/10 10:11:24 bsiegert Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   2
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*