From nobody Tue May 30 04:37:56 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 4QVflT0K76z4XnPc; Tue, 30 May 2023 04:37:57 +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 4QVflS6sSJz4Kcg; Tue, 30 May 2023 04:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685421477; 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=W2H+cpPDOoKOAXs9e6xDgtabA49vMs1q2fLRne2Xn2M=; b=sjDGeDbIxRAofzJshh68Ilejvcee/WGK0/8yqqUDiGBfjyrI4tzg1h4Rnzr3gDiELw26VQ FcwoJ1dc2hlgH//KceU+Zc/9TcUaLlgQy8/DYLZ1YOCwLvaDLeKZX2s/uiYX5ij8E83lhd B2tX3kBLbeofZhArBBHV+Wp201yIZe04KJHwjsCK9qCeWCOuWIA/pne/cTmUwErc9yHCtL F0qzPC/nuciHZ58RqyAsTsw0ASvXkWa4w1HCAtdQC1HO/962aCTMWj1C6vY//NonIcu5lh QhwX3p28oaRBlGZdxNOM/MKE4y2xOhoDFynmQsKQ7y+6szv7JlBEAkSLs1ocBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685421477; 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=W2H+cpPDOoKOAXs9e6xDgtabA49vMs1q2fLRne2Xn2M=; b=pnGbrrTFD182UNuybf8ntF8W3XwLMDwooLZ1v0Ef8T3OC06kIdS3j22edSoz167SJfU3+e 6ViRVZuD6bAMwEbX07imk7gSzYQEDDbBYAXBQSzQiuiTh5CZYd5arIT0g6BhNRAdj+jEtg WqIAvQQNjkdIhE4t8zS81PakN50tmuMpVEK5Yc7zmmVtCFDswE25g8k5IbPQtwAyVE4aSJ CpjO4nCZOwY9p3dG3jNJQWHx26RwzUtoQ77v166vY1b4QQmT5DyOSZGMKiS7ZZNMNSobg/ FeXDCQC4uObnitapacDwBIS/Lf56IZwgoAtUK5979YLwOIxwKNIgQDSmtvAAHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685421477; a=rsa-sha256; cv=none; b=l4TtE2WHQsRV4yo5Te1dR+u21qjTSE/1+90ew5TL9mp4MZkQZh+pI08Fui4mr7+8qFl70k G6kE0PBN5qj/rSzZ50vW5ew1QU6HoE1BOcpLW72GuGSDUqRiDcG09BtEo67jkuIH5rldlG MaLXhCOb/z6LZ+T1vm6d8+OBErUyrXzPvQrWpVXNUCupN09QT2359lcC47wqGeKm6P/KNR eT2N19diyGNYKRl/O1rMwI9MAWAg668lxgVBjH6mjt922KAUoBMe2CP4+Py+u8FXGhYiBv opfXEWMI4MFDXy6G+VPrrzo3PwOQ9UKO6ui6qw8Oppz7ettOsVH164Jnb495+w== 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 4QVflS5wqtzflZ; Tue, 30 May 2023 04:37:56 +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 34U4buva077523; Tue, 30 May 2023 04:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34U4buhG077522; Tue, 30 May 2023 04:37:56 GMT (envelope-from git) Date: Tue, 30 May 2023 04:37:56 GMT Message-Id: <202305300437.34U4buhG077522@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: 7528c2b79993 - main - sysutils/appjail-devel: Update to g20230529 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: 7528c2b7999389851be47724a6666dfb0dd3424e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=7528c2b7999389851be47724a6666dfb0dd3424e commit 7528c2b7999389851be47724a6666dfb0dd3424e Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-05-30 04:33:47 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-05-30 04:33:47 +0000 sysutils/appjail-devel: Update to g20230529 - Add EXEC and DESTROY instruction - Add status command - Add healthcheck command - Add support for jail healthcheck --- sysutils/appjail-devel/Makefile | 6 +++--- sysutils/appjail-devel/distinfo | 6 +++--- sysutils/appjail-devel/pkg-plist | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile index dd32ec6f4f57..293e19eb1d1c 100644 --- a/sysutils/appjail-devel/Makefile +++ b/sysutils/appjail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= g20230518 +DISTVERSION= g20230529 CATEGORIES= sysutils PKGNAMESUFFIX= -devel @@ -16,7 +16,7 @@ CONFLICTS= appjail USE_GITHUB= yes GH_ACCOUNT= DtxdF GH_PROJECT= AppJail -GH_TAGNAME= 357c296ed3d9e1b5e0bca0caec726c14bc79d35b +GH_TAGNAME= 510f7a4653c4e2f6486a9ea2aed1c74e704bf373 ALL_TARGET= utils-strip @@ -37,6 +37,6 @@ do-install-DOCS-on: post-install: ${MKDIR} ${STAGEDIR}/${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/share/appjail/files/default.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample + ${INSTALL_DATA} ${WRKSRC}/share/examples/appjail/appjail.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample .include diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo index e0c501cc9e80..4fd04b8e7aa9 100644 --- a/sysutils/appjail-devel/distinfo +++ b/sysutils/appjail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684429726 -SHA256 (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 2d4d35efac3958f233784f5af14489e9d03b748ab40be824df0fd7188a8d1956 -SIZE (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 217462 +TIMESTAMP = 1685420851 +SHA256 (DtxdF-AppJail-vg20230529-510f7a4653c4e2f6486a9ea2aed1c74e704bf373_GH0.tar.gz) = 41ce58a04f143b3f47f5fe3b3ac3164ebcf4c13f1a2229f047836a3a5065cc53 +SIZE (DtxdF-AppJail-vg20230529-510f7a4653c4e2f6486a9ea2aed1c74e704bf373_GH0.tar.gz) = 232947 diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist index b6df54381812..33d1951c8efb 100644 --- a/sysutils/appjail-devel/pkg-plist +++ b/sysutils/appjail-devel/pkg-plist @@ -5,6 +5,7 @@ bin/appjail-dns bin/appjail-user @sample %%ETCDIR%%/appjail.conf.sample etc/rc.d/appjail +etc/rc.d/appjail-health etc/rc.d/appjail-natnet libexec/appjail/appjail-config/appjail-config libexec/appjail/appjail-config/tok @@ -20,6 +21,7 @@ libexec/appjail/network/network %%DATADIR%%/cmd/expose %%DATADIR%%/cmd/fetch %%DATADIR%%/cmd/fstab +%%DATADIR%%/cmd/healthcheck %%DATADIR%%/cmd/help %%DATADIR%%/cmd/jail %%DATADIR%%/cmd/limits @@ -36,6 +38,7 @@ libexec/appjail/network/network %%DATADIR%%/cmd/service %%DATADIR%%/cmd/start %%DATADIR%%/cmd/startup +%%DATADIR%%/cmd/status %%DATADIR%%/cmd/stop %%DATADIR%%/cmd/sysrc %%DATADIR%%/cmd/update @@ -78,8 +81,10 @@ libexec/appjail/network/network %%DATADIR%%/makejail/cmd/all/CLEAR %%DATADIR%%/makejail/cmd/all/CMD %%DATADIR%%/makejail/cmd/all/COPY +%%DATADIR%%/makejail/cmd/all/DESTROY %%DATADIR%%/makejail/cmd/all/ENTRYPOINT %%DATADIR%%/makejail/cmd/all/ENV +%%DATADIR%%/makejail/cmd/all/EXEC %%DATADIR%%/makejail/cmd/all/MOUNT %%DATADIR%%/makejail/cmd/all/PKG %%DATADIR%%/makejail/cmd/all/RAW @@ -101,6 +106,8 @@ libexec/appjail/network/network %%DATADIR%%/makejail/write/all/ARG %%DATADIR%%/makejail/write/all/CMD %%DATADIR%%/makejail/write/all/COPY +%%DATADIR%%/makejail/write/all/DESTROY +%%DATADIR%%/makejail/write/all/EXEC %%DATADIR%%/makejail/write/all/MOUNT %%DATADIR%%/makejail/write/all/PKG %%DATADIR%%/makejail/write/all/RAW @@ -126,6 +133,7 @@ libexec/appjail/network/network %%DATADIR%%/scripts/run_init.sh %%DATADIR%%/scripts/run_jail.sh %%DATADIR%%/scripts/runas.sh +%%EXAMPLESDIR%%/appjail.conf %%EXAMPLESDIR%%/templates/bridge.conf %%EXAMPLESDIR%%/templates/linux.conf %%EXAMPLESDIR%%/templates/vnet.conf