aboutsummaryrefslogtreecommitdiff
path: root/databases/mariadb101-server
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2017-11-18 20:58:01 +0000
committerBernard Spil <brnrd@FreeBSD.org>2017-11-18 20:58:01 +0000
commit680a278a3754757ff6fc1a2c7eb13ea8c262b80e (patch)
tree5fa16b89d97c3edf74293030b258d5e08c8722dc /databases/mariadb101-server
parentdd6764ed1287ed29208970eb4e2a760a824e625f (diff)
databases/mariadb101-server: Security update to 10.1.29
PR: 223737 Reported by: Miroslav Lachman <000 fbsd quip.cz> Security: c41bedfd-b3f9-11e7-ac58-b499baebfeaf
Notes
Notes: svn path=/head/; revision=454460
Diffstat (limited to 'databases/mariadb101-server')
-rw-r--r--databases/mariadb101-server/Makefile13
-rw-r--r--databases/mariadb101-server/distinfo6
-rw-r--r--databases/mariadb101-server/pkg-plist3
3 files changed, 17 insertions, 5 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 651b3037e84d..8907be6ec51f 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.28
+PORTVERSION= 10.1.29
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
@@ -141,6 +141,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=${LOCALBASE}/lib
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
+MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi
MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
@@ -164,11 +165,19 @@ post-install:
${STAGEDIR}${PREFIX}/bin/mysql_config \
${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
${STAGEDIR}${PREFIX}/bin/mysqlaccess \
- ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so
+ ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \
+ ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
+ ${STAGEDIR}${PREFIX}/share/groonga/COPYING \
+ ${STAGEDIR}${DATADIR}/mroonga/COPYING
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
${STAGEDIR}${PREFIX}/share/pkgconfig \
${STAGEDIR}${PREFIX}/mysql/mysql-test \
${STAGEDIR}${PREFIX}/mysql/sql-bench
+
+post-install-MROONGA-on:
+ ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \
+ ${STAGEDIR}${PREFIX}/share/groonga \
+ ${STAGEDIR}${PREFIX}/share/mysql
.endif # defined(CLIENT_ONLY)
.include <bsd.port.pre.mk>
diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo
index 9b942bbf3d29..d83a90b2381c 100644
--- a/databases/mariadb101-server/distinfo
+++ b/databases/mariadb101-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506862730
-SHA256 (mariadb-10.1.28.tar.gz) = 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd
-SIZE (mariadb-10.1.28.tar.gz) = 67559689
+TIMESTAMP = 1511030208
+SHA256 (mariadb-10.1.29.tar.gz) = 73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4
+SIZE (mariadb-10.1.29.tar.gz) = 67885370
diff --git a/databases/mariadb101-server/pkg-plist b/databases/mariadb101-server/pkg-plist
index 980b6aaabf92..5ac49dc36ef5 100644
--- a/databases/mariadb101-server/pkg-plist
+++ b/databases/mariadb101-server/pkg-plist
@@ -235,6 +235,9 @@ man/man8/mysqld.8.gz
%%DATADIR%%/magic
%%DATADIR%%/maria_add_gis_sp.sql
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%MROONGA%%%%DATADIR%%/groonga-normalizer-mysql/README.md
+%%MROONGA%%%%DATADIR%%/groonga/README.md
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
%%MROONGA%%%%DATADIR%%/mroonga/install.sql
%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
%%DATADIR%%/my-huge.cnf