From nobody Wed Jun 21 04:49:44 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 4Qm9yw3mytz4gm98; Wed, 21 Jun 2023 04:49:44 +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 4Qm9yw3Bznz4kqc; Wed, 21 Jun 2023 04:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687322984; 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=pVMqJDuo985qW4GcqZOkTRvedgaIFzggS41FHxolKE0=; b=J9DKnS8nc4DQFVBrDjAFT4Z58wGv4oStzbXpJJpr4lRO/uR4wDSXUnycFd5/E9iBMu+YiF sgB+6XWlO2TaWpyKFW6mCyZ1mfjF22gw98KSGF4Av1vYE+oFLYMfMxhGcT4cABXApDlgk7 nISgzb+MWBI8NOTEd3Yv8NFIchaRKgp6yPNwabIy3b3tMzgmkjmcItrj0qmRbqZxI5cWgj YQs7Q10gubuNrmuG5aA5Pubkh9Ul3NpA7qvbbBjXTB0kcB9nfylr14NkiuBMds3O7PpMXi C2TQLem7M+GbEe8dVlXmX9+ZZg1xa4ftCCq/P3vfDMG1hAUf97eme9lYL6cifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687322984; 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=pVMqJDuo985qW4GcqZOkTRvedgaIFzggS41FHxolKE0=; b=aOq/e31kmJcPzkNmaKJg+02JniQu3RQKgZHkLUaTQEDLRdob6/of39LuWSO7VvUFTy978I BIdw7P84uwkyBGR6b6dVRcleEplNtSop0CJW3XIEuR/MIiuIllTiP8J0fxSME3V2y7HZUo +1f9HI2nRe+FVYvmthIu7D3vaNPxZzGpR6yxBwuFyUXbNNP9HSD/ziWF7fXE1H8vWxqUDs MzkS7t78Gi6ZixyxFZInWDT6PY0aSMIfifibG/tDwklvI4hyFPDa+9Yj1JFJGQ52vs3tRt ltbFqYXx2YSvIy6notAIN97V5CD7IvDFkJxjtptNiF+OKfWYYb9Tg9TKp4l+Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687322984; a=rsa-sha256; cv=none; b=SUQi2HCH5yGKw+bivND0fh/8Y5PUiNpuKfnSzNo+Nb3SU5HoTKo8PwOIzr4k+gG6CPBDYN FD/sMF2u9VdgIvuuCMHaWMLArureDwHEeTEgI3J7DfaIDQwfKiZg47Y5ty4mqZMgBw1fLd Bp74kUx3AwhuLCdxeJ8vrS9deyInlbDYE5e8eNVmHUtuNI0I3dL2PHXTpaqE6WQc+wwOP6 WuOTyNJ6U7vLBhJQ08S1ljYQOEI19AiGijltv3wWImatmseiZSLVO0gAx9KV9apc/1xQd8 JTKWRfOvPI1gYYZ/zOk9S1TxHMyRwmXbLar1ykVHNn60Z1gwnI2C4BMqNKqMog== 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 4Qm9yw2HmgzSWf; Wed, 21 Jun 2023 04:49:44 +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 35L4niB9064860; Wed, 21 Jun 2023 04:49:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L4niox064859; Wed, 21 Jun 2023 04:49:44 GMT (envelope-from git) Date: Wed, 21 Jun 2023 04:49:44 GMT Message-Id: <202306210449.35L4niox064859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 3d4bdc4e6db9 - main - sysutils/appjail-devel: Update to g20230618 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d4bdc4e6db9e3d408a3b1b5d41ba882cd06dfbf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d4bdc4e6db9e3d408a3b1b5d41ba882cd06dfbf commit 3d4bdc4e6db9e3d408a3b1b5d41ba882cd06dfbf Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-06-21 04:46:25 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-06-21 04:49:36 +0000 sysutils/appjail-devel: Update to g20230618 - Add portable option in the export+root installation method - Fix typo ${fetch_args} -> ${fetch_cmd} in makejail - Add conflicts for installation methods in quick - Add portable option in the import+root installation method - Add image command - Add FROM instruction - Fix image when ENABLE_ZFS=1 - Add check for when FROM is used more than once - Escape slash character in some commands - Escape common characters in EXEC - Escape command substitution beginning with the dolar sign - Avoid escaping command substitution in some parts, as it has no special meaning --- sysutils/appjail-devel/Makefile | 4 ++-- sysutils/appjail-devel/distinfo | 6 +++--- sysutils/appjail-devel/pkg-plist | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile index 758f1abe423e..f9ee19e8f329 100644 --- a/sysutils/appjail-devel/Makefile +++ b/sysutils/appjail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= g20230609 +DISTVERSION= g20230618 CATEGORIES= sysutils PKGNAMESUFFIX= -devel @@ -16,7 +16,7 @@ CONFLICTS= appjail USE_GITHUB= yes GH_ACCOUNT= DtxdF GH_PROJECT= AppJail -GH_TAGNAME= e98cc4ca558b02979dd791aae1db2bbe4852c9fe +GH_TAGNAME= c6dca1da6ae4bd237a8d98a4ff70f9cc8c6735f9 ALL_TARGET= utils-strip diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo index a098a9aa9a44..1ea066eb52fa 100644 --- a/sysutils/appjail-devel/distinfo +++ b/sysutils/appjail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686323347 -SHA256 (DtxdF-AppJail-vg20230609-e98cc4ca558b02979dd791aae1db2bbe4852c9fe_GH0.tar.gz) = 3ae596ffae304b523f28312e576959f40fb370b0c08cbdfd73b7585fc7da515a -SIZE (DtxdF-AppJail-vg20230609-e98cc4ca558b02979dd791aae1db2bbe4852c9fe_GH0.tar.gz) = 232451 +TIMESTAMP = 1687322557 +SHA256 (DtxdF-AppJail-vg20230618-c6dca1da6ae4bd237a8d98a4ff70f9cc8c6735f9_GH0.tar.gz) = 26f997f0228a642e3104cff2300ba19b6d12e57ed83702832aaafd1f61d39210 +SIZE (DtxdF-AppJail-vg20230618-c6dca1da6ae4bd237a8d98a4ff70f9cc8c6735f9_GH0.tar.gz) = 246769 diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist index 6edd131dd544..84f707ad2d9b 100644 --- a/sysutils/appjail-devel/pkg-plist +++ b/sysutils/appjail-devel/pkg-plist @@ -22,6 +22,7 @@ libexec/appjail/network/network %%DATADIR%%/cmd/fstab %%DATADIR%%/cmd/healthcheck %%DATADIR%%/cmd/help +%%DATADIR%%/cmd/image %%DATADIR%%/cmd/jail %%DATADIR%%/cmd/limits %%DATADIR%%/cmd/login @@ -97,6 +98,7 @@ libexec/appjail/network/network %%DATADIR%%/makejail/cmd/all/USER %%DATADIR%%/makejail/cmd/all/VAR %%DATADIR%%/makejail/cmd/all/WORKDIR +%%DATADIR%%/makejail/cmd/build/FROM %%DATADIR%%/makejail/cmd/build/LOGIN %%DATADIR%%/makejail/cmd/build/OPTION %%DATADIR%%/makejail/cmd/build/RESTART @@ -119,6 +121,7 @@ libexec/appjail/network/network %%DATADIR%%/makejail/write/all/UMOUNT %%DATADIR%%/makejail/write/all/VAR %%DATADIR%%/makejail/write/all/WORKDIR +%%DATADIR%%/makejail/write/build/FROM %%DATADIR%%/makejail/write/build/LOGIN %%DATADIR%%/makejail/write/build/OPTION %%DATADIR%%/makejail/write/build/RESTART