git: abc23121fc8a - main - sysutils/appjail-devel: update to g20230518
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 May 2023 17:22:46 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=abc23121fc8a87c565e96378cb5aa2f4d9d79d81
commit abc23121fc8a87c565e96378cb5aa2f4d9d79d81
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-05-18 17:19:59 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-05-18 17:19:59 +0000
sysutils/appjail-devel: update to g20230518
- Add macaddr option
- Remove unnecessary parameters description for ip4
- Add appjail-config to uninstall target
- Add execution bit permission to ajconf.sh
- Install with the correct permissions
- Add support for unprivileged users
- Add support for unprivileged users in appjail-config
---
sysutils/appjail-devel/Makefile | 14 +++++++++++---
sysutils/appjail-devel/distinfo | 6 +++---
sysutils/appjail-devel/files/pkg-message.in | 17 +++++++++++++++++
sysutils/appjail-devel/pkg-plist | 6 ++++++
4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/sysutils/appjail-devel/Makefile b/sysutils/appjail-devel/Makefile
index acf9165b0da7..dd32ec6f4f57 100644
--- a/sysutils/appjail-devel/Makefile
+++ b/sysutils/appjail-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= appjail
DISTVERSIONPREFIX= v
-DISTVERSION= g20230515
+DISTVERSION= g20230518
CATEGORIES= sysutils
PKGNAMESUFFIX= -devel
@@ -16,19 +16,27 @@ CONFLICTS= appjail
USE_GITHUB= yes
GH_ACCOUNT= DtxdF
GH_PROJECT= AppJail
-GH_TAGNAME= f32080a9de86dfe1acd80b8728ad637994227a9a
+GH_TAGNAME= 357c296ed3d9e1b5e0bca0caec726c14bc79d35b
ALL_TARGET= utils-strip
PORTDOCS= README.md
-OPTIONS_DEFINE= DEBOOTSTRAP DOCS GIT
+SUB_FILES= pkg-message
+
+OPTIONS_DEFINE= DEBOOTSTRAP DOCS DOAS GIT
DEBOOTSTRAP_DESC= Support for Debian and Ubuntu jails
DEBOOTSTRAP_RUN_DEPENDS= debootstrap>0:sysutils/debootstrap
+DOAS_DESC= Add support for unprivileged users
+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/appjail/files/default.conf ${STAGEDIR}/${ETCDIR}/appjail.conf.sample
+
.include <bsd.port.mk>
diff --git a/sysutils/appjail-devel/distinfo b/sysutils/appjail-devel/distinfo
index 3d3f62bcad20..e0c501cc9e80 100644
--- a/sysutils/appjail-devel/distinfo
+++ b/sysutils/appjail-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684183081
-SHA256 (DtxdF-AppJail-vg20230515-f32080a9de86dfe1acd80b8728ad637994227a9a_GH0.tar.gz) = 02d7bcb524f365ae0877510f5e9976b75cfe0193cfa68f598c6978957cc08b64
-SIZE (DtxdF-AppJail-vg20230515-f32080a9de86dfe1acd80b8728ad637994227a9a_GH0.tar.gz) = 215866
+TIMESTAMP = 1684429726
+SHA256 (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 2d4d35efac3958f233784f5af14489e9d03b748ab40be824df0fd7188a8d1956
+SIZE (DtxdF-AppJail-vg20230518-357c296ed3d9e1b5e0bca0caec726c14bc79d35b_GH0.tar.gz) = 217462
diff --git a/sysutils/appjail-devel/files/pkg-message.in b/sysutils/appjail-devel/files/pkg-message.in
new file mode 100644
index 000000000000..2e6f931bdfd0
--- /dev/null
+++ b/sysutils/appjail-devel/files/pkg-message.in
@@ -0,0 +1,17 @@
+[
+{ type: install
+ message: <<EOM
+AppJail was installed
+
+1) All information about like use and configure appjail can be found at the
+ following url:
+
+ https://github.com/DtxdF/AppJail/blob/main/README.md
+
+2) A configuration file sample was installed to %%ETCDIR%%. Change it accord to
+ your own needs
+
+3) Enjoy it
+EOM
+}
+]
diff --git a/sysutils/appjail-devel/pkg-plist b/sysutils/appjail-devel/pkg-plist
index 1509b85f8231..b6df54381812 100644
--- a/sysutils/appjail-devel/pkg-plist
+++ b/sysutils/appjail-devel/pkg-plist
@@ -1,6 +1,9 @@
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-natnet
libexec/appjail/appjail-config/appjail-config
@@ -114,12 +117,15 @@ libexec/appjail/network/network
%%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/ajuser.sh
%%DATADIR%%/scripts/ascii2oct.sh
%%DATADIR%%/scripts/dns.sh
%%DATADIR%%/scripts/get_depends.sh
%%DATADIR%%/scripts/run_init.sh
%%DATADIR%%/scripts/run_jail.sh
+%%DATADIR%%/scripts/runas.sh
%%EXAMPLESDIR%%/templates/bridge.conf
%%EXAMPLESDIR%%/templates/linux.conf
%%EXAMPLESDIR%%/templates/vnet.conf