From 7f0c31cc65271d8bc7d49142634e8f9c0a5f8d32 Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Thu, 8 Feb 2018 12:42:42 +0000 Subject: databases/mysql56-server: Fix rc-script ${name}_limits conflict for post r328331 After r328331 changes in head/etc/rc.subr, having "NO" in mysql_limits goes into "limits" command params as is. So this patch substitutes the "NO" appropriately when needed. PR: 225657 Reported by: robbak@gmail.com Reviewed by: Rainer Hurling Sponsored by: Netzkommune GmbH --- databases/mysql56-server/Makefile | 1 + databases/mysql56-server/files/mysql-server.in | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'databases/mysql56-server') diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index adddd6660c5f..d89ea80afe6b 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.6.39 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in index 8c1a62cd41df..9996986e9451 100644 --- a/databases/mysql56-server/files/mysql-server.in +++ b/databases/mysql56-server/files/mysql-server.in @@ -47,6 +47,9 @@ fi if [ ! -z "${mysql_optfile}" ]; then mysql_extra="--defaults-extra-file=${mysql_optfile}" fi +if [ "${mysql_limits}" = "NO" ]; then +mysql_limits="" +fi mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" @@ -71,7 +74,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then + if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null else return 0 -- cgit v1.2.3