diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2019-12-21 16:21:39 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2019-12-21 16:21:39 +0000 |
| commit | 1ef2fc08e040d77bf334ab456a6d526d37f2c6b1 (patch) | |
| tree | e3d5f57aab15fa950369a86feb6619a5df9c32a5 /databases/mariadb103-server | |
| parent | b548520de8f3b73490560ce44d53b8914b7586f8 (diff) | |
| download | ports-1ef2fc08e040d77bf334ab456a6d526d37f2c6b1.tar.gz ports-1ef2fc08e040d77bf334ab456a6d526d37f2c6b1.zip | |
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]
Notes
Notes:
svn path=/head/; revision=520571
Diffstat (limited to 'databases/mariadb103-server')
4 files changed, 34 insertions, 9 deletions
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 256984b74122..4a1b9eb8837c 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -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> diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 3661fa370840..ae7603350097 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -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 diff --git a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt new file mode 100644 index 000000000000..4a4abfc53dc0 --- /dev/null +++ b/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) + diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh new file mode 100644 index 000000000000..2b81b4eca7b8 --- /dev/null +++ b/databases/mariadb103-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" |