CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 6 Jun 2025 20:15:49 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun  6 20:15:49 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-storage_rocksdb_rocksdb_Makefile
        pkgsrc/databases/mariadb114-server: Makefile

Log Message:
mariadb114: Update to 11.4.7

Fixes for the following security issues:

- CVE-2025-30722
- CVE-2025-30693
- CVE-2023-52970
- CVE-2023-52969
- CVE-2023-52971

Fixes the build on OpenBSD, detected by drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb114-client/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb114-client/Makefile.common \
    pkgsrc/databases/mariadb114-client/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb114-client/PLIST
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile
cvs rdiff -u -r1.12 -r1.13 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.8 pkgsrc/databases/mariadb114-client/Makefile:1.9
--- pkgsrc/databases/mariadb114-client/Makefile:1.8     Sat Apr 19 07:57:35 2025
+++ pkgsrc/databases/mariadb114-client/Makefile Fri Jun  6 20:15:49 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2025/04/19 07:57:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2025/06/06 20:15:49 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 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.4 pkgsrc/databases/mariadb114-client/Makefile.common:1.5
--- pkgsrc/databases/mariadb114-client/Makefile.common:1.4      Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb114-client/Makefile.common  Fri Jun  6 20:15:49 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2025/02/16 23:28:13 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2025/06/06 20:15:49 nia Exp $
 #
 # used by databases/mariadb114-client/Makefile
 # used by databases/mariadb114-server/Makefile
 
-DISTNAME=      mariadb-11.4.5
+DISTNAME=      mariadb-11.4.7
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -85,6 +85,9 @@ CMAKE_CONFIGURE_ARGS+=                -DCMAKE_DISABLE_
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_DISABLE_FIND_PACKAGE_LZ4=ON
 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/mariadb114-client/distinfo
diff -u pkgsrc/databases/mariadb114-client/distinfo:1.4 pkgsrc/databases/mariadb114-client/distinfo:1.5
--- pkgsrc/databases/mariadb114-client/distinfo:1.4     Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb114-client/distinfo Fri Jun  6 20:15:49 2025
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2025/02/16 23:28:13 nia Exp $
+$NetBSD: distinfo,v 1.5 2025/06/06 20:15:49 nia Exp $
 
-BLAKE2s (mariadb-11.4.5.tar.gz) = c42832b5368c1bcc142f1e6fcca41c6c48a0139da06b209364ad40b7a636b8e1
-SHA512 (mariadb-11.4.5.tar.gz) = 65b74e5443c2b7e8bc6a4c2a22838e3440bdbfef9c8fa6ed2b142e3ed0121d77a049c1054b05859ff8232386894ae0e7429d1a646ecf503e9c01c4952c83c51a
-Size (mariadb-11.4.5.tar.gz) = 112382453 bytes
+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
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = ed2d6200cd6023bdb3847a514a948522d70ce210
+SHA1 (patch-CMakeLists.txt) = 4cb0b1d8ffecf04aa4cdc3aa324418d90e4854a8
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
-SHA1 (patch-cmake_libfmt.cmake) = 5b33ee5491bfd02ae0d255e372df497e4257aff6
+SHA1 (patch-cmake_libfmt.cmake) = e6a1b0cf65e0cfc0ea61723ba5aa091a181f3eb2
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce
@@ -20,6 +20,6 @@ SHA1 (patch-sql_mysqld.cc) = 8820f78278f
 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
-SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
+SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 2c0a482623b7ff4308b167796ef66102deddc83b
 SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd
 SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275

Index: pkgsrc/databases/mariadb114-client/PLIST
diff -u pkgsrc/databases/mariadb114-client/PLIST:1.2 pkgsrc/databases/mariadb114-client/PLIST:1.3
--- pkgsrc/databases/mariadb114-client/PLIST:1.2        Sun Feb 16 23:28:13 2025
+++ pkgsrc/databases/mariadb114-client/PLIST    Fri Jun  6 20:15:49 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/02/16 23:28:13 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/06/06 20:15:49 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -198,6 +198,7 @@ include/mysql/server/private/my_tracker.
 include/mysql/server/private/my_tree.h
 include/mysql/server/private/my_uctype.h
 include/mysql/server/private/my_user.h
+include/mysql/server/private/my_virtual_mem.h
 include/mysql/server/private/myisam.h
 include/mysql/server/private/myisamchk.h
 include/mysql/server/private/myisammrg.h

Index: pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.2 pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt:1.2 Sun Feb 16 23:28:14 2025
+++ pkgsrc/databases/mariadb114-client/patches/patch-CMakeLists.txt     Fri Jun  6 20:15:49 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2025/02/16 23:28:14 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/06/06 20:15:49 nia Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig        2025-01-30 17:54:53.000000000 +0000
+--- CMakeLists.txt.orig        2025-05-19 16:14:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -458,8 +458,6 @@ ENDIF()
+@@ -457,8 +457,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configurati
  INCLUDE(cpack_tgz)
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
-@@ -470,19 +468,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -469,19 +467,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,7 +33,7 @@ Allow building a server-only configurati
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER)
-@@ -501,10 +496,12 @@ IF(NOT WITHOUT_SERVER)
+@@ -500,10 +495,12 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -49,7 +49,7 @@ Allow building a server-only configurati
  ENDIF()
  
  IF (NOT WITHOUT_ABI_CHECK)
-@@ -513,13 +510,14 @@ ENDIF()
+@@ -512,13 +509,14 @@ ENDIF()
  INCLUDE(cmake/tags.cmake)
  INCLUDE(for_clients)
  ADD_SUBDIRECTORY(scripts)
@@ -66,7 +66,7 @@ Allow building a server-only configurati
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
-@@ -591,7 +589,7 @@ IF(WIN32 AND SIGNCODE)
+@@ -590,7 +588,7 @@ IF(WIN32 AND SIGNCODE)
    INSTALL(SCRIPT ${PROJECT_BINARY_DIR}/sign.cmake)
  ENDIF()
  
@@ -75,7 +75,7 @@ Allow building a server-only configurati
  
  OPTION(FEATURE_SUMMARY "Print feature summary at the end of configure step" ON)
  IF (FEATURE_SUMMARY)
-@@ -603,41 +601,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+@@ -602,41 +600,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
    MESSAGE(WARNING "
  You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software 
Foundation.")
  ENDIF()
@@ -110,7 +110,7 @@ Allow building a server-only configurati
 -   perror
 -   replace)
 -  IF(WIN32)
--    ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill)
+-    ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill mariadb-upgrade-service)
 -  ENDIF()
 -  ADD_CUSTOM_TARGET(smoketest
 -    COMMAND perl ./mysql-test-run.pl main.1st

Index: pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake
diff -u pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.3 pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.4
--- pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake:1.3     Fri Dec 13 14:07:44 2024
+++ pkgsrc/databases/mariadb114-client/patches/patch-cmake_libfmt.cmake Fri Jun  6 20:15:49 2025
@@ -1,25 +1,24 @@
-$NetBSD: patch-cmake_libfmt.cmake,v 1.3 2024/12/13 14:07:44 nia Exp $
+$NetBSD: patch-cmake_libfmt.cmake,v 1.4 2025/06/06 20:15:49 nia Exp $
 
 Disable broken libfmt detection.
 
---- cmake/libfmt.cmake.orig    2024-12-13 13:59:17.741050173 +0000
+--- cmake/libfmt.cmake.orig    2025-05-19 16:14:24.000000000 +0000
 +++ cmake/libfmt.cmake
-@@ -25,29 +25,7 @@ MACRO(BUNDLE_LIBFMT)
+@@ -25,28 +25,7 @@ MACRO(BUNDLE_LIBFMT)
  ENDMACRO()
  
  MACRO (CHECK_LIBFMT)
 -  IF(WITH_LIBFMT STREQUAL "system" OR WITH_LIBFMT STREQUAL "auto")
 -    SET(CMAKE_REQUIRED_INCLUDES ${LIBFMT_INCLUDE_DIR})
 -    CHECK_CXX_SOURCE_RUNS(
--    "#define FMT_STATIC_THOUSANDS_SEPARATOR ','
--     #define FMT_HEADER_ONLY 1
+-    "#define FMT_HEADER_ONLY 1
 -     #include <fmt/args.h>
 -     int main() {
 -       using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
 -       ArgStore arg_store;
 -       int answer= 4321;
 -       arg_store.push_back(answer);
--       return fmt::vformat(\"{:L}\", arg_store).compare(\"4,321\");
+-       return fmt::vformat(\"{}\", arg_store).compare(\"4321\");
 -     }" HAVE_SYSTEM_LIBFMT)
 -    SET(CMAKE_REQUIRED_INCLUDES)
 -  ENDIF()

Index: pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile
diff -u pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile:1.1 pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile:1.2
--- pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile:1.1       Wed Aug 21 21:08:34 2024
+++ pkgsrc/databases/mariadb114-client/patches/patch-storage_rocksdb_rocksdb_Makefile   Fri Jun  6 20:15:49 2025
@@ -1,24 +1,24 @@
-$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.1 2024/08/21 21:08:34 nia Exp $
+$NetBSD: patch-storage_rocksdb_rocksdb_Makefile,v 1.2 2025/06/06 20:15:49 nia Exp $
 
 Shell portability.
 
---- storage/rocksdb/rocksdb/Makefile.orig      2021-02-18 23:22:28.000000000 +0000
+--- storage/rocksdb/rocksdb/Makefile.orig      2025-06-06 17:55:18.123502674 +0000
 +++ storage/rocksdb/rocksdb/Makefile
-@@ -911,7 +911,7 @@ valgrind_check_0:
+@@ -962,7 +962,7 @@ valgrind_check_0:
          | grep -E '$(tests-regexp)'                                   \
-         | grep -E -v '$(valgrind-blacklist-regexp)'                                   \
-         | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \
--        '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \
-+        '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) ' \
-         '>& t/valgrind_log-{/}'
+         | grep -E -v '$(valgrind-exclude-regexp)'                                     \
+         | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu \
+-        '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
++        '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) \
+         $(parallel_redir)' \
  
  CLEAN_FILES += t LOG $(TMPD)
-@@ -1952,7 +1952,7 @@ rocksdbjavastatic: $(java_static_all_lib
+@@ -2282,7 +2282,7 @@ rocksdbjavastatic_javalib:
          -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
-         $(java_static_all_libobjects) $(COVERAGEFLAGS) \
+         $(LIB_OBJECTS) $(COVERAGEFLAGS) \
          $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
 -      cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \
 +      cd java/target;if [ "$(DEBUG_LEVEL)" = "0" ]; then \
                strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \
        fi
-       cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
+ 

Index: pkgsrc/databases/mariadb114-server/Makefile
diff -u pkgsrc/databases/mariadb114-server/Makefile:1.12 pkgsrc/databases/mariadb114-server/Makefile:1.13
--- pkgsrc/databases/mariadb114-server/Makefile:1.12    Fri May  9 14:56:57 2025
+++ pkgsrc/databases/mariadb114-server/Makefile Fri Jun  6 20:15:49 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2025/05/09 14:56:57 nia Exp $
+# $NetBSD: Makefile,v 1.13 2025/06/06 20:15:49 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   3
 COMMENT=       MariaDB 11.4, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

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

Home | Main Index | Thread Index | Old Index