git: 3514c5ca1fc2 - main - sysutils/appjail: Update to 3.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Sat, 04 Jan 2025 11:57:09 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3514c5ca1fc240d2f36ac1f250cf884edbe790f4

commit 3514c5ca1fc240d2f36ac1f250cf884edbe790f4
Author:     Jesús Daniel Colmenares Oviedo <DtxdF@disroot.org>
AuthorDate: 2025-01-04 11:54:47 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-01-04 11:56:47 +0000

    sysutils/appjail: Update to 3.6.0
    
    - Add support for OCI
    
    ChangeLog:      https://github.com/DtxdF/AppJail/releases/tag/v3.6.0
    PR:             283831
---
 sysutils/appjail/Makefile  |   7 ++-
 sysutils/appjail/distinfo  |   6 +--
 sysutils/appjail/pkg-plist | 110 ++++++++++++++++++++++++---------------------
 3 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile
index 60ba8831973f..4c4b9a28d5a8 100644
--- a/sysutils/appjail/Makefile
+++ b/sysutils/appjail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	appjail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.0
+DISTVERSION=	3.6.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	DtxdF@disroot.org
@@ -20,14 +20,17 @@ CONFLICTS=	appjail-devel
 
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DEBOOTSTRAP DOAS DOCS GIT
+OPTIONS_DEFINE=	DEBOOTSTRAP DOAS DOCS GIT OCI
 
 DEBOOTSTRAP_DESC=	Support for Debian and Ubuntu jails
 DOAS_DESC=		Add support for unprivileged users
+OCI_DESC=		Add support for OCI
 
 DEBOOTSTRAP_RUN_DEPENDS=	debootstrap>0:sysutils/debootstrap
 DOAS_RUN_DEPENDS=		doas>0:security/doas
 GIT_RUN_DEPENDS=		git>0:devel/git
+OCI_RUN_DEPENDS=		buildah>0:sysutils/buildah \
+				jq>0:textproc/jq
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo
index ec0ef2cae203..ca73d417ab53 100644
--- a/sysutils/appjail/distinfo
+++ b/sysutils/appjail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731197746
-SHA256 (DtxdF-AppJail-v3.5.0_GH0.tar.gz) = f2e6718ce4cc929e4d7cbf2dda199cf7adeaa176e6411e363c734b810db96b1a
-SIZE (DtxdF-AppJail-v3.5.0_GH0.tar.gz) = 988200
+TIMESTAMP = 1735886621
+SHA256 (DtxdF-AppJail-v3.6.0_GH0.tar.gz) = ec1b12b3405233bcbccb533452ab1b15313db64710e9542a878ea14e39e418a7
+SIZE (DtxdF-AppJail-v3.6.0_GH0.tar.gz) = 1006288
diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist
index 8c7aadc0e089..b715b72b4076 100644
--- a/sysutils/appjail/pkg-plist
+++ b/sysutils/appjail/pkg-plist
@@ -1,27 +1,47 @@
 bin/appjail
+bin/appjail-config
+bin/appjail-config-user
 bin/appjail-dns
+bin/appjail-user
+@sample %%ETCDIR%%/appjail.conf.sample
 etc/rc.d/appjail
+etc/rc.d/appjail-dns
+etc/rc.d/appjail-health
 etc/rc.d/appjail-natnet
+libexec/appjail/appjail-config/appjail-config
+libexec/appjail/appjail-config/tok
+libexec/appjail/find-number-from-start/find-number-from-start
+libexec/appjail/find-smallest-missing-number/find-smallest-missing-number
+libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 libexec/appjail/getservbyname/getservbyname
 libexec/appjail/ipcheck/ipcheck
+libexec/appjail/jexec/jexec
 libexec/appjail/network/network
-libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
+%%DATADIR%%/cmd/apply
+%%DATADIR%%/cmd/checkOld
 %%DATADIR%%/cmd/cmd
 %%DATADIR%%/cmd/cpuset
+%%DATADIR%%/cmd/deleteOld
+%%DATADIR%%/cmd/devfs
 %%DATADIR%%/cmd/disable
 %%DATADIR%%/cmd/enable
 %%DATADIR%%/cmd/enabled
+%%DATADIR%%/cmd/etcupdate
 %%DATADIR%%/cmd/expose
 %%DATADIR%%/cmd/fetch
 %%DATADIR%%/cmd/fstab
+%%DATADIR%%/cmd/healthcheck
 %%DATADIR%%/cmd/help
+%%DATADIR%%/cmd/image
 %%DATADIR%%/cmd/jail
+%%DATADIR%%/cmd/label
 %%DATADIR%%/cmd/limits
 %%DATADIR%%/cmd/login
 %%DATADIR%%/cmd/logs
 %%DATADIR%%/cmd/makejail
 %%DATADIR%%/cmd/nat
 %%DATADIR%%/cmd/network
+%%DATADIR%%/cmd/oci
 %%DATADIR%%/cmd/pkg
 %%DATADIR%%/cmd/quick
 %%DATADIR%%/cmd/restart
@@ -30,16 +50,19 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/cmd/service
 %%DATADIR%%/cmd/start
 %%DATADIR%%/cmd/startup
+%%DATADIR%%/cmd/status
 %%DATADIR%%/cmd/stop
 %%DATADIR%%/cmd/sysrc
 %%DATADIR%%/cmd/update
 %%DATADIR%%/cmd/upgrade
 %%DATADIR%%/cmd/usage
 %%DATADIR%%/cmd/version
+%%DATADIR%%/cmd/volume
 %%DATADIR%%/cmd/zfs
 %%DATADIR%%/files/config.conf
 %%DATADIR%%/files/default.conf
 %%DATADIR%%/files/default_template.conf
+%%DATADIR%%/files/dnsmasq.conf
 %%DATADIR%%/files/exclude-thinjail.files
 %%DATADIR%%/files/include-thinjail.files
 %%DATADIR%%/files/rctl-actions
@@ -49,7 +72,9 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/lib/check_func
 %%DATADIR%%/lib/colors
 %%DATADIR%%/lib/copy
+%%DATADIR%%/lib/devfs
 %%DATADIR%%/lib/files
+%%DATADIR%%/lib/initscript
 %%DATADIR%%/lib/jail
 %%DATADIR%%/lib/jail_types
 %%DATADIR%%/lib/kern_modules
@@ -59,10 +84,14 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/lib/mksum
 %%DATADIR%%/lib/mount
 %%DATADIR%%/lib/network
+%%DATADIR%%/lib/oci
 %%DATADIR%%/lib/random
+%%DATADIR%%/lib/repeat
 %%DATADIR%%/lib/replace
+%%DATADIR%%/lib/select
 %%DATADIR%%/lib/strlen
 %%DATADIR%%/lib/sysexits
+%%DATADIR%%/lib/table
 %%DATADIR%%/lib/tempfile
 %%DATADIR%%/lib/version
 %%DATADIR%%/lib/whitespaces
@@ -72,8 +101,13 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/makejail/cmd/all/CLEAR
 %%DATADIR%%/makejail/cmd/all/CMD
 %%DATADIR%%/makejail/cmd/all/COPY
+%%DATADIR%%/makejail/cmd/all/DESTROY
+%%DATADIR%%/makejail/cmd/all/DEVICE
 %%DATADIR%%/makejail/cmd/all/ENTRYPOINT
 %%DATADIR%%/makejail/cmd/all/ENV
+%%DATADIR%%/makejail/cmd/all/EXEC
+%%DATADIR%%/makejail/cmd/all/GLOBAL
+%%DATADIR%%/makejail/cmd/all/LABEL
 %%DATADIR%%/makejail/cmd/all/MOUNT
 %%DATADIR%%/makejail/cmd/all/PKG
 %%DATADIR%%/makejail/cmd/all/RAW
@@ -85,7 +119,9 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/makejail/cmd/all/UMOUNT
 %%DATADIR%%/makejail/cmd/all/USER
 %%DATADIR%%/makejail/cmd/all/VAR
+%%DATADIR%%/makejail/cmd/all/VOLUME
 %%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
@@ -95,6 +131,11 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/makejail/write/all/ARG
 %%DATADIR%%/makejail/write/all/CMD
 %%DATADIR%%/makejail/write/all/COPY
+%%DATADIR%%/makejail/write/all/DESTROY
+%%DATADIR%%/makejail/write/all/DEVICE
+%%DATADIR%%/makejail/write/all/EXEC
+%%DATADIR%%/makejail/write/all/GLOBAL
+%%DATADIR%%/makejail/write/all/LABEL
 %%DATADIR%%/makejail/write/all/MOUNT
 %%DATADIR%%/makejail/write/all/PKG
 %%DATADIR%%/makejail/write/all/RAW
@@ -105,75 +146,39 @@ libexec/appjail/get_assigned_rulesets/get_assigned_rulesets
 %%DATADIR%%/makejail/write/all/SYSRC
 %%DATADIR%%/makejail/write/all/UMOUNT
 %%DATADIR%%/makejail/write/all/VAR
+%%DATADIR%%/makejail/write/all/VOLUME
 %%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
 %%DATADIR%%/makejail/write/build/START
 %%DATADIR%%/makejail/write/build/STOP
+%%DATADIR%%/scripts/ajconf-user.sh
+%%DATADIR%%/scripts/ajconf.sh
+%%DATADIR%%/scripts/ajdns.sh
+%%DATADIR%%/scripts/ajuser.sh
 %%DATADIR%%/scripts/ascii2oct.sh
+%%DATADIR%%/scripts/bind-ddns-hook.sh
+%%DATADIR%%/scripts/create-bridge.sh
 %%DATADIR%%/scripts/dns.sh
+%%DATADIR%%/scripts/dnsmasq-hook.sh
+%%DATADIR%%/scripts/escape-env-val.sh
 %%DATADIR%%/scripts/get_depends.sh
+%%DATADIR%%/scripts/git.sh
+%%DATADIR%%/scripts/kill_child.sh
+%%DATADIR%%/scripts/kill_tree.sh
+%%DATADIR%%/scripts/load-devfs-rules.sh
 %%DATADIR%%/scripts/run_init.sh
 %%DATADIR%%/scripts/run_jail.sh
-bin/appjail-config
-bin/appjail-config-user
-bin/appjail-user
-etc/rc.d/appjail-health
-libexec/appjail/appjail-config/appjail-config
-libexec/appjail/appjail-config/tok
-%%DATADIR%%/cmd/healthcheck
-%%DATADIR%%/cmd/status
-%%DATADIR%%/makejail/cmd/all/DESTROY
-%%DATADIR%%/makejail/cmd/all/EXEC
-%%DATADIR%%/makejail/write/all/DESTROY
-%%DATADIR%%/makejail/write/all/EXEC
-%%DATADIR%%/scripts/ajconf-user.sh
-%%DATADIR%%/scripts/ajconf.sh
-%%DATADIR%%/scripts/ajuser.sh
 %%DATADIR%%/scripts/runas.sh
-@sample %%ETCDIR%%/appjail.conf.sample
-%%DATADIR%%/lib/repeat
-%%DATADIR%%/cmd/image
-%%DATADIR%%/makejail/cmd/build/FROM
-%%DATADIR%%/makejail/write/build/FROM
-%%DATADIR%%/scripts/kill_child.sh
-etc/rc.d/appjail-dns
-%%DATADIR%%/files/dnsmasq.conf
-%%DATADIR%%/makejail/cmd/all/GLOBAL
-%%DATADIR%%/makejail/write/all/GLOBAL
-%%DATADIR%%/scripts/ajdns.sh
-%%DATADIR%%/scripts/dnsmasq-hook.sh
-libexec/appjail/find-number-from-start/find-number-from-start
-libexec/appjail/find-smallest-missing-number/find-smallest-missing-number
-%%DATADIR%%/cmd/apply
-%%DATADIR%%/cmd/checkOld
-%%DATADIR%%/cmd/deleteOld
-%%DATADIR%%/cmd/devfs
-%%DATADIR%%/cmd/etcupdate
-%%DATADIR%%/lib/devfs
-%%DATADIR%%/lib/select
-%%DATADIR%%/makejail/cmd/all/DEVICE
-%%DATADIR%%/makejail/write/all/DEVICE
-%%DATADIR%%/scripts/load-devfs-rules.sh
 %%DATADIR%%/scripts/super-mv.sh
-%%DATADIR%%/scripts/kill_tree.sh
-%%DATADIR%%/cmd/volume
-%%DATADIR%%/makejail/cmd/all/VOLUME
-%%DATADIR%%/makejail/write/all/VOLUME
-%%DATADIR%%/scripts/escape-env-val.sh
 %%EXAMPLESDIR%%/appjail.conf
 %%EXAMPLESDIR%%/templates/bridge.conf
+%%EXAMPLESDIR%%/templates/freebsd-oci.conf
 %%EXAMPLESDIR%%/templates/linux.conf
 %%EXAMPLESDIR%%/templates/vnet.conf
 %%EXAMPLESDIR%%/templates/xorg.conf
-%%DATADIR%%/scripts/create-bridge.sh
-%%DATADIR%%/cmd/label
-%%DATADIR%%/lib/table
-%%DATADIR%%/makejail/cmd/all/LABEL
-%%DATADIR%%/makejail/write/all/LABEL
-%%DATADIR%%/scripts/bind-ddns-hook.sh
-%%DATADIR%%/scripts/git.sh
 share/man/man1/appjail-apply.1.gz
 share/man/man1/appjail-checkOld.1.gz
 share/man/man1/appjail-cmd.1.gz
@@ -199,6 +204,7 @@ share/man/man1/appjail-logs.1.gz
 share/man/man1/appjail-makejail.1.gz
 share/man/man1/appjail-nat.1.gz
 share/man/man1/appjail-network.1.gz
+share/man/man1/appjail-oci.1.gz
 share/man/man1/appjail-pkg.1.gz
 share/man/man1/appjail-quick.1.gz
 share/man/man1/appjail-restart.1.gz