Date: Thu, 15 Feb 2018 16:52:21 +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: r461933 - in branches/2018Q1/databases: mariadb102-client mariadb102-server mariadb102-server/files Message-ID: <201802151652.w1FGqLwR037660@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Thu Feb 15 16:52:21 2018 New Revision: 461933 URL: https://svnweb.freebsd.org/changeset/ports/461933 Log: MFH: r461733 databases/mariadb102-server: Security update to 10.2.13 - Unbreak OQGraph engine [1] (collision in setbit with sys/param.h) PR: 224089 [1] Reported by: jbeich Security: e3445736-fd01-11e7-ac58-b499baebfeaf Approved by: ports-secteam (riggs) Added: branches/2018Q1/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 - copied unchanged from r461733, head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 Modified: branches/2018Q1/databases/mariadb102-client/Makefile branches/2018Q1/databases/mariadb102-server/Makefile branches/2018Q1/databases/mariadb102-server/distinfo branches/2018Q1/databases/mariadb102-server/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/databases/mariadb102-client/Makefile ============================================================================== --- branches/2018Q1/databases/mariadb102-client/Makefile Thu Feb 15 16:52:14 2018 (r461932) +++ branches/2018Q1/databases/mariadb102-client/Makefile Thu Feb 15 16:52:21 2018 (r461933) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 1 PKGNAMESUFFIX= 102-client COMMENT= Multithreaded SQL database (client) Modified: branches/2018Q1/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q1/databases/mariadb102-server/Makefile Thu Feb 15 16:52:14 2018 (r461932) +++ branches/2018Q1/databases/mariadb102-server/Makefile Thu Feb 15 16:52:21 2018 (r461933) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.11 -PORTREVISION?= 2 +PORTVERSION= 10.2.13 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -30,7 +30,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql -SHEBANG_FILES= scripts/*.sh +SHEBANG_FILES= scripts/*.sh storage/rocksdb/myrocks_hotbackup SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql @@ -155,6 +155,7 @@ 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_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy Modified: branches/2018Q1/databases/mariadb102-server/distinfo ============================================================================== --- branches/2018Q1/databases/mariadb102-server/distinfo Thu Feb 15 16:52:14 2018 (r461932) +++ branches/2018Q1/databases/mariadb102-server/distinfo Thu Feb 15 16:52:21 2018 (r461933) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512075561 -SHA256 (mariadb-10.2.11.tar.gz) = 63555a810db905175a8bd714f6ec77d1b1a11fcfa6d4b97b448cf5bcb6caa3e8 -SIZE (mariadb-10.2.11.tar.gz) = 72772830 +TIMESTAMP = 1518540665 +SHA256 (mariadb-10.2.13.tar.gz) = 272e7ed9300a05da9e02f8217a01ed3447c4f5a36a12e5233d62cc7c586fc753 +SIZE (mariadb-10.2.13.tar.gz) = 72591913 Copied: branches/2018Q1/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 (from r461733, head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 Thu Feb 15 16:52:21 2018 (r461933, copy of r461733, head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291) @@ -0,0 +1,40 @@ +--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.cc +@@ -27,7 +27,7 @@ + /* + Currently the only active code that can return error is: + judy_bitset::reset()/J1U() +- judy_bitset::setbit()/J1S() ++ judy_bitset::jsetbit()/J1S() + + In most cases errors are either about wrong parameters passed to Judy + functions or internal structures corruption. These definitely deserve +@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_ + return rc == 1; + } + +-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n) ++open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n) + { + int rc; + J1S(rc, array, n); +--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC ++++ storage/oqgraph/oqgraph_judy.h +@@ -63,7 +63,7 @@ namespace open_query + if (!val) + return reset(n); + else +- return setbit(n); ++ return jsetbit(n); + } + + judy_bitset& set(const judy_bitset& src); +@@ -115,7 +115,7 @@ namespace open_query + private: + mutable void* array; + +- judy_bitset& setbit(size_type n); ++ judy_bitset& jsetbit(size_type n); + }; + } + Modified: branches/2018Q1/databases/mariadb102-server/pkg-plist ============================================================================== --- branches/2018Q1/databases/mariadb102-server/pkg-plist Thu Feb 15 16:52:14 2018 (r461932) +++ branches/2018Q1/databases/mariadb102-server/pkg-plist Thu Feb 15 16:52:21 2018 (r461933) @@ -18,6 +18,7 @@ bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb +%%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission @@ -162,3 +163,5 @@ man/man8/mysqld.8.gz %%DATADIR%%/mysqld_multi.server %%DATADIR%%/wsrep.cnf %%DATADIR%%/wsrep_notify +%%MROONGA%%share/groonga-normalizer-mysql/README.md +%%MROONGA%%share/groonga/README.md
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802151652.w1FGqLwR037660>