svn commit: r520572 - in head/databases/mariadb102-server: . files

[Bernard Spil]

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

Log:
  databases/mariadb102-server: Update to 10.2.30
  
     - 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/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt
     - copied unchanged from r520571, head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt
  head/databases/mariadb102-server/files/patch-scripts_wsrep__sst__mariabackup.sh
     - copied unchanged from r520119, head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
Modified:
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/distinfo

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Sat Dec 21 16:21:39 2019	(r520571)
+++ head/databases/mariadb102-server/Makefile	Sat Dec 21 17:45:16 2019	(r520572)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.29
-PORTREVISION?=	1
+PORTVERSION=	10.2.30
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -138,9 +138,11 @@ CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixOD
 CONNECT_EXTRA_USES=		gnome
 CONNECT_EXTRA_USE=		gnome=libxml2
 GSSAPI_NONE_CMAKE_ON+=	-DPLUGIN_AUTH_GSSAPI=NO
-LZ4_CMAKE_BOOL=		GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4
+LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  WITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
+LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF WITH_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
@@ -153,7 +155,8 @@ TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_CMAKE_BOOL=	WITH_ROCKSDB_ZSTD
+ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=ON
+ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=OFF
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 .endif # ${PKGNAMESUFFIX:M*-client}
 

Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo	Sat Dec 21 16:21:39 2019	(r520571)
+++ head/databases/mariadb102-server/distinfo	Sat Dec 21 17:45:16 2019	(r520572)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575211421
-SHA256 (mariadb-10.2.29.tar.gz) = 1470032821a163136d2013e58fc788e5c234777093cbd2ce9c27280a33c10202
-SIZE (mariadb-10.2.29.tar.gz) = 73087972
+TIMESTAMP = 1576941772
+SHA256 (mariadb-10.2.30.tar.gz) = 9bcc7556dfc5d77d78551e2f9a719f45545609f14f8acdf129b99f577e041b38
+SIZE (mariadb-10.2.30.tar.gz) = 73096027

Copied: head/databases/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt (from r520571, head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb102-server/files/patch-extra_mariabackup_CMakeLists.txt	Sat Dec 21 17:45:16 2019	(r520572, copy of r520571, head/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt)
@@ -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)
+ 

Copied: head/databases/mariadb102-server/files/patch-scripts_wsrep__sst__mariabackup.sh (from r520119, head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb102-server/files/patch-scripts_wsrep__sst__mariabackup.sh	Sat Dec 21 17:45:16 2019	(r520572, copy of r520119, head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh)
@@ -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"