diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile index 39a5955e67e6..c1e88a44951e 100644 --- a/sysutils/appjail/Makefile +++ b/sysutils/appjail/Makefile @@ -1,33 +1,40 @@ PORTNAME= appjail DISTVERSIONPREFIX= v -DISTVERSION= 2.4.0 -PORTREVISION= 1 +DISTVERSION= 2.5.1 CATEGORIES= sysutils MAINTAINER= DtxdF@disroot.org COMMENT= Simple and easy-to-use tool for creating portable jails WWW= https://github.com/DtxdF/AppJail LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= appjail-devel - USE_GITHUB= yes GH_ACCOUNT= DtxdF GH_PROJECT= AppJail ALL_TARGET= utils-strip +CONFLICTS= appjail-devel + PORTDOCS= README.md -OPTIONS_DEFINE= DEBOOTSTRAP DOCS GIT -DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails +OPTIONS_DEFINE= DEBOOTSTRAP DOAS DOCS GIT + +DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails +DOAS_DESC= Add support for unprivileged users + DEBOOTSTRAP_RUN_DEPENDS= debootstrap>0:sysutils/debootstrap +DOAS_RUN_DEPENDS= doas>0:security/doas GIT_RUN_DEPENDS= git>0:devel/git do-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR} +post-install: + ${MKDIR} ${STAGEDIR}/${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/share/examples/appjail/appjail.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample + .include diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo index 1555a52ccdef..efaf33f12880 100644 --- a/sysutils/appjail/distinfo +++ b/sysutils/appjail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678382078 -SHA256 (DtxdF-AppJail-v2.4.0_GH0.tar.gz) = e3e09f735607715066e88005a3eec5dd360cb290b7f147661e3ee9ff2bf33633 -SIZE (DtxdF-AppJail-v2.4.0_GH0.tar.gz) = 164278 +TIMESTAMP = 1685475513 +SHA256 (DtxdF-AppJail-v2.5.1_GH0.tar.gz) = 43d5c65a58d255c1bab1845ef8d7af8fd78cdd4a69795993e716683d91affd84 +SIZE (DtxdF-AppJail-v2.5.1_GH0.tar.gz) = 232849 diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist index cf5ebf02c8f3..cb3ec3573579 100644 --- a/sysutils/appjail/pkg-plist +++ b/sysutils/appjail/pkg-plist @@ -1,119 +1,135 @@ bin/appjail bin/appjail-dns etc/rc.d/appjail etc/rc.d/appjail-natnet libexec/appjail/getservbyname/getservbyname libexec/appjail/ipcheck/ipcheck libexec/appjail/network/network %%DATADIR%%/cmd/cmd %%DATADIR%%/cmd/config %%DATADIR%%/cmd/cpuset %%DATADIR%%/cmd/disable %%DATADIR%%/cmd/enable %%DATADIR%%/cmd/enabled %%DATADIR%%/cmd/expose %%DATADIR%%/cmd/fetch %%DATADIR%%/cmd/fstab %%DATADIR%%/cmd/help %%DATADIR%%/cmd/jail %%DATADIR%%/cmd/limits %%DATADIR%%/cmd/login %%DATADIR%%/cmd/logs %%DATADIR%%/cmd/makejail %%DATADIR%%/cmd/nat %%DATADIR%%/cmd/network %%DATADIR%%/cmd/pkg %%DATADIR%%/cmd/quick %%DATADIR%%/cmd/restart %%DATADIR%%/cmd/rstop %%DATADIR%%/cmd/run %%DATADIR%%/cmd/service %%DATADIR%%/cmd/start %%DATADIR%%/cmd/startup %%DATADIR%%/cmd/stop %%DATADIR%%/cmd/sysrc %%DATADIR%%/cmd/update %%DATADIR%%/cmd/upgrade %%DATADIR%%/cmd/usage %%DATADIR%%/cmd/version %%DATADIR%%/cmd/zfs %%DATADIR%%/files/config.conf %%DATADIR%%/files/default.conf %%DATADIR%%/files/default_template.conf %%DATADIR%%/files/exclude-thinjail.files %%DATADIR%%/files/include-thinjail.files %%DATADIR%%/files/rctl-actions %%DATADIR%%/files/rctl-resources %%DATADIR%%/files/rctl-subjects %%DATADIR%%/lib/atexit -%%DATADIR%%/lib/cache %%DATADIR%%/lib/check_func %%DATADIR%%/lib/colors %%DATADIR%%/lib/copy %%DATADIR%%/lib/files %%DATADIR%%/lib/jail %%DATADIR%%/lib/jail_types %%DATADIR%%/lib/kern_modules %%DATADIR%%/lib/keys %%DATADIR%%/lib/load %%DATADIR%%/lib/log %%DATADIR%%/lib/mksum %%DATADIR%%/lib/mount %%DATADIR%%/lib/network %%DATADIR%%/lib/random %%DATADIR%%/lib/replace %%DATADIR%%/lib/strlen %%DATADIR%%/lib/sysexits %%DATADIR%%/lib/tempfile %%DATADIR%%/lib/version %%DATADIR%%/lib/whitespaces %%DATADIR%%/lib/zfs %%DATADIR%%/makejail/cmd/all/ADD %%DATADIR%%/makejail/cmd/all/ARG %%DATADIR%%/makejail/cmd/all/CLEAR %%DATADIR%%/makejail/cmd/all/CMD %%DATADIR%%/makejail/cmd/all/COPY %%DATADIR%%/makejail/cmd/all/ENTRYPOINT %%DATADIR%%/makejail/cmd/all/ENV %%DATADIR%%/makejail/cmd/all/MOUNT %%DATADIR%%/makejail/cmd/all/PKG %%DATADIR%%/makejail/cmd/all/RAW %%DATADIR%%/makejail/cmd/all/REPLACE %%DATADIR%%/makejail/cmd/all/RUN %%DATADIR%%/makejail/cmd/all/SERVICE %%DATADIR%%/makejail/cmd/all/SET %%DATADIR%%/makejail/cmd/all/SYSRC %%DATADIR%%/makejail/cmd/all/UMOUNT %%DATADIR%%/makejail/cmd/all/USER %%DATADIR%%/makejail/cmd/all/VAR %%DATADIR%%/makejail/cmd/all/WORKDIR %%DATADIR%%/makejail/cmd/build/LOGIN %%DATADIR%%/makejail/cmd/build/OPTION %%DATADIR%%/makejail/cmd/build/RESTART %%DATADIR%%/makejail/cmd/build/START %%DATADIR%%/makejail/cmd/build/STOP %%DATADIR%%/makejail/write/all/ADD %%DATADIR%%/makejail/write/all/ARG %%DATADIR%%/makejail/write/all/CMD %%DATADIR%%/makejail/write/all/COPY %%DATADIR%%/makejail/write/all/MOUNT %%DATADIR%%/makejail/write/all/PKG %%DATADIR%%/makejail/write/all/RAW %%DATADIR%%/makejail/write/all/REPLACE %%DATADIR%%/makejail/write/all/RUN %%DATADIR%%/makejail/write/all/SERVICE %%DATADIR%%/makejail/write/all/SET %%DATADIR%%/makejail/write/all/SYSRC %%DATADIR%%/makejail/write/all/UMOUNT %%DATADIR%%/makejail/write/all/VAR %%DATADIR%%/makejail/write/all/WORKDIR %%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/ascii2oct.sh %%DATADIR%%/scripts/dns.sh %%DATADIR%%/scripts/get_depends.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