Attachment 192406 Details for Bug 227216 – Patch adding support for the new ${name}_limits mechanics (databases/mongodb34-rocks, revision: 4)

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

mongodb34-rocks--r4.diff (text/plain), 4.45 KB, created by Mateusz Piotrowski on 2018-04-11 00:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-11 00:10:27 UTC

Size: 4.45 KB

patch

obsolete

>diff --git databases/mongodb34-rocks/Makefile databases/mongodb34-rocks/Makefile
>index 69e9a875ca6f..a630a533c3ae 100644
>--- databases/mongodb34-rocks/Makefile
>+++ databases/mongodb34-rocks/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	mongodb
> PORTVERSION=	3.4.6
> DISTVERSIONPREFIX=	r
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	databases net
> MASTER_SITES=	https://fastdl.mongodb.org/src/ \
> 		http://fastdl.mongodb.org/src/ \
>@@ -73,6 +73,14 @@ SASL_MAKE_ARGS=		--use-sasl-client
> SSL_MAKE_ARGS=	--ssl
> SSL_USES=	ssl
> 
>+.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
>+
> ALL_TARGET=	core
> TEST_TARGET=	unittests
> 
>diff --git databases/mongodb34-rocks/files/mongod.in databases/mongodb34-rocks/files/mongod.in
>index a7d1d3833bbb..f7bae7f67125 100644
>--- databases/mongodb34-rocks/files/mongod.in
>+++ databases/mongodb34-rocks/files/mongod.in
>@@ -9,9 +9,9 @@
> #
> # mongod_enable (bool):  Set to "NO" by default.
> #                        Set it to "YES" to enable mongod.
>-# mongod_limits (bool):  Set to "NO" by default.
>-#                        Set it to yes to run `limits -e -U mongodb`
>-#                        just before mongod starts.
>+%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
>+%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
>+%%LEGACY_LIMITS%%#                        just before mongod starts.
> # mongod_dbpath (str):   Default to "/var/db/mongodb"
> #                        Base database directory.
> # mongod_flags (str):    Custom additional arguments to be passed to mongod.
>@@ -28,7 +28,7 @@ rcvar=mongod_enable
> load_rc_config $name
> 
> : ${mongod_enable="NO"}
>-: ${mongod_limits="NO"}
>+%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
> : ${mongod_dbpath="/var/db/mongodb"}
> : ${mongod_logpath="/var/log/mongodb"}
> : ${mongod_runpath="/var/run/mongodb"}
>@@ -54,11 +54,12 @@ mongod_prestart()
>         if [ ! -d ${mongod_dbpath} -o ! -d ${mongod_logpath} ]; then
>                 mongod_create_dbpath || return 1
>         fi
>-        if checkyesno mongod_limits; then
>-                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
>-        else
>-                return 0
>-        fi
>+%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
>+%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
>+%%LEGACY_LIMITS%%        else
>+%%LEGACY_LIMITS%%                return 0
>+%%LEGACY_LIMITS%%        fi
>+%%MODERN_LIMITS%%        return 0
> }
> 
> run_rc_command "$1"
>diff --git databases/mongodb34-rocks/files/mongos.in databases/mongodb34-rocks/files/mongos.in
>index b1d2da68eb0e..573c8ad7c0d6 100644
>--- databases/mongodb34-rocks/files/mongos.in
>+++ databases/mongodb34-rocks/files/mongos.in
>@@ -9,9 +9,9 @@
> #
> # mongos_enable (bool):  Set to "NO" by default.
> #                        Set it to "YES" to enable mongos.
>-# mongos_limits (bool):  Set to "NO" by default.
>-#                        Set it to yes to run `limits -e -U mongodb`
>-#                        just before mongos starts.
>+%%LEGACY_LIMITS%%# mongos_limits (bool):  Set to "NO" by default.
>+%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
>+%%LEGACY_LIMITS%%#                        just before mongos starts.
> # mongos_flags (str):    Custom additional arguments to be passed to mongos.
> #                        Default to "--logpath /var/log/mongodb/mongos.log --logappend".
> # mongos_config (str):	 Default to "%%PREFIX%%/etc/mongos.conf"
>@@ -26,7 +26,7 @@ rcvar=mongos_enable
> load_rc_config $name
> 
> : ${mongos_enable="NO"}
>-: ${mongos_limits="NO"}
>+%%LEGACY_LIMITS%%: ${mongos_limits="NO"}
> : ${mongos_logpath="/var/log/mongodb"}
> : ${mongos_runpath="/var/run/mongodb"}
> : ${mongos_flags="--logpath ${mongos_logpath}/mongos.log --logappend"}
>@@ -50,11 +50,12 @@ mongos_prestart()
>         if [ ! -d ${mongos_logpath} ]; then
>                 mongos_create_dbpath || return 1
>         fi
>-        if checkyesno mongos_limits; then
>-                eval `/usr/bin/limits -e -U ${mongos_user}` 2>/dev/null
>-        else
>-                return 0
>-        fi
>+%%LEGACY_LIMITS%%        if checkyesno mongos_limits; then
>+%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongos_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 227216: 192129 | 192220 | 192406