From nobody Sat Apr 8 18:21:46 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 4Pv3V24zt3z44jh7; Sat, 8 Apr 2023 18:21:46 +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 4Pv3V24ZZ9z3P5k; Sat, 8 Apr 2023 18:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978106; 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=ua0n5uQDDS3CfVov3ndtZUeq2dUHC49QFP8u6815wnA=; b=BE+ZYxUJe51tr5gMZvwX+jQfzMK7Jcxmz2DDVOyjBjsp1p0hRHZA4whvqZHV8uQXZ4XShi bmb2fnU6p99gxMLZTEs9FFS45pnRNGhWMrw3Qd1iJKMV4ACeiAnU/6gdZZyFL73vIYcfxQ 5Woz+43cVDk23pG9ZK8jqy3zqv4lwW0FNwLtWw3j8QlBFD9HHBT05R4AZ6itDneWUv8hO1 UCLcLJRX4QPkXtQA1omK908ERcJky3FQAm6/r2CfNWNVsYt+AT1jxlHesB0Bf4tbXuhL4i P7EPmfUCNTHkVqm5xQma8Gvqv26qdh4ht+V0ebX0Q5AGwE982UUlfLyceQr0BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978106; 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=ua0n5uQDDS3CfVov3ndtZUeq2dUHC49QFP8u6815wnA=; b=IIdTPsfVJtkZL92FbBs/YXVKF9RJA7dyX5y15MFmmOwP0rwqiBdfxOh2soxoaWHeo4PPl0 vppJq6U7D+hLtbq7qGhRTl6Kl2FNaTv1FQepgmbD5uV/wVEWSyOLfeSKyJD7iJ1v6nYTqf 9YqcGnCCOjyL3GAc3EnlTlfWRLAjlVv8xvLMFrqNrKYw3lt1Gk1aGwwu9t8KF8dK9HCqZh JzHvhGihKegjgdbOGz7z5FE1m80Kptj+v66/Dn/eiACLIgTbl2Z+Qld7GdQiUU/WJrsIZB 5Kbpw0+Tl/6Powt8wNUPkiSqJvMBn3Bll8ix33cXjBOx4oRUTdXxJMO1WE9azQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680978106; a=rsa-sha256; cv=none; b=RYP7ju30zs4Y8YJrHG03OpulqOZrJgx/ukYSHhRrl09ImvFKFPZjCjZMWLoHIjIWqlJBcU Dz35n6G1AQ60ShLPIntqCw5FWzfcDQOFpy0I6SROKtdYFRU3XTJhM32p5SE9xBMdJW1cMQ cVW5Ux7PazgI+0qc/GqaA5uUV+hZLMerWgrXlI2ihe3XTyAg1LPCq80ZmwJhjTd/niUEIZ mtn1nNRbgeNHtzt6KMcsszUaZi/XiszQ8ea4qycwztgRVvGhWV/EmYB01CdEFQ8FSBg6Mh V2sVDoLeLdC+wfCbvOquYx2vvTEvjO/f4/xCTEjwQzY4PJPddVCkV3gdUOkZNg== 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 4Pv3V23hTNzd14; Sat, 8 Apr 2023 18:21:46 +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 338ILkFg084445; Sat, 8 Apr 2023 18:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338ILkkQ084444; Sat, 8 Apr 2023 18:21:46 GMT (envelope-from git) Date: Sat, 8 Apr 2023 18:21:46 GMT Message-Id: <202304081821.338ILkkQ084444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: c6a4b634d7d4 - 2023Q2 - ports-mgmt/rc-subr-jail: Fix bug with kill_jail. 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: c6a4b634d7d4457572f9b5fcd9a866dfb2fb43d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6a4b634d7d4457572f9b5fcd9a866dfb2fb43d1 commit c6a4b634d7d4457572f9b5fcd9a866dfb2fb43d1 Author: Gleb Popov AuthorDate: 2023-04-08 15:42:12 +0000 Commit: Gleb Popov CommitDate: 2023-04-08 18:21:43 +0000 ports-mgmt/rc-subr-jail: Fix bug with kill_jail. Reported by: Boris Polujin (cherry picked from commit 2b7a2e498012740b3bca082f13b0fec981b3e02a) --- 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 }