svn commit: r461733 - in head/databases: mariadb102-client mariadb102-server mariadb102-server/files
Bernard Spil
brnrd at FreeBSD.org
Tue Feb 13 17:47:51 UTC 2018
Author: brnrd
Date: Tue Feb 13 17:47:50 2018
New Revision: 461733
URL: https://svnweb.freebsd.org/changeset/ports/461733
Log:
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
MFH: 2018Q1
Security: e3445736-fd01-11e7-ac58-b499baebfeaf
Added:
head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291
- copied unchanged from r461711, head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
Modified:
head/databases/mariadb102-client/Makefile
head/databases/mariadb102-server/Makefile
head/databases/mariadb102-server/distinfo
head/databases/mariadb102-server/pkg-plist
Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb102-client/Makefile Tue Feb 13 17:08:53 2018 (r461732)
+++ head/databases/mariadb102-client/Makefile Tue Feb 13 17:47:50 2018 (r461733)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= mariadb
-PORTREVISION= 1
PKGNAMESUFFIX= 102-client
COMMENT= Multithreaded SQL database (client)
Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile Tue Feb 13 17:08:53 2018 (r461732)
+++ head/databases/mariadb102-server/Makefile Tue Feb 13 17:47:50 2018 (r461733)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.2.12
-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
@@ -153,9 +153,9 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
MROONGA_IMPLIES= LZ4
MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
-OQGRAPH_BROKEN= OQGRAPH fails to build with boost 1.66, see bug 224089
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: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo Tue Feb 13 17:08:53 2018 (r461732)
+++ head/databases/mariadb102-server/distinfo Tue Feb 13 17:47:50 2018 (r461733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515105515
-SHA256 (mariadb-10.2.12.tar.gz) = 2ab22d7fbacfabc30fe18f71a8afb173250074502d889457e3cde2e203d341ec
-SIZE (mariadb-10.2.12.tar.gz) = 72818636
+TIMESTAMP = 1518540665
+SHA256 (mariadb-10.2.13.tar.gz) = 272e7ed9300a05da9e02f8217a01ed3447c4f5a36a12e5233d62cc7c586fc753
+SIZE (mariadb-10.2.13.tar.gz) = 72591913
Copied: head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 (from r461711, head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 Tue Feb 13 17:47:50 2018 (r461733, copy of r461711, head/databases/mariadb101-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: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist Tue Feb 13 17:08:53 2018 (r461732)
+++ head/databases/mariadb102-server/pkg-plist Tue Feb 13 17:47:50 2018 (r461733)
@@ -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
@@ -157,9 +158,5 @@ man/man8/mysqld.8.gz
%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/wsrep.cnf
%%DATADIR%%/wsrep_notify
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/EXCEPTIONS-CLIENT
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-wsrep
%%MROONGA%%share/groonga-normalizer-mysql/README.md
%%MROONGA%%share/groonga/README.md
More information about the svn-ports-head
mailing list