git: baa5b9235fe9 - main - databases/mariadb106-{client,server}: Update 10.6.21 => 10.6.22

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 12 Jun 2025 01:13:18 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=baa5b9235fe978286ba36156605c4be0fabcea33

commit baa5b9235fe978286ba36156605c4be0fabcea33
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-06-12 01:00:46 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-06-12 01:13:03 +0000

    databases/mariadb106-{client,server}: Update 10.6.21 => 10.6.22
    
    Release notes:
    https://mariadb.com/kb/en/mariadb-10-6-22-release-notes/
    
    While here remove stale variable ZSTD_LIB_DEPENDS and unbreak
    COLUMNSTORE option.
    
    PR:             285895
    Approved by:    brnrd (maintainer, timeout > 3 weeks)
    Security:       CVE-2025-30722
    Security:       CVE-2025-30693
    Security:       CVE-2023-52970
    Security:       CVE-2023-52969
    MFH:            2025Q2
---
 databases/mariadb106-server/Makefile | 5 ++---
 databases/mariadb106-server/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 51cae9f1c2aa..55209c823032 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.21
+PORTVERSION=	10.6.22
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -167,7 +167,7 @@ ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-COLUMNSTORE_BROKEN=	error: __float128 is not supported on this target
+#COLUMNSTORE_BROKEN=	error: __float128 is not supported on this target
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
@@ -195,7 +195,6 @@ WSREP_RUN_DEPENDS=	bash:shells/bash \
 			#stunnel:security/stunnel
 WSREP_SHEBANG_FILES=	bin/wsrep_sst_rsync
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .for PLUGIN in ${DISABLED_PLUGINS}
 CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index 5cfe0d4ff1cd..bf1f54db3c3b 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738941493
-SHA256 (mariadb-10.6.21.tar.gz) = 8d7f97169b3ba2044858965b8cfc254364400df43e905042f92e24b8fa7b0d96
-SIZE (mariadb-10.6.21.tar.gz) = 103982296
+TIMESTAMP = 1749606327
+SHA256 (mariadb-10.6.22.tar.gz) = 2ca600dc7e85ead1f33c212f9d76b1f2f812d249c8bde02e5f38ead098ade420
+SIZE (mariadb-10.6.22.tar.gz) = 104020772