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

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

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

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

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

Revisions pulled up:
- databases/mariadb105-client/Makefile.common                   1.36
- databases/mariadb105-client/distinfo                          1.27
- databases/mariadb105-server/Makefile                          1.57

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Fri Jun  6 19:41:49 UTC 2025

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

   Log Message:
   mariadb105: Update to 10.5.29

   Fixes 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.35 -r1.35.2.1 \
    pkgsrc/databases/mariadb105-client/Makefile.common
cvs rdiff -u -r1.26 -r1.26.2.1 pkgsrc/databases/mariadb105-client/distinfo
cvs rdiff -u -r1.53 -r1.53.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.common
diff -u pkgsrc/databases/mariadb105-client/Makefile.common:1.35 pkgsrc/databases/mariadb105-client/Makefile.common:1.35.2.1
--- pkgsrc/databases/mariadb105-client/Makefile.common:1.35     Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb105-client/Makefile.common  Sun Jun  8 21:21:55 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.35 2025/02/16 23:28:13 nia Exp $
+# $NetBSD: Makefile.common,v 1.35.2.1 2025/06/08 21:21:55 maya Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=      mariadb-10.5.28
+DISTNAME=      mariadb-10.5.29
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -84,6 +84,9 @@ CMAKE_CONFIGURE_ARGS+=                -DWITHOUT_MROONG
 
 CMAKE_CONFIGURE_ARGS+=         -DENABLE_DTRACE=OFF
 
+# Let mk/ determine the security hardening flags to use.
+CMAKE_CONFIGURE_ARGS+=         -DSECURITY_HARDENED=OFF
+
 CMAKE_CONFIGURE_ARGS+=         -DTOKUDB_OK=OFF
 
 # Ensure the correct DTrace ABI is used.

Index: pkgsrc/databases/mariadb105-client/distinfo
diff -u pkgsrc/databases/mariadb105-client/distinfo:1.26 pkgsrc/databases/mariadb105-client/distinfo:1.26.2.1
--- pkgsrc/databases/mariadb105-client/distinfo:1.26    Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb105-client/distinfo Sun Jun  8 21:21:55 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2025/02/16 23:28:13 nia Exp $
+$NetBSD: distinfo,v 1.26.2.1 2025/06/08 21:21:55 maya Exp $
 
-BLAKE2s (mariadb-10.5.28.tar.gz) = 61e5217a8555046ce10c68af5edfb80b31456a7c3e1447de0c511c500c7a0334
-SHA512 (mariadb-10.5.28.tar.gz) = 829e05a00772ff5a6db62b5c22ee7d6642439dfd47660a41876db0107b1648318f3f8ce5dc01ef52f5d6c88f7e39d89c5f24a55b95ae88676f4ead01146cd0c7
-Size (mariadb-10.5.28.tar.gz) = 117755203 bytes
+BLAKE2s (mariadb-10.5.29.tar.gz) = 94e01f0fd5486780de45428f00d9d6ad8e7465fd9bc1565a380571663a3d409a
+SHA512 (mariadb-10.5.29.tar.gz) = 7c650f7a6286b2d4f21ea3f0612aca2cd9fa98e909cc7459eecfa11a9bdcc027f551fadebfa72b348719b0bd79134358e3947176809ecb24aa7f49f3868d91ea
+Size (mariadb-10.5.29.tar.gz) = 117805539 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 3c2748774822710f79f6f6ce2d13b7bcb2afbff0
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.53 pkgsrc/databases/mariadb105-server/Makefile:1.53.2.1
--- pkgsrc/databases/mariadb105-server/Makefile:1.53    Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb105-server/Makefile Sun Jun  8 21:21:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2025/02/16 23:28:13 nia Exp $
+# $NetBSD: Makefile,v 1.53.2.1 2025/06/08 21:21:55 maya Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       MariaDB 10.5, 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