Date: Sat, 14 Dec 2019 14:34:10 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520119 - in head/databases/mariadb104-server: . files Message-ID: <201912141434.xBEEYA9E045993@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Dec 14 14:34:10 2019 New Revision: 520119 URL: https://svnweb.freebsd.org/changeset/ports/520119 Log: databases/mariadb104-server: Update to 10.4.11 * Fix compression [1] * Fix mariabackup-based replication [2] PR: 239732 [1], 240692 [2] Submitted by: Tao Zhou <zhoutao laocius org> [1], Mike Andrews <mandrews bit0 com> [2] Added: head/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh (contents, props changed) Modified: head/databases/mariadb104-server/Makefile head/databases/mariadb104-server/distinfo Modified: head/databases/mariadb104-server/Makefile ============================================================================== --- head/databases/mariadb104-server/Makefile Sat Dec 14 14:04:00 2019 (r520118) +++ head/databases/mariadb104-server/Makefile Sat Dec 14 14:34:10 2019 (r520119) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.10 -PORTREVISION?= 1 +PORTVERSION= 10.4.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -139,16 +139,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 @@ -156,7 +159,8 @@ TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 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/mariadb104-server/distinfo ============================================================================== --- head/databases/mariadb104-server/distinfo Sat Dec 14 14:04:00 2019 (r520118) +++ head/databases/mariadb104-server/distinfo Sat Dec 14 14:34:10 2019 (r520119) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574142229 -SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421 -SIZE (mariadb-10.4.10.tar.gz) = 78352896 +TIMESTAMP = 1576075415 +SHA256 (mariadb-10.4.11.tar.gz) = 4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9 +SIZE (mariadb-10.4.11.tar.gz) = 78389909 Added: 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/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh Sat Dec 14 14:34:10 2019 (r520119) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912141434.xBEEYA9E045993>