CVS commit: pkgsrc/databases/mariadb106-client

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 20 11:59:10 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb106-client: Makefile.common PLIST distinfo

Log Message:
mariadb106: Update to 10.6.18

Fixes various fatal errors and CVE-2024-21096.

XXX mariadb.org mentions 10.6.19 but there appears to be no such
release as of yet.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb106-client/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/mariadb106-client/distinfo

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.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.26 pkgsrc/databases/mariadb106-client/Makefile.common:1.27
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.26     Wed May 15 19:21:43 2024
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Mon May 20 11:59:10 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.26 2024/05/15 19:21:43 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.27 2024/05/20 11:59:10 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=      mariadb-10.6.17
+DISTNAME=      mariadb-10.6.18
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -72,6 +72,8 @@ CMAKE_ARGS+=          -DPLUGIN_FEEDBACK=NO
 # Requires Java
 CMAKE_ARGS+=           -DCONNECT_WITH_JDBC=OFF
 
+CMAKE_ARGS+=           -DCONNECT_WITH_LIBXML2=OFF
+
 # Options which affect generation of includes
 CMAKE_ARGS+=           -DWITH_ARIA_STORAGE_ENGINE=ON
 CMAKE_ARGS+=           -DWITH_PARTITION_STORAGE_ENGINE=ON

Index: pkgsrc/databases/mariadb106-client/PLIST
diff -u pkgsrc/databases/mariadb106-client/PLIST:1.8 pkgsrc/databases/mariadb106-client/PLIST:1.9
--- pkgsrc/databases/mariadb106-client/PLIST:1.8        Wed Apr 10 19:22:38 2024
+++ pkgsrc/databases/mariadb106-client/PLIST    Mon May 20 11:59:10 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2024/04/10 19:22:38 nia Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/05/20 11:59:10 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -58,7 +58,6 @@ include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
@@ -135,6 +134,7 @@ include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h
 include/mysql/server/mysql/service_my_print_error.h
 include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_print_check_msg.h
 include/mysql/server/mysql/service_progress_report.h
 include/mysql/server/mysql/service_sha1.h
 include/mysql/server/mysql/service_sha2.h

Index: pkgsrc/databases/mariadb106-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.17 pkgsrc/databases/mariadb106-client/distinfo:1.18
--- pkgsrc/databases/mariadb106-client/distinfo:1.17    Wed Apr 10 19:22:38 2024
+++ pkgsrc/databases/mariadb106-client/distinfo Mon May 20 11:59:10 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2024/04/10 19:22:38 nia Exp $
+$NetBSD: distinfo,v 1.18 2024/05/20 11:59:10 nia Exp $
 
-BLAKE2s (mariadb-10.6.17.tar.gz) = 9b8d2672701bbf48fff3eb09b436fd2f305bf3e1650107f4d18cfb6debd80b81
-SHA512 (mariadb-10.6.17.tar.gz) = e07cf3e90d93d6139969875b11d6df3210b2c9f69257688b392843a7caed0dc3b75ba8904384fd0a55c24ece624e04b68c005a3731ee68f3957787a27b52ad56
-Size (mariadb-10.6.17.tar.gz) = 99067793 bytes
+BLAKE2s (mariadb-10.6.18.tar.gz) = 4f8e6c2ba6e75abea5a0191649f456d186ca8a7226ee70d8710179f327e3939b
+SHA512 (mariadb-10.6.18.tar.gz) = c4e89639775a8c6063851fa191cb1096b11299d3d22f19657848bc60ba67b2774978f38ca7625d1741ca80b7932fa65727427ae197899d286f921d5c6fc38af5
+Size (mariadb-10.6.18.tar.gz) = 99344652 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88