From nobody Thu Dec 07 19:26:02 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 4SmPQ26SyTz53Tdk; Thu, 7 Dec 2023 19:26:02 +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 4SmPQ25w5hz4lT7; Thu, 7 Dec 2023 19:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701977162; 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=defrPAM78R8ncZ2y9B2Fu2Ckm2JsA/73Ov+3GV18TcY=; b=UvTXVlIcIdOx/+CM6yp7mj0sIMqFcJO7C4evk0igWlqlD93/YvBGun1LccDLXBpToSc8oY JmiXYLKVtjZJvbWyQBAeMKtKIAtxZvdEqFjSxPCaVIC4CW34NpXe5c8UY4B9wkLr2lXS6s KRTp7154j6Mx9zui6e3Vh3YIaEAIrfebY2DABwNtOjLxJTaSdAo6vQWWQPPDLbt3+tKQcM VSjRDxfIO165OjcMK6/C+iMlS8WR+SWNHgKMrPQMeLY68Jcmn9bELZROchRdFkTvq8Kl+g MCaWYx40D4WZqNhWJUdOiGhmiPT0uM50P/iLtdpbTuh+7Y4eNprAZKRzCEakhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701977162; a=rsa-sha256; cv=none; b=RAwA+b0gpJGhSeniiWqzvOOiMYD1hF9Tx9JuRUwpZodBsPlNgbPEjrkOwqslZDx7NkTQFx +Wnza4KI45uLsVy7siuBeslBGAMNDbhmh1cM+wFlvaFiR1h73YDYTQQvUh0JRvQ+C8fP5E ji4ff8eCCdE+1imDCXQ8hnyEC+0yuUivL0gz/maSvt0YumeQ6zXnhZlZi1RA+WBpqhkp0M PW6TUpEl9lMOOSOGk54KN3OH5RERuQv9zNE1T/QiEjJGidgJISE9bQBx5JwcYQpj6PsyhP 2hKUoSrw5Dr/MHEfx57ZwAuOASqd6akt3yIReL4rlYFknEBo25NvHvD6nuF3hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701977162; 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=defrPAM78R8ncZ2y9B2Fu2Ckm2JsA/73Ov+3GV18TcY=; b=JW56pBpXfD1SBNsh26UQg0cVApRMkeA/10n/lXnWlS5CKZnIlTOScZM+IzZ0ugyzNQWlza 3Lna42DJMdPeQb3SLN1Y0tUpD+ByyNUydh/gWUcx4aV/+13ClDmoUpn05PsahMwYRjAuFY bA9Xk/B3WFixW0tX3DBeCnKzYQneAJf0YffqurJeLo4HHSwMmIZ4DYilKGCfYsrMFk+ofn VjuWBc2/Fl89k7WS77gJVF/oIT/Yp8rC2P92O0hA2RdHiFJqizifsv+E0M7ZW8V9UHWwTT y74wj0NP7hWh2MsCrAiki6gzpjk9hQ+UZ1FwHJyVw3ug3dYWodh8HePVEXglRA== 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 4SmPQ24xXJzq8f; Thu, 7 Dec 2023 19:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B7JQ2FF038331; Thu, 7 Dec 2023 19:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B7JQ2lG038328; Thu, 7 Dec 2023 19:26:02 GMT (envelope-from git) Date: Thu, 7 Dec 2023 19:26:02 GMT Message-Id: <202312071926.3B7JQ2lG038328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 08ed7d01655c - main - sysutils/bastille: update to 0.10.20231125 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08ed7d01655c4150a96e1c49bdab87711a952df4 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=08ed7d01655c4150a96e1c49bdab87711a952df4 commit 08ed7d01655c4150a96e1c49bdab87711a952df4 Author: Fernando Apesteguía AuthorDate: 2023-12-06 18:54:08 +0000 Commit: Fernando Apesteguía CommitDate: 2023-12-07 19:25:47 +0000 sysutils/bastille: update to 0.10.20231125 While here do not override upstream rc script PR: 274993 Reported by: dsh@bamus.cz Approved by: christer.edwards@gmail.com (maintainer) --- sysutils/bastille/Makefile | 22 ++++++++----- sysutils/bastille/distinfo | 6 ++-- sysutils/bastille/files/bastille.in | 61 ------------------------------------- sysutils/bastille/pkg-plist | 2 ++ 4 files changed, 20 insertions(+), 71 deletions(-) diff --git a/sysutils/bastille/Makefile b/sysutils/bastille/Makefile index 5f6ad80611d0..db5cce1ae02f 100644 --- a/sysutils/bastille/Makefile +++ b/sysutils/bastille/Makefile @@ -1,5 +1,5 @@ PORTNAME= bastille -DISTVERSION= 0.10.20231013 +DISTVERSION= 0.10.20231125 CATEGORIES= sysutils MAINTAINER= christer.edwards@gmail.com @@ -15,17 +15,25 @@ GH_ACCOUNT= bastillebsd NO_BUILD= yes NO_ARCH= yes -USE_RC_SUBR= bastille +post-patch: + @${REINPLACE_CMD} \ + -e 's|/usr/local/etc/bastille|${ETCDIR}|g' \ + -e 's|/usr/local|${PREFIX}|g' \ + ${WRKSRC}/usr/local/etc/rc.d/bastille do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PREFIX}/bin/bastille ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/usr/local/bin/bastille ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/usr/local/etc/rc.d/bastille \ + ${STAGEDIR}${PREFIX}/etc/rc.d post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/${DATADIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) - ${INSTALL_MAN} ${WRKSRC}/${PREFIX}/man/man8/bastille.8.gz \ - ${STAGEDIR}${PREFIX}/man/man8/bastille.8.gz - ${INSTALL_DATA} ${WRKSRC}/${ETCDIR}/bastille.conf.sample ${STAGEDIR}${ETCDIR}/bastille.conf.sample + (cd ${WRKSRC}/usr/local/share/bastille && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/bastille.8.gz \ + ${STAGEDIR}${PREFIX}/man/man8/${PORTNAME}.8.gz + ${INSTALL_DATA} ${WRKSRC}/usr/local/etc/bastille/bastille.conf.sample \ + ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample .include diff --git a/sysutils/bastille/distinfo b/sysutils/bastille/distinfo index 664e880cdb3b..34613e6c4577 100644 --- a/sysutils/bastille/distinfo +++ b/sysutils/bastille/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697592468 -SHA256 (bastillebsd-bastille-0.10.20231013_GH0.tar.gz) = 46b431dccbf36363b9f396f5ea32fb6899c8b210973c6683acef401cd25414df -SIZE (bastillebsd-bastille-0.10.20231013_GH0.tar.gz) = 622679 +TIMESTAMP = 1701531665 +SHA256 (bastillebsd-bastille-0.10.20231125_GH0.tar.gz) = 10ff52d33278d15af573173a3985381edb020add99c44d14942c3288f65c36e8 +SIZE (bastillebsd-bastille-0.10.20231125_GH0.tar.gz) = 625906 diff --git a/sysutils/bastille/files/bastille.in b/sysutils/bastille/files/bastille.in deleted file mode 100644 index 17cf0df34948..000000000000 --- a/sysutils/bastille/files/bastille.in +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -# Bastille jail startup script - -# PROVIDE: bastille -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# Add the following to /etc/rc.conf[.local] to enable this service -# -# bastille_enable (bool): Set to NO by default. -# Set it to YES to enable bastille. -# bastille_list (string): Set to "ALL" by default. -# Space separated list of jails to start. -# - -. /etc/rc.subr - -name=bastille -rcvar=${name}_enable - -: ${bastille_enable:=NO} -: ${bastille_list:="ALL"} - -command=%%PREFIX%%/bin/${name} -start_cmd="bastille_start" -stop_cmd="bastille_stop" -restart_cmd="bastille_stop && bastille_start" - -bastille_start() -{ - if [ ! -n "${bastille_list}" ]; then - echo "${bastille_list} is undefined" - return 1 - fi - - local _jail - - for _jail in ${bastille_list}; do - echo "Starting Bastille Jail: ${_jail}" - ${command} start ${_jail} - done -} - -bastille_stop() -{ - if [ ! -n "${bastille_list}" ]; then - echo "${bastille_list} is undefined" - return 1 - fi - - local _jail - - for _jail in ${bastille_list}; do - echo "Stopping Bastille Jail: ${_jail}" - ${command} stop ${_jail} - done -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/bastille/pkg-plist b/sysutils/bastille/pkg-plist index 5333941b4ce1..5b18f11da79b 100644 --- a/sysutils/bastille/pkg-plist +++ b/sysutils/bastille/pkg-plist @@ -1,5 +1,6 @@ @sample %%ETCDIR%%/bastille.conf.sample bin/bastille +etc/rc.d/bastille %%DATADIR%%/bootstrap.sh %%DATADIR%%/clone.sh %%DATADIR%%/cmd.sh @@ -19,6 +20,7 @@ bin/bastille %%DATADIR%%/list.sh %%DATADIR%%/mount.sh %%DATADIR%%/pkg.sh +%%DATADIR%%/rcp.sh %%DATADIR%%/rdr.sh %%DATADIR%%/rename.sh %%DATADIR%%/restart.sh