Date: Wed, 13 Jun 2018 06:23:07 +0000 (UTC) From: Vasil Dimov <vd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472289 - in head/databases/mysqlwsrep56-server: . files Message-ID: <201806130623.w5D6N7W0017511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vd Date: Wed Jun 13 06:23:07 2018 New Revision: 472289 URL: https://svnweb.freebsd.org/changeset/ports/472289 Log: databases/mysqlwsrep56-server: Fix ${name}_limits clash PR: 227232 Submitted by: 0mp Modified: head/databases/mysqlwsrep56-server/Makefile head/databases/mysqlwsrep56-server/files/mysql-server.in Modified: head/databases/mysqlwsrep56-server/Makefile ============================================================================== --- head/databases/mysqlwsrep56-server/Makefile Wed Jun 13 05:58:35 2018 (r472288) +++ head/databases/mysqlwsrep56-server/Makefile Wed Jun 13 06:23:07 2018 (r472289) @@ -5,6 +5,7 @@ PORTNAME= mysqlwsrep PORTVERSION?= 5.6.39 DISTVERSIONPREFIX?= wsrep_ DISTVERSIONSUFFIX?= -25.22 +PORTREVISION?= 1 CATEGORIES= databases ipv6 PKGNAMESUFFIX= 56-server @@ -134,6 +135,14 @@ MMAN1= my_print_defaults.1 \ replace.1 \ resolve_stack_dump.1 \ resolveip.1 + +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif .include <bsd.port.pre.mk> Modified: head/databases/mysqlwsrep56-server/files/mysql-server.in ============================================================================== --- head/databases/mysqlwsrep56-server/files/mysql-server.in Wed Jun 13 05:58:35 2018 (r472288) +++ head/databases/mysqlwsrep56-server/files/mysql-server.in Wed Jun 13 06:23:07 2018 (r472289) @@ -11,9 +11,9 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -# mysql_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mysql` -# just before mysql starts. +%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` +%%LEGACY_LIMITS%%# just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_optfile (str): Server-specific option file. @@ -32,12 +32,12 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -: ${mysql_limits="NO"} +%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" -mysql_limits_args="-e -U ${mysql_user}" +%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -73,11 +73,12 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then - eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mysql_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } mysql_poststart()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806130623.w5D6N7W0017511>