Attachment 192225 Details for Bug 227228 – Patch adding support for the new ${name}_limits mechanics (databases/mysql55-server, revision: 1)

[patch] Patch adding support for the new ${name}_limits mechanics (databases/mysql55-server, revision: 1)

mysql55-server--r1.diff (text/plain), 2.53 KB, created by Mateusz Piotrowski on 2018-04-04 18:09:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-04 18:09:47 UTC

Size: 2.53 KB

patch

obsolete

>diff --git databases/mysql55-server/Makefile databases/mysql55-server/Makefile
>index 3a1f012145ae..2f077f8ed003 100644
>--- databases/mysql55-server/Makefile
>+++ databases/mysql55-server/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	mysql
> PORTVERSION=	5.5.59
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	databases ipv6
> MASTER_SITES=	MYSQL/MySQL-5.5
> PKGNAMESUFFIX?=	55-server
>@@ -50,6 +50,13 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
> 
> .include <bsd.port.options.mk>
> 
>+.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101514 || \
>+	${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057
>+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
>+.else
>+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
>+.endif
>+
> .if ${PORT_OPTIONS:MSSL}
> CMAKE_ARGS+=	-DWITH_SSL=bundled
> .endif
>diff --git databases/mysql55-server/files/mysql-server.in databases/mysql55-server/files/mysql-server.in
>index b5015e5505f3..12dbb3ba85a6 100644
>--- databases/mysql55-server/files/mysql-server.in
>+++ databases/mysql55-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"
>@@ -59,11 +59,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()

Actions: View | Diff

Attachments on bug 227228: 192143 | 192225 | 192412