CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 27 Oct 2025 20:51:00 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 27 20:51:00 UTC 2025

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

Log Message:
mariadb106-client: Update to 10.6.23

The usual bundle of reliability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mariadb106-client/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mariadb106-client/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/mariadb106-client/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt
cvs rdiff -u -r1.50 -r1.51 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
diff -u pkgsrc/databases/mariadb106-client/Makefile:1.29 pkgsrc/databases/mariadb106-client/Makefile:1.30
--- pkgsrc/databases/mariadb106-client/Makefile:1.29    Thu Oct 23 20:36:11 2025
+++ pkgsrc/databases/mariadb106-client/Makefile Mon Oct 27 20:51:00 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2025/10/23 20:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2025/10/27 20:51:00 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.32 pkgsrc/databases/mariadb106-client/Makefile.common:1.33
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.32     Fri Jun  6 19:43:30 2025
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Mon Oct 27 20:51:00 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2025/06/06 19:43:30 nia Exp $
+# $NetBSD: Makefile.common,v 1.33 2025/10/27 20:51:00 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=      mariadb-10.6.22
+DISTNAME=      mariadb-10.6.23
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb106-client/PLIST
diff -u pkgsrc/databases/mariadb106-client/PLIST:1.10 pkgsrc/databases/mariadb106-client/PLIST:1.11
--- pkgsrc/databases/mariadb106-client/PLIST:1.10       Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb106-client/PLIST    Mon Oct 27 20:51:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2025/02/16 23:28:13 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/10/27 20:51:00 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin

Index: pkgsrc/databases/mariadb106-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.24 pkgsrc/databases/mariadb106-client/distinfo:1.25
--- pkgsrc/databases/mariadb106-client/distinfo:1.24    Fri Aug 22 13:07:55 2025
+++ pkgsrc/databases/mariadb106-client/distinfo Mon Oct 27 20:51:00 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2025/08/22 13:07:55 wiz Exp $
+$NetBSD: distinfo,v 1.25 2025/10/27 20:51:00 nia Exp $
 
-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
+BLAKE2s (mariadb-10.6.23.tar.gz) = 8f1f8f38671279e471b442669f90e79b67b1c8426739e704dd119af3a72dcc72
+SHA512 (mariadb-10.6.23.tar.gz) = 1654c828fef3dc8732dd2285034d0d7c17a828cd6a02561f75f48a6ee134e18f299d18e0be033ca752f963d84290088999bb5373c9971420c7b312cc986c2d72
+Size (mariadb-10.6.23.tar.gz) = 107141939 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = bb5e35aea168a7f6a15bff0aa3aa179470bb693b
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -11,10 +11,9 @@ SHA1 (patch-extra_readline_CMakeLists.tx
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
-SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
+SHA1 (patch-scripts_CMakeLists.txt) = ec84eb79de6d9ff895c4eb8526cecba2d96ad89e
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = be9f0de1fbb37ef0f176439bb3bf209bdf5a06ce
-SHA1 (patch-storage_columnstore_columnstore_CMakeLists.txt) = 5af88a0799f159707811fd42d51cb4c8a18da797
 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

Index: pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.4 pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.4 Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt     Mon Oct 27 20:51:00 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2025/02/16 23:28:13 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2025/10/27 20:51:00 nia Exp $
 
 Allow building a server-only configuration.
 

Index: pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt
diff -u pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.2 pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.3
--- pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.2 Sat Nov 27 23:40:28 2021
+++ pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt     Mon Oct 27 20:51:00 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2021/11/27 23:40:28 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.3 2025/10/27 20:51:00 nia Exp $
 
 Allow building a server-only configuration.
 
---- scripts/CMakeLists.txt.orig        2021-11-05 20:03:30.000000000 +0000
+--- scripts/CMakeLists.txt.orig        2025-07-28 19:35:05.000000000 +0000
 +++ scripts/CMakeLists.txt
-@@ -324,22 +324,26 @@ ELSE()
+@@ -343,6 +343,19 @@ ELSE()
        mariadbd-safe
        ${SYSTEMD_SCRIPTS}
      )
-+  ELSE()
++  ELSE() 
 +    SET(CLIENT_SCRIPTS
 +      msql2mysql
 +      mariadb-setpermission
@@ -24,7 +24,8 @@ Allow building a server-only configurati
    ENDIF()
    # Configure this one, for testing, but do not install it.
    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
-     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
+@@ -351,16 +364,7 @@ ELSE()
+     ${CMAKE_CURRENT_BINARY_DIR}/print_ddl_recovery_log.pl ESCAPE_QUOTES @ONLY)
    # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
 -    msql2mysql

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.50 pkgsrc/databases/mariadb106-server/Makefile:1.51
--- pkgsrc/databases/mariadb106-server/Makefile:1.50    Thu Oct 23 20:36:11 2025
+++ pkgsrc/databases/mariadb106-server/Makefile Mon Oct 27 20:51:00 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2025/10/23 20:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2025/10/27 20:51:00 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   3
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Prev by Date: CVS commit: pkgsrc/archivers/bzip3
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/archivers/bzip3
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index