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:53:45 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct 27 20:53:45 UTC 2025

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

Log Message:
mariadb114: Update to 11.4.8

The usual bundle of reliability fixes.


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

Index: pkgsrc/databases/mariadb114-client/Makefile.common
diff -u pkgsrc/databases/mariadb114-client/Makefile.common:1.5 pkgsrc/databases/mariadb114-client/Makefile.common:1.6
--- pkgsrc/databases/mariadb114-client/Makefile.common:1.5      Fri Jun  6 20:15:49 2025
+++ pkgsrc/databases/mariadb114-client/Makefile.common  Mon Oct 27 20:53:45 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2025/06/06 20:15:49 nia Exp $
+# $NetBSD: Makefile.common,v 1.6 2025/10/27 20:53:45 nia Exp $
 #
 # used by databases/mariadb114-client/Makefile
 # used by databases/mariadb114-server/Makefile
 
-DISTNAME=      mariadb-11.4.7
+DISTNAME=      mariadb-11.4.8
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb114-client/PLIST
diff -u pkgsrc/databases/mariadb114-client/PLIST:1.3 pkgsrc/databases/mariadb114-client/PLIST:1.4
--- pkgsrc/databases/mariadb114-client/PLIST:1.3        Fri Jun  6 20:15:49 2025
+++ pkgsrc/databases/mariadb114-client/PLIST    Mon Oct 27 20:53:45 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/06/06 20:15:49 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/10/27 20:53:45 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin

Index: pkgsrc/databases/mariadb114-client/distinfo
diff -u pkgsrc/databases/mariadb114-client/distinfo:1.6 pkgsrc/databases/mariadb114-client/distinfo:1.7
--- pkgsrc/databases/mariadb114-client/distinfo:1.6     Fri Jun 20 14:03:03 2025
+++ pkgsrc/databases/mariadb114-client/distinfo Mon Oct 27 20:53:45 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2025/06/20 14:03:03 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/10/27 20:53:45 nia Exp $
 
-BLAKE2s (mariadb-11.4.7.tar.gz) = 8a78dfad5ac7072f6719227e29a271444edf3aab0111ecb88aeaddf0b7aa8022
-SHA512 (mariadb-11.4.7.tar.gz) = dba29199afcda7a974116f64bf7765444d8239455266f4a226396d228c2feaa03ba6551e1ef53e75efce833c109fac34a05a70c74a1c3e2cd06e4a7b2326b5c9
-Size (mariadb-11.4.7.tar.gz) = 115980754 bytes
+BLAKE2s (mariadb-11.4.8.tar.gz) = 0361682e7ea3ad61b8aa79adf4aa591ba4c6fd2e6b555599ef1ac994c2812b50
+SHA512 (mariadb-11.4.8.tar.gz) = 4adbe58e1ee478460c1a463032823a3dfe27e3c3a6c2b5002f757744e05efd4392a36e4bb7a473a72b9ba7cb043a15a8a3e309742dcca66f4adf316cbc2e01a3
+Size (mariadb-11.4.8.tar.gz) = 119152572 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 4cb0b1d8ffecf04aa4cdc3aa324418d90e4854a8
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -15,7 +15,7 @@ SHA1 (patch-mysys_my__gethwaddr.c) = c3f
 SHA1 (patch-mysys_my__largepage.c) = 0545d1be72e2387730b82432b3fcde31561d626e
 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) = be93a6a38017de40940b6cc3e64cec80f917501d
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833

Index: pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.3 pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.3 Fri Jun  6 20:15:49 2025
+++ pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt     Mon Oct 27 20:53:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2025/06/06 20:15:49 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/10/27 20:53:45 nia Exp $
 
 Allow building a server-only configuration.
 

Index: pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake
diff -u pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.4 pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.5
--- pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.4     Fri Jun  6 20:15:49 2025
+++ pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake Mon Oct 27 20:53:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_libfmt.cmake,v 1.4 2025/06/06 20:15:49 nia Exp $
+$NetBSD: patch-cmake_libfmt.cmake,v 1.5 2025/10/27 20:53:45 nia Exp $
 
 Disable broken libfmt detection.
 

Index: pkgsrc/databases/mariadb114-client/patches/patch-mysys_my__largepage.c
diff -u pkgsrc/databases/mariadb114-client/patches/patch-mysys_my__largepage.c:1.1 pkgsrc/databases/mariadb114-client/patches/patch-mysys_my__largepage.c:1.2
--- pkgsrc/databases/mariadb114-client/patches/patch-mysys_my__largepage.c:1.1  Fri Jun 20 14:03:03 2025
+++ pkgsrc/databases/mariadb114-client/patches/patch-mysys_my__largepage.c      Mon Oct 27 20:53:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-mysys_my__largepage.c,v 1.1 2025/06/20 14:03:03 nia Exp $
+$NetBSD: patch-mysys_my__largepage.c,v 1.2 2025/10/27 20:53:45 nia Exp $
 
 Fix build on illumos, via OmniOS CE.
 
Index: pkgsrc/databases/mariadb114-client/patches/patch-scripts_CMakeLists.txt
diff -u pkgsrc/databases/mariadb114-client/patches/patch-scripts_CMakeLists.txt:1.1 pkgsrc/databases/mariadb114-client/patches/patch-scripts_CMakeLists.txt:1.2
--- pkgsrc/databases/mariadb114-client/patches/patch-scripts_CMakeLists.txt:1.1 Wed Aug 21 21:08:34 2024
+++ pkgsrc/databases/mariadb114-client/patches/patch-scripts_CMakeLists.txt     Mon Oct 27 20:53:45 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2024/08/21 21:08:34 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2025/10/27 20:53:45 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/mariadb114-client/patches/patch-sql_mysqld.cc
diff -u pkgsrc/databases/mariadb114-client/patches/patch-sql_mysqld.cc:1.2 pkgsrc/databases/mariadb114-client/patches/patch-sql_mysqld.cc:1.3
--- pkgsrc/databases/mariadb114-client/patches/patch-sql_mysqld.cc:1.2  Fri Jun 20 14:03:03 2025
+++ pkgsrc/databases/mariadb114-client/patches/patch-sql_mysqld.cc      Mon Oct 27 20:53:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.2 2025/06/20 14:03:03 nia Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.3 2025/10/27 20:53:45 nia Exp $
 
 Build fixes for illumos. From OmniOS CE.
 

Index: pkgsrc/databases/mariadb114-server/Makefile
diff -u pkgsrc/databases/mariadb114-server/Makefile:1.17 pkgsrc/databases/mariadb114-server/Makefile:1.18
--- pkgsrc/databases/mariadb114-server/Makefile:1.17    Thu Oct 23 20:36:11 2025
+++ pkgsrc/databases/mariadb114-server/Makefile Mon Oct 27 20:53:45 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2025/10/23 20:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2025/10/27 20:53:45 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
 COMMENT=       MariaDB 11.4, 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