From owner-svn-ports-all@freebsd.org Sat Dec 21 20:51:19 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D34B81DC520; Sat, 21 Dec 2019 20:51:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47gHpH5KtDz4cSJ; Sat, 21 Dec 2019 20:51:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B25111CE66; Sat, 21 Dec 2019 20:51:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBLKpJF7028760; Sat, 21 Dec 2019 20:51:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBLKpJ1F028759; Sat, 21 Dec 2019 20:51:19 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201912212051.xBLKpJ1F028759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 21 Dec 2019 20:51:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520581 - in head/databases/mariadb101-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases/mariadb101-server: . files X-SVN-Commit-Revision: 520581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2019 20:51:19 -0000 Author: brnrd Date: Sat Dec 21 20:51:19 2019 New Revision: 520581 URL: https://svnweb.freebsd.org/changeset/ports/520581 Log: database/mariadb101-server: Various fixes - Fix table compression [1] - Fix GNUism [2] PR: 239732 [1], 240692 [2] Submitted by: Mike Andrews [3] Reported by: Tao Zhou [1] Added: head/databases/mariadb101-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/mariadb101-server/Makefile Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Sat Dec 21 20:41:45 2019 (r520580) +++ head/databases/mariadb101-server/Makefile Sat Dec 21 20:51:19 2019 (r520581) @@ -2,7 +2,7 @@ PORTNAME?= mariadb PORTVERSION= 10.1.43 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -128,9 +128,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 +LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON +LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_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 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 @@ -138,7 +140,8 @@ MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy -SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY +SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON +SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md Copied: head/databases/mariadb101-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/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh Sat Dec 21 20:51:19 2019 (r520581, 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"