Date: Mon, 26 Nov 2018 16:13:15 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485944 - in branches/2018Q4/databases: mariadb103-client mariadb103-server Message-ID: <201811261613.wAQGDF2P076317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Nov 26 16:13:15 2018 New Revision: 485944 URL: https://svnweb.freebsd.org/changeset/ports/485944 Log: MFH: r484613 r484810 r485783 databases/mariadb103-server: Remove XTRADB option - The XtraDB engine was removed from 10.3 - Fix plist conflict for TOKUDB option [1] PR: 232906 [1] Submitted by: Oleg Sidorkin <osidorkin gmail com> databases/mariadb103-server: Fix linking issue - Link issues when INNOBASE is set to DYNAMIC [1] - While here, remove MDEV-14072 fix [1]: https://jira.mariadb.org/browse/MDEV-17560 PR: 233135 Submitted by: Ralf van der Enden <tremere cainites net> Reported by: Dries Michiels <driesm michiels gmail com> databases/mariadb103-server: Security update to 10.3.11 - Add workaround for LZ4, SNAPPY build issues [1] PR: 233212 [1] Reported by: Peter Putzer <freebsd mnd sc> Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Modified: branches/2018Q4/databases/mariadb103-client/pkg-plist branches/2018Q4/databases/mariadb103-server/Makefile branches/2018Q4/databases/mariadb103-server/distinfo branches/2018Q4/databases/mariadb103-server/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb103-client/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb103-client/pkg-plist Mon Nov 26 14:08:20 2018 (r485943) +++ branches/2018Q4/databases/mariadb103-client/pkg-plist Mon Nov 26 16:13:15 2018 (r485944) @@ -54,6 +54,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +libdata/pkgconfig/libmariadb.pc @comment man/man1/aria_chk.1.gz @comment man/man1/aria_dump_log.1.gz @comment man/man1/aria_ftdump.1.gz @@ -110,7 +111,7 @@ man/man1/mysqltest_embedded.1.gz man/man1/replace.1.gz @comment man/man1/resolve_stack_dump.1.gz @comment man/man1/resolveip.1.gz -man/man1/tokuft_logprint.1.gz +@comment man/man1/tokuft_logprint.1.gz @comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz @comment man/man1/wsrep_sst_mariabackup.1.gz Modified: branches/2018Q4/databases/mariadb103-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb103-server/Makefile Mon Nov 26 14:08:20 2018 (r485943) +++ branches/2018Q4/databases/mariadb103-server/Makefile Mon Nov 26 16:13:15 2018 (r485944) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.10 -PORTREVISION?= 1 +PORTVERSION= 10.3.11 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -44,7 +44,7 @@ OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD -OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB +OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= TOKUDB @@ -61,7 +61,6 @@ SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine WSREP_DESC= Build wsrep clustering -XTRADB_DESC= Build XtraDB engine next to InnoDB ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif @@ -136,10 +135,11 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor -INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 +INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 +CONNECT_EXTRA_USES= gnome GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON @@ -200,8 +200,8 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif -# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 -post-configure-INNOBASE-on: +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ Modified: branches/2018Q4/databases/mariadb103-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb103-server/distinfo Mon Nov 26 14:08:20 2018 (r485943) +++ branches/2018Q4/databases/mariadb103-server/distinfo Mon Nov 26 16:13:15 2018 (r485944) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538732181 -SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda -SIZE (mariadb-10.3.10.tar.gz) = 70493771 +TIMESTAMP = 1542715300 +SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 +SIZE (mariadb-10.3.11.tar.gz) = 70669435 Modified: branches/2018Q4/databases/mariadb103-server/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb103-server/pkg-plist Mon Nov 26 14:08:20 2018 (r485943) +++ branches/2018Q4/databases/mariadb103-server/pkg-plist Mon Nov 26 16:13:15 2018 (r485944) @@ -3,9 +3,9 @@ bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log -bin/innochecksum -bin/mariabackup -bin/mbstream +%%INNOBASE%%bin/innochecksum +%%INNOBASE%%bin/mariabackup +%%INNOBASE%%bin/mbstream @comment bin/msql2mysql bin/my_print_defaults bin/myisam_ftdump
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811261613.wAQGDF2P076317>