svn commit: r520571 - in head/databases/mariadb103-server: . files

[Bernard Spil]

Author: brnrd
Date: Sat Dec 21 16:21:39 2019
New Revision: 520571
URL: https://svnweb.freebsd.org/changeset/ports/520571

Log:
  databases/mariadb103-server: Update to 10.3.21
  
   - Fix table compression [1]
   - Fix link error in mariabackup [2]
   - Fix GNUism [3]
  
  PR:		239732 [1], 236101 [2], 240692 [3]
  Submitted by:	<iron udjin gmail com> [2], Mike Andrews <mandrews bit0 com> [3]
  Reported by:	Tao Zhou <zhoutao laocius org> [1]

Added:
  head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt   (contents, props changed)
  head/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh   (contents, props changed)
Modified:
  head/databases/mariadb103-server/Makefile
  head/databases/mariadb103-server/distinfo

Modified: head/databases/mariadb103-server/Makefile
==============================================================================
--- head/databases/mariadb103-server/Makefile	Sat Dec 21 16:04:59 2019	(r520570)
+++ head/databases/mariadb103-server/Makefile	Sat Dec 21 16:21:39 2019	(r520571)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.20
-PORTREVISION?=	1
+PORTVERSION=	10.3.21
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -135,16 +135,19 @@ CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
 CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
 GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
-LZ4_CMAKE_BOOL=		GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4
+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_BOOL=		WITH_INNODB_LZO
+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
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
-SNAPPY_CMAKE_BOOL=	WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
+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
 TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
@@ -152,7 +155,8 @@ TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 WSREP_CMAKE_BOOL=	WITH_WSREP
 WSREP_LIB_DEPENDS=	libgalera.so:databases/galera
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_CMAKE_BOOL=	WITH_ROCKSDB_ZSTD
+ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_zstd=ON
+ZSTD_CMAKE_OFF=		-DWITH_ROCKSDB_zstd=OFF
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.options.mk>

Modified: head/databases/mariadb103-server/distinfo
==============================================================================
--- head/databases/mariadb103-server/distinfo	Sat Dec 21 16:04:59 2019	(r520570)
+++ head/databases/mariadb103-server/distinfo	Sat Dec 21 16:21:39 2019	(r520571)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575013477
-SHA256 (mariadb-10.3.20.tar.gz) = 53818f2d684e060143b4d8293da44c7f09cc676d71959405f84e6dc8affbc492
-SIZE (mariadb-10.3.20.tar.gz) = 71990355
+TIMESTAMP = 1576430052
+SHA256 (mariadb-10.3.21.tar.gz) = f95bd4b670fb86082d1e3f0c4299ebcd40bda856b111e3f02ab647b0e9ba5e8f
+SIZE (mariadb-10.3.21.tar.gz) = 72005618

Added: head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt	Sat Dec 21 16:21:39 2019	(r520571)
@@ -0,0 +1,10 @@
+--- extra/mariabackup/CMakeLists.txt.orig	2019-12-05 22:22:27 UTC
++++ extra/mariabackup/CMakeLists.txt
+@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream
+ TARGET_LINK_LIBRARIES(mbstream
+   mysys
+   crc
++  sql
+ )
+ ADD_DEPENDENCIES(mbstream GenError)
+ 

Added: head/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh	Sat Dec 21 16:21:39 2019	(r520571)
@@ -0,0 +1,11 @@
+--- scripts/wsrep_sst_mariabackup.sh.orig	2019-12-11 19:29:57 UTC
++++ scripts/wsrep_sst_mariabackup.sh
+@@ -605,7 +605,7 @@ recv_joiner()
+     set +e
+ 
+     if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
+-        if timeout --help | grep -q -- '-k';then 
++        if timeout --help 2>&1 | grep -q -- '-k';then 
+             ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
+         else 
+             ltcmd="timeout -s9 $tmt $tcmd"