Attachment 192146 Details for Bug 227230 – Patch adding support for the new ${name}_limits mechanics (databases/mysql57-server)

[patch] Patch adding support for the new ${name}_limits mechanics (databases/mysql57-server)

mysql57-server.diff (text/plain), 2.79 KB, created by Mateusz Piotrowski on 2018-04-03 01:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-03 01:00:10 UTC

Size: 2.79 KB

patch

obsolete

>diff --git databases/mysql57-server/Makefile databases/mysql57-server/Makefile
>index a9399568005a..f19c55edaad9 100644
>--- databases/mysql57-server/Makefile
>+++ databases/mysql57-server/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.7.21
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
>@@ -142,6 +142,15 @@ FEDERATED_SUB_LIST_OFF+=	FEDER=""
> CMAKE_ARGS+=	-DWITH_AUTHENTICATION_LDAP=0
> .endif
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101515 || \
>+	${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057
>+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
>+.else
>+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> .if ${SSL_DEFAULT} == base
>diff --git databases/mysql57-server/files/mysql-server.in databases/mysql57-server/files/mysql-server.in
>index d33cd12c2a5c..8370afa2c198 100644
>--- databases/mysql57-server/files/mysql-server.in
>+++ databases/mysql57-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 "%%MY_DBDIR%%"
> #			Base database directory.
> # mysql_confdir (str):	Default to "%%ETCDIR%%"
>@@ -36,7 +36,7 @@ rcvar=mysql_enable
> load_rc_config $name
> 
> : ${mysql_enable="NO"}
>-: ${mysql_limits="NO"}
>+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
> : ${mysql_dbdir="%%MY_DBDIR%%"}
> : ${mysql_confdir="%%ETCDIR%%"}
> if [ -f "${mysql_confdir}/my.cnf" ]; then
>@@ -47,13 +47,10 @@ 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}"
>+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
> : ${hostname:=`/bin/hostname`}
> pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
> command="/usr/sbin/daemon"
>@@ -74,11 +71,12 @@ mysql_prestart()
> 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
> 		mysql_create_auth_tables || return 1
> 	fi
>-	if [ -z "$mysql_limits" ] || 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()

Actions: View | Diff

Attachments on bug 227230: 192146 | 192227