Attachment 192411 Details for Bug 227223 – Patch adding support for the new ${name}_limits mechanics (databases/clickhouse, revision: 4)

[patch] Patch adding support for the new ${name}_limits mechanics (databases/clickhouse, revision: 4)

clickhouse--r4.diff (text/plain), 2.55 KB, created by Mateusz Piotrowski on 2018-04-11 00:16:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-11 00:16:15 UTC

Size: 2.55 KB

patch

obsolete

>diff --git databases/clickhouse/Makefile databases/clickhouse/Makefile
>index e98b462698d9..0c46d2d96cc1 100644
>--- databases/clickhouse/Makefile
>+++ databases/clickhouse/Makefile
>@@ -5,7 +5,7 @@ PORTNAME=	clickhouse
> PORTVERSION=	1.1.54362
> DISTVERSIONPREFIX=	v
> DISTVERSIONSUFFIX=	-stable
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	databases
> 
> MAINTAINER=	proler@gmail.com
>@@ -60,6 +60,14 @@ GROUPS=		clickhouse
> SOVERSION=	${PORTVERSION}
> PLIST_SUB=	SOVERSION=${SOVERSION}
> 
>+.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>
> 
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000
>diff --git databases/clickhouse/files/clickhouse.in databases/clickhouse/files/clickhouse.in
>index 06293a328434..79b5f0d8e0e1 100644
>--- databases/clickhouse/files/clickhouse.in
>+++ databases/clickhouse/files/clickhouse.in
>@@ -10,9 +10,9 @@
> #
> # clickhouse_enable (bool):  Set to "NO" by default
> #                          Set it to "YES" to enable clickhouse server
>-# clickhouse_limits (bool):  Set to "NO" by default.
>-#                        Set it to yes to run `limits -e -U clickhouse`
>-#                        just before clickhouse starts.
>+%%LEGACY_LIMITS%%# clickhouse_limits (bool):  Set to "NO" by default.
>+%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U clickhouse`
>+%%LEGACY_LIMITS%%#                        just before clickhouse starts.
> # clickhouse_config (str): Path to config file (required).
> #                          (default: %%PREFIX%%/etc/clickhouse-server/config.xml)
> # clickhouse_rundir (str):   Path to directory holding a pidfile.
>@@ -34,7 +34,7 @@ rcvar=clickhouse_enable
> load_rc_config ${name}
> 
> : ${clickhouse_enable="NO"}
>-: ${clickhouse_limits="NO"}
>+%%LEGACY_LIMITS%%: ${clickhouse_limits="NO"}
> : ${clickhouse_config="%%PREFIX%%/etc/clickhouse-server/config.xml"}
> : ${clickhouse_rundir="/var/run/clickhouse"}
> : ${clickhouse_user="clickhouse"}
>@@ -51,11 +51,12 @@ required_files=${clickhouse_config}
> start_precmd=clickhouse_prestart
> 
> clickhouse_prestart () {
>-	if checkyesno clickhouse_limits; then
>-		eval `/usr/bin/limits -e -U ${clickhouse_user}` 2>/dev/null
>-	else
>-		return 0
>-	fi
>+%%LEGACY_LIMITS%%	if checkyesno clickhouse_limits; then
>+%%LEGACY_LIMITS%%		eval `/usr/bin/limits -e -U ${clickhouse_user}` 2>/dev/null
>+%%LEGACY_LIMITS%%	else
>+%%LEGACY_LIMITS%%		return 0
>+%%LEGACY_LIMITS%%	fi
>+%%MODERN_LIMITS%%	return 0
> }
> 
> run_rc_command "$1"

Flags:

0mp: maintainer-approval?

Actions: View | Diff

Attachments on bug 227223: 192137 | 192224 | 192411