git: 7528c2b79993 - main - sysutils/appjail-devel: Update to g20230529

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 30 May 2023 04:37:56 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7528c2b7999389851be47724a6666dfb0dd3424e

commit 7528c2b7999389851be47724a6666dfb0dd3424e
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-05-30 04:33:47 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
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 <bsd.port.mk>
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