git: 79b2c0fdd330 - main - databases/mariadb1011-server: Update to 10.11.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sat, 19 Aug 2023 09:36:22 UTC
The branch main has been updated by brnrd:

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

commit 79b2c0fdd330702b81ab1c88c63e26fde36abcc3
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-08-19 09:36:15 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-08-19 09:36:15 +0000

    databases/mariadb1011-server: Update to 10.11.5
---
 databases/mariadb1011-server/Makefile  | 13 +++++--------
 databases/mariadb1011-server/distinfo  |  6 +++---
 databases/mariadb1011-server/pkg-plist |  1 +
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile
index 401b1241362b..86de3f378753 100644
--- a/databases/mariadb1011-server/Makefile
+++ b/databases/mariadb1011-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.11.4
+PORTVERSION=	10.11.5
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -24,6 +24,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS+=	libfmt.so:devel/libfmt \
+		liblz4.so:archivers/liblz4 \
 		libpcre2-8.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
 
@@ -64,7 +65,7 @@ OPTIONS_DEFINE_aarch64=	WSREP
 OPTIONS_DEFINE_powerpc64le=	WSREP
 OPTIONS_DEFINE_powerpc64=	WSREP
 OPTIONS_DEFINE_riscv64=	WSREP
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY
+OPTIONS_GROUP_COMPRESSION=	LZO SNAPPY
 OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
 OPTIONS_EXCLUDE_i386=	ROCKSDB
@@ -107,6 +108,7 @@ CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
 		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
 		-DWITH_PCRE=system \
 		-DWITH_SSL="${OPENSSLBASE}" \
+		-DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
@@ -167,7 +169,7 @@ ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 AWS_KEY_MGMT_CMAKE_ON=	-DPLUGIN_AWS_KEY_MANAGEMENT=ON
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-COLUMNSTORE_BROKEN=	ColumnStore engine build failure "fatal error: 'sys/sysinfo.h' file not found"
+COLUMNSTORE_BROKEN=	ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found"
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
@@ -175,13 +177,9 @@ CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
 GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
 HASHICORP_VAULT_CMAKE_OFF=	-DPLUGIN_HASHICORP_KEY_MANAGEMENT=OFF
 HASHICORP_VAULT_LIB_DEPENDS=	libcurl.so:ftp/curl
-LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  -DWITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
-LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
 LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
-MROONGA_IMPLIES=	LZ4
 MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack-c
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
@@ -198,7 +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_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .for PLUGIN in ${DISABLED_PLUGINS}
 CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo
index efd71131e03d..0522d4e309cb 100644
--- a/databases/mariadb1011-server/distinfo
+++ b/databases/mariadb1011-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686482276
-SHA256 (mariadb-10.11.4.tar.gz) = ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d
-SIZE (mariadb-10.11.4.tar.gz) = 96770117
+TIMESTAMP = 1692265656
+SHA256 (mariadb-10.11.5.tar.gz) = 4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb
+SIZE (mariadb-10.11.5.tar.gz) = 99709948
diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist
index f898d75f085b..cbe019bf499e 100644
--- a/databases/mariadb1011-server/pkg-plist
+++ b/databases/mariadb1011-server/pkg-plist
@@ -223,6 +223,7 @@ lib/mysql/plugin/sql_errlog.so
 lib/mysql/plugin/test_sql_service.so
 lib/mysql/plugin/test_versioning.so
 lib/mysql/plugin/type_mysql_json.so
+lib/mysql/plugin/type_mysql_timestamp.so
 lib/mysql/plugin/type_test.so
 %%WSREP%%lib/mysql/plugin/wsrep_info.so
 lib/mysql/plugin/zstd.so