CVS commit: [pkgsrc-2025Q1] pkgsrc/databases

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jun  8 22:21:56 UTC 2025

Modified Files:
        pkgsrc/databases/mariadb106-client [pkgsrc-2025Q1]: Makefile.common
            distinfo
        pkgsrc/databases/mariadb106-server [pkgsrc-2025Q1]: Makefile

Log Message:
Pullup ticket #6973 - requested by nia
databases/mariadb106-client: Security fix
databases/mariadb106-server: Security fix

Revisions pulled up:
- databases/mariadb106-client/Makefile.common                   1.32
- databases/mariadb106-client/distinfo                          1.23
- databases/mariadb106-server/Makefile                          1.47

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Fri Jun  6 19:43:30 UTC 2025

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

   Log Message:
   mariadb106: Update to 10.6.22

   Fixes for the following security issues:
   - CVE-2025-30722
   - CVE-2025-30693
   - CVE-2023-52970
   - CVE-2023-52969

   Fixes the build on OpenBSD, detected by drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.2.1 \
    pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/databases/mariadb106-client/distinfo
cvs rdiff -u -r1.43 -r1.43.2.1 pkgsrc/databases/mariadb106-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/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.31 pkgsrc/databases/mariadb106-client/Makefile.common:1.31.2.1
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.31     Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Sun Jun  8 22:21:55 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.31 2025/02/16 23:28:13 nia Exp $
+# $NetBSD: Makefile.common,v 1.31.2.1 2025/06/08 22:21:55 maya Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=      mariadb-10.6.21
+DISTNAME=      mariadb-10.6.22
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -81,6 +81,9 @@ CMAKE_CONFIGURE_ARGS+=                -DWITH_PERFSCHEM
 
 CMAKE_CONFIGURE_ARGS+=         -DWITHOUT_MROONGA_STORAGE_ENGINE=ON
 
+# Let mk/ determine the security hardening flags to use.
+CMAKE_CONFIGURE_ARGS+=         -DSECURITY_HARDENED=OFF
+
 CMAKE_CONFIGURE_ARGS+=         -DENABLE_DTRACE=OFF
 
 # Ensure the correct DTrace ABI is used.

Index: pkgsrc/databases/mariadb106-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.22 pkgsrc/databases/mariadb106-client/distinfo:1.22.2.1
--- pkgsrc/databases/mariadb106-client/distinfo:1.22    Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb106-client/distinfo Sun Jun  8 22:21:55 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2025/02/16 23:28:13 nia Exp $
+$NetBSD: distinfo,v 1.22.2.1 2025/06/08 22:21:55 maya Exp $
 
-BLAKE2s (mariadb-10.6.21.tar.gz) = fa1ad8a841c5fe61250696fa7d5fc38e9fa7831abc9f97e17c1e9d1a28e47612
-SHA512 (mariadb-10.6.21.tar.gz) = fe74a6fbf409723d69b35481a57d00fb04a2c560ad503ae50ff7b9d41b650dda32fe997c50303428e79a546e5c7fe91872fe3436cc3b7323f13a7138e04f5a53
-Size (mariadb-10.6.21.tar.gz) = 103982296 bytes
+BLAKE2s (mariadb-10.6.22.tar.gz) = 21da01b328e66dfaa8975a452d4640d11eabb014881230a7d811ff5afeb02dd5
+SHA512 (mariadb-10.6.22.tar.gz) = 418bf55d3bd2d8ec2dbe5cd626fa1a11419d6cd5a5241d8b26bfe368bf5ec5b4dcc505d59da1b4cf35f0f1cda3c42c3fdda9ae4be68cdc0402900d5443fe4f31
+Size (mariadb-10.6.22.tar.gz) = 104020772 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = bb5e35aea168a7f6a15bff0aa3aa179470bb693b
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.43 pkgsrc/databases/mariadb106-server/Makefile:1.43.2.1
--- pkgsrc/databases/mariadb106-server/Makefile:1.43    Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb106-server/Makefile Sun Jun  8 22:21:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/02/16 23:28:13 nia Exp $
+# $NetBSD: Makefile,v 1.43.2.1 2025/06/08 22:21:55 maya Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
@@ -44,7 +44,7 @@ BUILD_DEFS+=          MARIADB_DATADIR
 OWN_DIRS_PERMS+=       ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700
 OWN_DIRS_PERMS+=       ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
 
-USE_TOOLS=             bash:run perl:run
+USE_TOOLS+=            bash:run perl:run
 REPLACE_BASH+=         scripts/wsrep_sst_*.sh
 REPLACE_BASH+=         scripts/mariadb-service-convert