From owner-svn-ports-all@freebsd.org Thu Feb 8 12:45:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0752BF0050E; Thu, 8 Feb 2018 12:45:26 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB53C8569B; Thu, 8 Feb 2018 12:45:25 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A213E16261; Thu, 8 Feb 2018 12:45:25 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18CjPuH095400; Thu, 8 Feb 2018 12:45:25 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18CjP53095398; Thu, 8 Feb 2018 12:45:25 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201802081245.w18CjP53095398@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Thu, 8 Feb 2018 12:45:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461218 - in head/databases/mysql57-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/databases/mysql57-server: . files X-SVN-Commit-Revision: 461218 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 12:45:26 -0000 Author: mmokhi Date: Thu Feb 8 12:45:25 2018 New Revision: 461218 URL: https://svnweb.freebsd.org/changeset/ports/461218 Log: databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base This is port of r461217 Modified: head/databases/mysql57-server/Makefile head/databases/mysql57-server/files/mysql-server.in Modified: head/databases/mysql57-server/Makefile ============================================================================== --- head/databases/mysql57-server/Makefile Thu Feb 8 12:42:42 2018 (r461217) +++ head/databases/mysql57-server/Makefile Thu Feb 8 12:45:25 2018 (r461218) @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.7.21 +PORTREVISION?= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Modified: head/databases/mysql57-server/files/mysql-server.in ============================================================================== --- head/databases/mysql57-server/files/mysql-server.in Thu Feb 8 12:42:42 2018 (r461217) +++ head/databases/mysql57-server/files/mysql-server.in Thu Feb 8 12:45:25 2018 (r461218) @@ -47,7 +47,11 @@ 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}" : ${hostname:=`/bin/hostname`} @@ -70,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