From nobody Tue Mar 28 11:20:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pm6fZ21qrz41n68; Tue, 28 Mar 2023 11:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pm6fZ1TRSz4M8v; Tue, 28 Mar 2023 11:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680002406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fkUou8MPYIhpShDzHxqOIAAMFdc8EXGk3FKVXT04v0=; b=vCpxyYUva0ej9L/ivkwEmoo3F4ZkaLSxZWc+jsTd8RgtMTdKP/KUp7/w92uV/HfNfRM8E1 lpWtHVjzuN7xjXkCyu9PndH34zkhxZIrFgHt2IXCs+JO+zhZzt/1zt67a3m+hoI6tkEfKz ni084EEolv/GriwQavTRxLnCXvfUeJv25f9GvuFrYB1RJbQgWTbMZVQAz/Qhog4WQL061x E/gVfbQ/WApUPEmYt9CWDQuO6MxINlNA9mHYNzN2jyBDhBFM0qTs2Z90Wjx8/rRqy+Ch48 6YAH6yIKB0Spf/pzqZva0vXcUKu1gTyoXNCkcaEdUZLvi05aXqfr7BBNXT04XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680002406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8fkUou8MPYIhpShDzHxqOIAAMFdc8EXGk3FKVXT04v0=; b=Gp/ZH4EO3A2AImknwm9xnWbRfokWnXM9hj8coz4hHM40mrBeFzg60/3rgTmZvNcLUfJ0fj 1PuUmFJNQulT65AA0w25IPfCRNdhNdS5tNlmADOCTcZxKkJ541ryxfpgK0eCDkvZ07jIUz U73Jot3+WO7t43DdW2vRdyWYPRG1tFs4CGMNpMplymSeVkvBN5HeYe17N3dho578FH+VoH em9pEvFZLbdPuXOp/WK6ZmYmuWDLOKMbctkoJC2+KRt227IoK/B+O3a53y6JBSksfXSiI0 nqC22bn8VgjePxKMRF4g9AtMW1uZ8gTc6Dpk42cxlRFbWyMSdN09psWRLDz+sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680002406; a=rsa-sha256; cv=none; b=JygFxCJu2HqzecRJta5kUhbHP8j9tp7YxrpM+lI4sI9OANs/TIeD7sjY+MwXcyIhFSIPlb QjBeODb2tq6gyDsr+rVncem5Q9JICNnoDPa1RZcE6hXQ9p+OicWXCytjQ/wqwp378jsFeo 3hQ67hY0IGdWt53i4vVQZbFyqT/8NOr4KU5qPrFp7yVv3AI6uJGs5qulCezV3wIcjIIMlE qGpd4sqq2t6Ibjnpsj2t8J85OGbWo19e+CM2FJpvyqThHdFe7p7pb125ZXYXmpSIve5H5/ Xuy8Q1nRvhzRfLvUsyHPfXHcVxJnYVX/4cb8nvrWa8lo0tGd/h69lmD3DviMnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pm6fZ0YPCz12Wy; Tue, 28 Mar 2023 11:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32SBK57r017714; Tue, 28 Mar 2023 11:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SBK5j0017711; Tue, 28 Mar 2023 11:20:05 GMT (envelope-from git) Date: Tue, 28 Mar 2023 11:20:05 GMT Message-Id: <202303281120.32SBK5j0017711@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 7e5e762ff7aa - main - ports-mgmt/rc-subr-jail: Update to 4. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e5e762ff7aac688be0bc7c122d989a0a325d3f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e5e762ff7aac688be0bc7c122d989a0a325d3f5 commit 7e5e762ff7aac688be0bc7c122d989a0a325d3f5 Author: Gleb Popov AuthorDate: 2023-03-28 11:15:17 +0000 Commit: Gleb Popov CommitDate: 2023-03-28 11:18:12 +0000 ports-mgmt/rc-subr-jail: Update to 4. --- ports-mgmt/rc-subr-jail/Makefile | 2 +- ports-mgmt/rc-subr-jail/files/rc.subr.jail | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/rc-subr-jail/Makefile b/ports-mgmt/rc-subr-jail/Makefile index e380cc8a5302..0bf5f97d5600 100644 --- a/ports-mgmt/rc-subr-jail/Makefile +++ b/ports-mgmt/rc-subr-jail/Makefile @@ -1,5 +1,5 @@ PORTNAME= rc-subr-jail -PORTVERSION= 3 +PORTVERSION= 4 CATEGORIES= ports-mgmt MASTER_SITES= # DISTFILES= # diff --git a/ports-mgmt/rc-subr-jail/files/rc.subr.jail b/ports-mgmt/rc-subr-jail/files/rc.subr.jail index c40101bbe5b1..e2c479b51df4 100644 --- a/ports-mgmt/rc-subr-jail/files/rc.subr.jail +++ b/ports-mgmt/rc-subr-jail/files/rc.subr.jail @@ -127,3 +127,20 @@ destroy_jail() rm -rf "$jroot" } + +# kill_jail pid signal jail_enable_var +# Works like kill if passed a variable containing "no", but calls +# killall -j ${name}_jail otherwise +kill_jail() +{ + local _pid _varname + _pid="$1" + _signal="$2" + _varname="$3" + + if checkyesno "$_varname"; then + killall -j ${name}_jail ${signal} + else + kill ${signal} "$_pid" + fi +}