git: ee14808e026b - main - sysutils/appjail: Update to 2.5.1

The branch main has been updated by fuz:

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

commit ee14808e026b8f9ba001bbff298a75068d86d835
Author:     Jesús Daniel Colmenares Oviedo <DtxdF@disroot.org>
AuthorDate: 2023-05-30 22:49:35 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-06-01 22:29:21 +0000

    sysutils/appjail: Update to 2.5.1
    
    * Add DOAS option
    * Install sample configuration file
    
    ChangeLog: https://github.com/DtxdF/AppJail/releases/tag/v2.5.1
    
    * Fixed: incorrect directory permissions in Makefile (when installing
      AppJail using a non-root user, a Permission denied error may occur,
      especially when using DESTDIR).
    * Changed: ${.ALLSRC} to ${TARGETS} to correctly strip them in
      libexec/appjail-config/Makefile:strip).
    
    PR:             271740
---
 sysutils/appjail/Makefile  | 19 +++++++++++++------
 sysutils/appjail/distinfo  |  6 +++---
 sysutils/appjail/pkg-plist | 18 +++++++++++++++++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile
index 39a5955e67e6..c1e88a44951e 100644
--- a/sysutils/appjail/Makefile
+++ b/sysutils/appjail/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	appjail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.0
-PORTREVISION=	1
+DISTVERSION=	2.5.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	DtxdF@disroot.org
@@ -11,23 +10,31 @@ 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 <bsd.port.mk>
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
@@ -46,7 +46,6 @@ libexec/appjail/network/network
 %%DATADIR%%/files/rctl-resources
 %%DATADIR%%/files/rctl-subjects
 %%DATADIR%%/lib/atexit
-%%DATADIR%%/lib/cache
 %%DATADIR%%/lib/check_func
 %%DATADIR%%/lib/colors
 %%DATADIR%%/lib/copy
@@ -117,3 +116,20 @@ libexec/appjail/network/network
 %%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