From nobody Thu Jun 01 22:30:07 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXLRh2ZT0z4YWPZ; Thu, 1 Jun 2023 22:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXLRg2qTFz4Nw4; Thu, 1 Jun 2023 22:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685658607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnWQeNSZxK72Ysbxt7+hO7ZF4vy8oXpJY5JxGlzOhW0=; b=nniDbvt6B5zDAoj73Yo9KXOgfyy8I1LeLysb8zvm7sBUSnq+3SJIHrmBwJ+vPzJucxieSv 1lfX3ptaCWfM+f5NwSWZdX/G4o+1YaNmw8sUJJlvSc/oFp2ThFRM0MDu1OkCfiszV9e4Py HeakNWFSNgUiONAo1LNK6yRa0ydhp1hrZNb0XO5a1rGc3vb92teeU1R+kcbIf4gzz3Vbas Cz3KD1ydtKSE9ah/ouSuUZri6o5faiis8UyP1IZcGQdWHlmptfupimZtT1yCoQBeoiLFU1 doCw6egiq0V890MnRpr3pdi0bhTxzimXgIzTNRi7B8ft6AJUPQ7dgw3mXIadcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685658607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AnWQeNSZxK72Ysbxt7+hO7ZF4vy8oXpJY5JxGlzOhW0=; b=CHJN00N9nQ3jPM1xiETAsFBrleBszLdQcD7PUhyq3NzoptgXR43CIrcU7kpQg/uONHA7y3 zXJnIjWyEMjyHQuxFlfGf4tB5CsqHoslKV9rQsQxPGZK5WMDZ92978tlG56dEL2vSEw8Ya 4GC81vx+n8guA5v/JgQmj0+FkKXeCu0iQhUDAHJdIPEkHsPjpgrlkJufFHqkmOvzlTxIH1 a9LcMOfoTAKXdPW3V6y3BzkwMe+CmAncpGX8rdf4azjX8BT+a3jcz6oVQ0W1erzMU2luAx SOA3ScdVppMJHzjeg07WCYnDLX4wEi74Ny10amGFGgWrmgYM3zwlz1HH7lqXMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685658607; a=rsa-sha256; cv=none; b=veGmmbqM5nPYe9SQP/IWxQ+FBepoOUfB3d/7xkbtPgBnw322qL8nUYSjGeaKv0eWdTJN7r smeoHKXvKwXlY1u72qNoAYuMHY/0AZFcpLsiok2F4BE67KzWT8R788u56LDD2gwG6yppDY GcZFKrCq7GVqG/LvhmcBZ+XhdtZE8J//315Jj5KbgXxSTy+NpRGQTlWSbakEUfl9o3EviC dJn+k71mLRd4GEhEskU0uivKJX1OgtZXVstsu8DUEIjwu4tkv8os+nU7RScQkCXppPFvvk EyCBNeOXnUbUpSRrlHiRCiEGzchfGB05ICyzfDIqHay88Z4nIgRAFTiQ3MZHyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXLRg1xbNzZRJ; Thu, 1 Jun 2023 22:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 351MU7p1098432; Thu, 1 Jun 2023 22:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 351MU7nA098429; Thu, 1 Jun 2023 22:30:07 GMT (envelope-from git) Date: Thu, 1 Jun 2023 22:30:07 GMT Message-Id: <202306012230.351MU7nA098429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: ee14808e026b - main - sysutils/appjail: Update to 2.5.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee14808e026b8f9ba001bbff298a75068d86d835 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2023-05-30 22:49:35 +0000 Commit: Robert Clausecker 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 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