diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2018-06-13 06:23:07 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2018-06-13 06:23:07 +0000 |
| commit | fa9c35dba1cbb4af5b6a360cc1744c7b05c7311b (patch) | |
| tree | 08b5c5ba76f1fcf2a160fdac0658c6b4bbc0c4f2 /databases/mysqlwsrep56-server | |
| parent | sysutils/py-ranger: update 1.8.1 -> 1.9.1 (diff) | |
databases/mysqlwsrep56-server: Fix ${name}_limits clash
PR: 227232
Submitted by: 0mp
Notes
Notes:
svn path=/head/; revision=472289
Diffstat (limited to 'databases/mysqlwsrep56-server')
| -rw-r--r-- | databases/mysqlwsrep56-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mysqlwsrep56-server/files/mysql-server.in | 21 |
2 files changed, 20 insertions, 10 deletions
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 805795f0133e..5d08dcf07bca 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -5,6 +5,7 @@ PORTNAME= mysqlwsrep PORTVERSION?= 5.6.39 DISTVERSIONPREFIX?= wsrep_ DISTVERSIONSUFFIX?= -25.22 +PORTREVISION?= 1 CATEGORIES= databases ipv6 PKGNAMESUFFIX= 56-server @@ -135,6 +136,14 @@ MMAN1= my_print_defaults.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> post-patch: diff --git a/databases/mysqlwsrep56-server/files/mysql-server.in b/databases/mysqlwsrep56-server/files/mysql-server.in index 64304dd85eee..5f5ea3d17215 100644 --- a/databases/mysqlwsrep56-server/files/mysql-server.in +++ b/databases/mysqlwsrep56-server/files/mysql-server.in @@ -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() |