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:48:59 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 27 20:48:59 UTC 2025

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mariadb1011-client/patches: patch-CMakeLists.txt
            patch-cmake_libfmt.cmake patch-mysys_my__largepage.c
            patch-scripts_CMakeLists.txt
        pkgsrc/databases/mariadb1011-server: Makefile

Log Message:
mariadb1011-client: Update to 10.11.14

The usual bundle of reliability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mariadb1011-client/Makefile
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb1011-client/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt \
    pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c \
    pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/mariadb1011-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/mariadb1011-client/Makefile
diff -u pkgsrc/databases/mariadb1011-client/Makefile:1.22 pkgsrc/databases/mariadb1011-client/Makefile:1.23
--- pkgsrc/databases/mariadb1011-client/Makefile:1.22   Thu Oct 23 20:36:10 2025
+++ pkgsrc/databases/mariadb1011-client/Makefile        Mon Oct 27 20:48:59 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2025/10/23 20:36:10 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/10/27 20:48:59 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   3
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.18 pkgsrc/databases/mariadb1011-client/Makefile.common:1.19
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.18    Fri Jun  6 20:48:33 2025
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Mon Oct 27 20:48:59 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.18 2025/06/06 20:48:33 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2025/10/27 20:48:59 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
 # used by databases/mariadb1011-embedded/Makefile
 
-DISTNAME=      mariadb-10.11.13
+DISTNAME=      mariadb-10.11.14
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb1011-client/PLIST
diff -u pkgsrc/databases/mariadb1011-client/PLIST:1.4 pkgsrc/databases/mariadb1011-client/PLIST:1.5
--- pkgsrc/databases/mariadb1011-client/PLIST:1.4       Fri Jun  6 20:48:33 2025
+++ pkgsrc/databases/mariadb1011-client/PLIST   Mon Oct 27 20:48:59 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2025/06/06 20:48:33 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/10/27 20:48:59 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.17 pkgsrc/databases/mariadb1011-client/distinfo:1.18
--- pkgsrc/databases/mariadb1011-client/distinfo:1.17   Fri Aug 22 11:42:09 2025
+++ pkgsrc/databases/mariadb1011-client/distinfo        Mon Oct 27 20:48:59 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2025/08/22 11:42:09 wiz Exp $
+$NetBSD: distinfo,v 1.18 2025/10/27 20:48:59 nia Exp $
 
-BLAKE2s (mariadb-10.11.13.tar.gz) = 23965d289e03ea187bb48a0721396ad79425f02b7334ee46e12925ced3588f00
-SHA512 (mariadb-10.11.13.tar.gz) = 4eff7f30fdbfdbeafb6c708262a89bcb2065261c384b5b027720dd7a7a7dc79ecbdb70339aec05c813d7991c3807af09c300841e731e5c925a1adf5b3fcd0580
-Size (mariadb-10.11.13.tar.gz) = 109323757 bytes
+BLAKE2s (mariadb-10.11.14.tar.gz) = 289447426fcc8bb840c0a65757b3b7ad2136ac9bfa8eaa01f80b2f62aac419d7
+SHA512 (mariadb-10.11.14.tar.gz) = 24276e8b0f7ad555bf8faab8e5e065cbaeeb5d92b66964e470f41ac00db29a148e36b0f9f8078392a5fdae4cc3e77df28d0a570ef3735a73f4837ded3a50e476
+Size (mariadb-10.11.14.tar.gz) = 112475645 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 4cb0b1d8ffecf04aa4cdc3aa324418d90e4854a8
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -15,10 +15,9 @@ SHA1 (patch-mysys_my__gethwaddr.c) = c3f
 SHA1 (patch-mysys_my__largepage.c) = 3e48863214b0b46ffaa96f70107540f61ba9d656
 SHA1 (patch-plugin_auth__gssapi_cmake_FindGSSAPI.cmake) = 215d48d80fe4dd018678ec7b03fc40ca1caf4f16
 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) = ab842758c17acff455dee89a48118d50f51dc786
-SHA1 (patch-storage_columnstore_columnstore_CMakeLists.txt) = 3b6c98e0a32c1504cc15c09643642a54b04c35c9
 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/mariadb1011-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.4 pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt:1.4        Fri Jun  6 20:48:33 2025
+++ pkgsrc/databases/mariadb1011-client/patches/patch-CMakeLists.txt    Mon Oct 27 20:48:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2025/06/06 20:48:33 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2025/10/27 20:48:59 nia Exp $
 
 Allow building a server-only configuration.
 
Index: pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake:1.4 pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake:1.5
--- pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake:1.4    Fri Jun  6 20:48:33 2025
+++ pkgsrc/databases/mariadb1011-client/patches/patch-cmake_libfmt.cmake        Mon Oct 27 20:48:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_libfmt.cmake,v 1.4 2025/06/06 20:48:33 nia Exp $
+$NetBSD: patch-cmake_libfmt.cmake,v 1.5 2025/10/27 20:48:59 nia Exp $
 
 Disable broken libfmt detection.
 

Index: pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c:1.1 pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c:1.2
--- pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c:1.1 Fri Jun 20 17:04:41 2025
+++ pkgsrc/databases/mariadb1011-client/patches/patch-mysys_my__largepage.c     Mon Oct 27 20:48:59 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-mysys_my__largepage.c,v 1.1 2025/06/20 17:04:41 nia Exp $
+$NetBSD: patch-mysys_my__largepage.c,v 1.2 2025/10/27 20:48:59 nia Exp $
 
 Fix build on illumos, via OmniOS CE.
 
Index: pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt:1.1 pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt:1.1        Mon Jul 10 22:55:49 2023
+++ pkgsrc/databases/mariadb1011-client/patches/patch-scripts_CMakeLists.txt    Mon Oct 27 20:48:59 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2023/07/10 22:55:49 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2025/10/27 20:48:59 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/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.31 pkgsrc/databases/mariadb1011-server/Makefile:1.32
--- pkgsrc/databases/mariadb1011-server/Makefile:1.31   Thu Oct 23 20:36:10 2025
+++ pkgsrc/databases/mariadb1011-server/Makefile        Mon Oct 27 20:48:59 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2025/10/23 20:36:10 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2025/10/27 20:48:59 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

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

Home | Main Index | Thread Index | Old Index