mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-20 04:02:27 +00:00
databases/mariadb102-server: Update to 10.2.12
- Fix some client utility builds [1] PR: 222825 [1] Submitted by: Piotr Kubaj [1]
This commit is contained in:
parent
a3e0cb9674
commit
6c1466ed58
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=459005
@ -29,7 +29,9 @@ post-configure:
|
||||
post-install:
|
||||
${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
|
||||
${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
|
||||
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
|
||||
. for f in server my_global.h my_sys.h mysql_com.h mysql_version.h
|
||||
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/${f}
|
||||
. endfor
|
||||
${RM} -r ${STAGEDIR}${DATADIR}/policy
|
||||
${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
|
||||
# Fix https://mariadb.atlassian.net/browse/MDEV-9388
|
||||
|
@ -22,14 +22,10 @@ include/mysql/mariadb_dyncol.h
|
||||
include/mysql/mariadb_stmt.h
|
||||
include/mysql/mariadb_version.h
|
||||
include/mysql/my_config.h
|
||||
include/mysql/my_global.h
|
||||
include/mysql/my_sys.h
|
||||
include/mysql/mysql.h
|
||||
include/mysql/mysql/client_plugin.h
|
||||
include/mysql/mysql/plugin_auth.h
|
||||
include/mysql/mysql/plugin_auth_common.h
|
||||
include/mysql/mysql_com.h
|
||||
include/mysql/mysql_version.h
|
||||
include/mysql/mysqld_error.h
|
||||
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
|
||||
lib/mysql/libmariadb.so
|
||||
|
@ -1,8 +1,8 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME?= mariadb
|
||||
PORTVERSION= 10.2.11
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 10.2.12
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
|
||||
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
|
||||
@ -180,6 +180,12 @@ post-install:
|
||||
${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
|
||||
${STAGEDIR}/${PREFIX}/share/pkgconfig
|
||||
${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
|
||||
${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \
|
||||
${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \
|
||||
${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
|
||||
${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \
|
||||
${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \
|
||||
${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING
|
||||
.endif # defined(CLIENT_ONLY)
|
||||
|
||||
.if defined(WITH_OPENSSL_PORT)
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1512075561
|
||||
SHA256 (mariadb-10.2.11.tar.gz) = 63555a810db905175a8bd714f6ec77d1b1a11fcfa6d4b97b448cf5bcb6caa3e8
|
||||
SIZE (mariadb-10.2.11.tar.gz) = 72772830
|
||||
TIMESTAMP = 1515105515
|
||||
SHA256 (mariadb-10.2.12.tar.gz) = 2ab22d7fbacfabc30fe18f71a8afb173250074502d889457e3cde2e203d341ec
|
||||
SIZE (mariadb-10.2.12.tar.gz) = 72818636
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 36f84744031430747d27bfb2087c7ae51019a70a Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Golubchik <serg@mariadb.org>
|
||||
Date: Fri, 10 Nov 2017 12:48:52 +0100
|
||||
Subject: [PATCH] MDEV-14337 mysqld_safe may suppress error messages with
|
||||
--log-output=file
|
||||
|
||||
don't close stdout/stderr, redirect them to /dev/null instead.
|
||||
otherwise redirections like >&2 fail with "invalid file descriptor"
|
||||
---
|
||||
scripts/mysqld_safe.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
|
||||
index b644184b1e1d..46b376890939 100644
|
||||
--- scripts/mysqld_safe.sh.orig
|
||||
+++ scripts/mysqld_safe.sh
|
||||
@@ -868,8 +868,8 @@ if expr "${-}" : '.*x' > /dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
- exec 1>&-
|
||||
- exec 2>&-
|
||||
+ exec 1>/dev/null
|
||||
+ exec 2>/dev/null
|
||||
fi
|
||||
|
||||
while true
|
@ -45,10 +45,10 @@ bin/wsrep_sst_rsync
|
||||
bin/wsrep_sst_xtrabackup
|
||||
bin/wsrep_sst_xtrabackup-v2
|
||||
@comment include/mysql/my_config.h
|
||||
@comment include/mysql/my_global.h
|
||||
@comment include/mysql/my_sys.h
|
||||
@comment include/mysql/mysql_com.h
|
||||
@comment include/mysql/mysql_version.h
|
||||
include/mysql/my_global.h
|
||||
include/mysql/my_sys.h
|
||||
include/mysql/mysql_com.h
|
||||
include/mysql/mysql_version.h
|
||||
@comment include/mysql/mysqld_error.h
|
||||
include/mysql/server/private/embedded_priv.h
|
||||
@comment lib/mysql/libmariadb.so
|
||||
@ -147,6 +147,7 @@ man/man8/mysqld.8.gz
|
||||
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/install.sql
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
|
||||
%%DATADIR%%/my-huge.cnf
|
||||
%%DATADIR%%/my-innodb-heavy-4G.cnf
|
||||
%%DATADIR%%/my-large.cnf
|
||||
@ -162,3 +163,9 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user