From nobody Sat Apr 8 18:12:36 2023 X-Original-To: dev-commits-ports-main@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 4Pv3HS4pJJz44jQp; Sat, 8 Apr 2023 18:12:36 +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 4Pv3HS4KJ5z4ZrQ; Sat, 8 Apr 2023 18:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680977556; 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=mSmsQBP49/JLmee28zIvxO+a3MUSKa+ns79p+opM76w=; b=kd5MFGGuKW5Iu/gvrDJA13NNgFcYo//iMbhC7tkKha1Se/mYIw/DIgG1toeMRpLJMqWOt1 z88p/YG8b1eCABcmBwslfXldpoHvLl9xmwDO21Ui0wJprribAB56ffMfydPPZD/aA3vDhF FDLEnp3UCavZFXRBO0GAMUa7gGU9wgYA9KE/Tct9qTXcLDq/MHzRhepV3Q45HHqPoCmBsV l6YljyZvipyVKEaY8Ouo9k0ir/PNgwGv8nl+ksh2O0LtSyx+hFxX4gCk3EOATuyG9oz6yy JdkE3NotN4GHryeAjcMpJDH+GkXUs/rrVPb169wLfHtzVflSQmJIj92rogRlgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680977556; 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=mSmsQBP49/JLmee28zIvxO+a3MUSKa+ns79p+opM76w=; b=na0qCSkj8o4kNTHafI0NEmi2z+ViTzcRer0P6CYw1woS3PdaNrybTvISl0PcWUlllLMS3O ubDPniOx7onlb/WM9D6NO+DBomXeXd46OdLn94EfWOn0pa/eKPdAnbLb3ZL4sn+Jd4IkTE pZT/k0y94r/I8dGOx80Hz8YSm89RzLSdbYUP4pMgJtCjwwif7VbNAuq7GVO8vKQne3TztD 33CBj5CsD+CF5wzarIZ8ArLxGK5RvzMPq91qjwd1m/yMiviF+VBwj/T64akN6zACmWilen qngNXHgwtB2qGzbQXL6VreQ+O1drZOkaAW3uEddtkOuGaT5cDdVGUHPNhur8DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680977556; a=rsa-sha256; cv=none; b=YXewoNQTxSKfAEyw5x5K0puVh14g7ALLN2JtTATxHa04aoEE1pAioiyJ58NgnwAN5e6S77 CKNL5khOy89tiBFtOpak5n7tIQ0RspY/CciBvoCSQvwqDdxmLzxBikhzraG33s7ef83MVu o4ytHAfVL7YIhoycPWGAxNHzj77QwNfxxjuSGhmZmO3wfUDWvJkIIGQHm4aBuG56+D7gyH /Q5xQhyTjJ6kSrWhvjA9oMbofLLkTpUjY88nTG0jIB2xgmWzOeNwtboApgyJr1JVq7eYcM cW/LpAey2m3FvzRRoHJ6yJsqzbRvv206INhsEPIfkUjZ2KAjSG/oDB/ejQ4l4g== 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 4Pv3HS3GKJzcgV; Sat, 8 Apr 2023 18:12:36 +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 338ICaen069018; Sat, 8 Apr 2023 18:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338ICab3069017; Sat, 8 Apr 2023 18:12:36 GMT (envelope-from git) Date: Sat, 8 Apr 2023 18:12:36 GMT Message-Id: <202304081812.338ICab3069017@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: 2b7a2e498012 - main - ports-mgmt/rc-subr-jail: Fix bug with kill_jail. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 2b7a2e498012740b3bca082f13b0fec981b3e02a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b7a2e498012740b3bca082f13b0fec981b3e02a commit 2b7a2e498012740b3bca082f13b0fec981b3e02a Author: Gleb Popov AuthorDate: 2023-04-08 15:42:12 +0000 Commit: Gleb Popov CommitDate: 2023-04-08 18:12:31 +0000 ports-mgmt/rc-subr-jail: Fix bug with kill_jail. Reported by: Boris Polujin --- ports-mgmt/rc-subr-jail/Makefile | 2 +- ports-mgmt/rc-subr-jail/files/rc.subr.jail | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports-mgmt/rc-subr-jail/Makefile b/ports-mgmt/rc-subr-jail/Makefile index 0bf5f97d5600..e31716915639 100644 --- a/ports-mgmt/rc-subr-jail/Makefile +++ b/ports-mgmt/rc-subr-jail/Makefile @@ -1,5 +1,5 @@ PORTNAME= rc-subr-jail -PORTVERSION= 4 +PORTVERSION= 5 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 e2c479b51df4..241fe78128cb 100644 --- a/ports-mgmt/rc-subr-jail/files/rc.subr.jail +++ b/ports-mgmt/rc-subr-jail/files/rc.subr.jail @@ -139,8 +139,8 @@ kill_jail() _varname="$3" if checkyesno "$_varname"; then - killall -j ${name}_jail ${signal} + killall -j ${name}_jail ${_signal} else - kill ${signal} "$_pid" + kill ${_signal} "$_pid" fi }