git: 4f460d5821cf - main - sysutils/appjail: Update to 2.6.0

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Tue, 04 Jul 2023 15:16:44 UTC
The branch main has been updated by fernape:

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

commit 4f460d5821cf02f5462ff9e173d4e15a6b3fbed8
Author:     Jesús Daniel Colmenares Oviedo <DtxdF@disroot.org>
AuthorDate: 2023-07-04 06:08:32 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-07-04 15:16:30 +0000

    sysutils/appjail: Update to 2.6.0
    
    ChangeLog: https://github.com/DtxdF/AppJail/releases/tag/v2.6.0
    
    * Added: force, recursive and force+recursive flags to overwrite the jail in
      appjail quick.
    * Added: -g parameter to appjail logs remove to enable shell glob patterns.
    * Added: --clean parameter in PKG.
    * Added: Images to Features.
    * Added: warning for when removing installed images and Makejails in README.
    * Added: option for update all installed Makejails.
    * Added: more information to update Makejails manually.
    * Improved: killing processes in appjail healthcheck and appjail startup (Simply
      killing a process is not technically correct because the process after a while
      may be another process created by another process and not by AppJail, so errors
      may occur. To fix this, only processes created by AppJail will be killed, this
      is done by comparing the parent pid with the parent pid of the process we want
      to kill.).
    * Fixed: overwriting the main log file (the main log file is overwritten every
      time any appjail's rc script is called, to avoid this, the log file is
      created only when it does not exist).
    * Added: NETWORKING keyword to appjail rc script (to ensure basic network services
      are running, including general network configuration NETWORKING has been added
      to REQUIRE).
    * Added: escape command substitution beginning with dollar sign.
    * Added: escape common characters in EXEC.
    * Removed: slash character from escape list in OPTION.
    * Added: escape slash character in some commands (escaping the slash character
      in some commands is necessary because it has a special meaning for the tokenizer).
    * Fixed: typo ${optarg} -> ${arg} in EXEC.
    * Added: FROM instruction.
    * Added: appjail image command.
    * Removed: new line in lib_strlen (the number of bytes in the lib_strlen's
      argument is incorrect as the new line is counted).
    * Added: portable option in the import+root installation method.
    * Added: conflicts for installation methods in appjail quick.
    * Fixed: typo ${fetch_args} -> ${fetch_cmd} in appjail makejail.
    * Added: portable option in the export+root installation method.
    * Fixed: typos when displaying errors after creating a directory / dataset.
    * Fixed: typo appjail-user logs -> appjail logs in Logs.
    * Added: support for appjail network in appjail quick.
    * Added: auto-create command in appjail network.
    * Added: --before-include and --after-include parameters in EXEC.
    * Added: -a and -B parameters in appjail makejail (useful for Makejail
      builders since parameters can be included in the Makejail file after
      or before the Makejail's builder is included.).
    * Created: sponsorship.
    * Documented: missing -a and -v parameters in appjail fetch destroy.
    * Documented: missing healthcheckers subtype log.
    * Added: appjail logs remove all command.
    * Added: support for appjail logs to remove a bunch of logs.
    * Obsolete: appjail config.
    
    PR:             272352
    Reported by:    DtxdF@disroot.org (maintainer)
---
 sysutils/appjail/Makefile  | 2 +-
 sysutils/appjail/distinfo  | 6 +++---
 sysutils/appjail/pkg-plist | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sysutils/appjail/Makefile b/sysutils/appjail/Makefile
index 5ac0151d317f..f97d4ab496ba 100644
--- a/sysutils/appjail/Makefile
+++ b/sysutils/appjail/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	appjail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.2
+DISTVERSION=	2.6.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/sysutils/appjail/distinfo b/sysutils/appjail/distinfo
index bbaac18b19cf..90f470ed354d 100644
--- a/sysutils/appjail/distinfo
+++ b/sysutils/appjail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685999229
-SHA256 (DtxdF-AppJail-v2.5.2_GH0.tar.gz) = 6055fa3e864b2d61534b1b98f33cfbe2197f334cc5722b2af834db8ac7c81340
-SIZE (DtxdF-AppJail-v2.5.2_GH0.tar.gz) = 234550
+TIMESTAMP = 1688398408
+SHA256 (DtxdF-AppJail-v2.6.0_GH0.tar.gz) = 1850d87587f1522903f186c3fba56563dbeaf13f4841930d8aceb4c5b716982b
+SIZE (DtxdF-AppJail-v2.6.0_GH0.tar.gz) = 249619
diff --git a/sysutils/appjail/pkg-plist b/sysutils/appjail/pkg-plist
index 9b72b4efe925..7674e7b89127 100644
--- a/sysutils/appjail/pkg-plist
+++ b/sysutils/appjail/pkg-plist
@@ -6,7 +6,6 @@ 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
@@ -134,3 +133,7 @@ libexec/appjail/appjail-config/tok
 %%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