From f500c36e00956f6dce67bdb5a754dd6bcab2df81 Mon Sep 17 00:00:00 2001
From: Vladimir Druzenko <vvd@FreeBSD.org>
Date: Thu, 12 Jun 2025 03:39:34 +0300
Subject: [PATCH] databases/mariadb105-{client,server}: Update 10.5.28 =>
 10.5.29

Release notes:
https://mariadb.com/kb/en/mariadb-10-5-29-release-notes/

While here fix ROCKSDB+ZSTD options: with ROCKSDB it grab zstd even if
option ZSTD is off; nothing else uses zstd.
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/mariadb105-server/Makefile | 11 ++++-------
 databases/mariadb105-server/distinfo |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index cdc75148b5cc..93c3741194fb 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.5.28
+PORTVERSION=	10.5.29
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	\
@@ -64,7 +64,7 @@ OPTIONS_DEFINE_aarch64=	WSREP
 OPTIONS_DEFINE_powerpc64le=	WSREP
 OPTIONS_DEFINE_powerpc64=	WSREP
 OPTIONS_DEFINE_riscv64=	WSREP
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
+OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY
 OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
 OPTIONS_EXCLUDE_i386=	ROCKSDB
@@ -84,7 +84,6 @@ SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 WSREP_DESC=	Build wsrep clustering
 ZMQ_DESC=	ZeroMQ support
-ZSTD_DESC+=	Zstandard compression support (RocksDB only)
 .endif
 
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
@@ -167,7 +166,7 @@ ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-COLUMNSTORE_BROKEN=	ColumnStore build failure "'swap<logging::Message>' is missing exception specification"
+#COLUMNSTORE_BROKEN=	ColumnStore build failure "'swap<logging::Message>' is missing exception specification"
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
@@ -186,6 +185,7 @@ OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 #ROCKSDB_BROKEN=		RocksDB build failure "incompatible pointer to integer conversion assigning to 'size_t'"
 ROCKSDB_USES=		python
 ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
+ROCKSDB_LIB_DEPENDS=	libzstd.so:archivers/zstd
 SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
 SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
@@ -196,9 +196,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_CMAKE_ON=		-DWITH_ROCKSDB_zstd=ON
-ZSTD_CMAKE_OFF=		-DWITH_ROCKSDB_zstd=OFF
-ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .for PLUGIN in ${DISABLED_PLUGINS}
 CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index 009cea4dc057..3aa41a8e972a 100644
--- a/databases/mariadb105-server/distinfo
+++ b/databases/mariadb105-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739005023
-SHA256 (mariadb-10.5.28.tar.gz) = 0b5070208da0116640f20bd085f1136527f998cc23268715bcbf352e7b7f3cc1
-SIZE (mariadb-10.5.28.tar.gz) = 117755203
+TIMESTAMP = 1749606427
+SHA256 (mariadb-10.5.29.tar.gz) = de49ed417f6fa90e8fee72a41e526e0983dc47f388caff9e703803cec263b826
+SIZE (mariadb-10.5.29.tar.gz) = 117805539