diff options
| author | brnrd <brnrd@FreeBSD.org> | 2019-12-22 04:51:19 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2019-12-22 04:51:19 +0800 |
| commit | 253c6c5209a7c7d04b7d974671f943bc1808a795 (patch) | |
| tree | d7148f9c26f7a0c7221fe11f939952e2927ef0a7 /databases | |
| parent | c324a0d7a61e9db379e746db9bcb786aeb5f9acb (diff) | |
| download | freebsd-ports-gnome-253c6c5209a7c7d04b7d974671f943bc1808a795.tar.gz freebsd-ports-gnome-253c6c5209a7c7d04b7d974671f943bc1808a795.tar.zst freebsd-ports-gnome-253c6c5209a7c7d04b7d974671f943bc1808a795.zip | |
database/mariadb101-server: Various fixes
- Fix table compression [1]
- Fix GNUism [2]
PR: 239732 [1], 240692 [2]
Submitted by: Mike Andrews <mandrews bit0 com> [3]
Reported by: Tao Zhou <zhoutao laocius org> [1]
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb101-server/Makefile | 11 | ||||
| -rw-r--r-- | databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 12131da5c971..7bab680c91d5 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -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/unixODBC 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 diff --git a/databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb101-server/files/patch-scripts_wsrep__sst__mariabackup.sh new file mode 100644 index 000000000000..2b81b4eca7b8 --- /dev/null +++ b/databases/mariadb101-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" |