git: 793e83714ce0 - 2022Q3 - databases/mariadb106-server: Update to 10.6.9

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sat, 17 Sep 2022 12:01:22 UTC
The branch 2022Q3 has been updated by brnrd:

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

commit 793e83714ce065dadde570bba0599c60363fb3e0
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-09-04 19:52:56 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-09-17 11:59:57 +0000

    databases/mariadb106-server: Update to 10.6.9
    
    Security:       36d10af7-248d-11ed-856e-d4c9ef517024
    MFH:            2022Q3
    (cherry picked from commit 0f0fa32742f633c3c648c0c43280078f8bf5cb9d)
---
 databases/mariadb106-server/Makefile  | 12 +++++-------
 databases/mariadb106-server/distinfo  |  6 +++---
 databases/mariadb106-server/pkg-plist |  1 +
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 687df7a0af18..1eebf633a40f 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.8
+PORTVERSION=	10.6.9
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -24,7 +24,8 @@ COMMENT?=	Multithreaded SQL database (server)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
+LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2 \
+		libzstd.so:archivers/zstd
 
 # Ugly workaround for MariaDB/CMake library detection
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -63,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
@@ -83,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} \
@@ -181,7 +181,7 @@ MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
-ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
+ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON
 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
@@ -192,8 +192,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}
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index 3d6ae5474293..233b1a81d74b 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653247917
-SHA256 (mariadb-10.6.8.tar.gz) = 57a9488559ccbdfb8506b781089a7a08d8e0e1b647cffb8f2706af06f69ed438
-SIZE (mariadb-10.6.8.tar.gz) = 88794744
+TIMESTAMP = 1660728379
+SHA256 (mariadb-10.6.9.tar.gz) = 37959f8b5fbc64d94e180dcd8ae5bdfafd406203a07f48f7becd6b8a7633744c
+SIZE (mariadb-10.6.9.tar.gz) = 96494484
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 91d79f960925..66a511a00e35 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -208,6 +208,7 @@ lib/mysql/plugin/test_versioning.so
 lib/mysql/plugin/type_mysql_json.so
 lib/mysql/plugin/type_test.so
 %%WSREP%%lib/mysql/plugin/wsrep_info.so
+lib/mysql/plugin/zstd.so
 libexec/mariadbd
 libexec/mysqld
 libexec/rcmysql