svn commit: r461217 - in head/databases/mysql56-server: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Thu Feb  8 12:42:42 2018
New Revision: 461217
URL: https://svnweb.freebsd.org/changeset/ports/461217

Log:
  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 at gmail.com
  Reviewed by:	Rainer Hurling <rhurlin at gwdg.de>
  Sponsored by:	Netzkommune GmbH

Modified:
  head/databases/mysql56-server/Makefile
  head/databases/mysql56-server/files/mysql-server.in

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Thu Feb  8 12:38:35 2018	(r461216)
+++ head/databases/mysql56-server/Makefile	Thu Feb  8 12:42:42 2018	(r461217)
@@ -3,6 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.39
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server

Modified: head/databases/mysql56-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql56-server/files/mysql-server.in	Thu Feb  8 12:38:35 2018	(r461216)
+++ head/databases/mysql56-server/files/mysql-server.in	Thu Feb  8 12:42:42 2018	(r461217)
@@ -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