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

5 files changed, 48 insertions, 12 deletions

diff --git a/databases/mariadb102-client/Makefile b/databases/mariadb102-client/Makefile
index 528a95e9cc6d..09c9a067e9cf 100644
--- a/databases/mariadb102-client/Makefile
+++ b/databases/mariadb102-client/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PORTREVISION=	1
 PKGNAMESUFFIX=	102-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 68b4fc41f91a..dc9e4b552c73 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -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
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index 8ac83413358e..13eec819efbc 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -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
diff --git a/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb102-server/files/patch-oqgraph-MDEV-15291
new file mode 100644
index 000000000000..05083cd206ac
--- /dev/null
+++ b/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);
+   };
+ }
+ 
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index 7a04eb944758..9ab3c426525c 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -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