From nobody Tue Feb 14 19:07:02 2023 X-Original-To: dev-commits-ports-all@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 4PGW0l1sJ7z3prqy; Tue, 14 Feb 2023 19:07:03 +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 4PGW0k6YWPz3qXw; Tue, 14 Feb 2023 19:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676401622; 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=nmcHsMY5hA8fcvni48jclTu0uYr6Uhjdf4/xgKxOwQY=; b=NgqbiYaGVAa2CkARsHIWQabrCkTBHja4XcgLuXiLUm7sqKEIGsFhiyANOcO2U6FLszu4j0 L0DXjF1lN4C/vQltAJ2UvcSwQ3H0EC1Jc28mlbBo/Zc3ep4FDUaF+BXzEFu48ZMouVcgev 1BM0qGmtDA+Q1izZvBcE84vQtsNl3CnMuAjCehlaeNQTFXjSkauNQUB+p+rjQUkEjJDPAL QkJcGtR3q0udmvOG96RB67Olq7j2C+/cqIpySGW4H1gcTDwDeUdy5U96iFIoRM4Ab0EWA5 cnjuN0JeprdylVMGellDT1E/CBGZ/V/7IHBfO4XdxHUPmv2CUZCnLRa3I98Wbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676401622; 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=nmcHsMY5hA8fcvni48jclTu0uYr6Uhjdf4/xgKxOwQY=; b=RMreakflZu1i/KYfao6Xte30yVzzF/lKJmkxbWT8eERUb83BAKXwt5LwHd0BFdrCfLrpMA C/PHBT0PzpXNh3Ch3phLR5jzGJjkE0M1w2s0wfsk/Xv3yR9oIETOW9UL24z8yC+t9sUo9a ZEqgSCWkfG1uFhSoi2vk9tNtFq8aIxlmm8hEeaJ131dz1XruufEq7Borsxmw0CBS8KUa8D Ong8iat/FdR3cUmFJSFJXZb7fw8YDttsH6yx/HoNk1fd00VbnxCFSQ8sPsj4YzA32m1JUt n+cPquGsvG+kTWIvGgIRRuJZ/EPVV8bZDG7veaejnpohwjCNtUAuBZMnQJbTTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676401622; a=rsa-sha256; cv=none; b=pI69+Rned+gaRt7B9yYuEW0kB9lhBODgIBL8HkLhf+aRPe03S4quBr9RJjelXOs2qR/apE wjtApU9MxjkMdFHte5IccFjG8x37WIY6R35WZATk9XVMrIxY+I156ffXGZ9w4eEp133VHN KclwpNc6i8xrCBzDJ0ZXlMQedL4AMTMwgu4dp7VRHC3fTr+LP+3wsBnNkpMvc8vimIgUtv pcpQV/wfkj8PLZRWqo4q5GPdY4MeZyJEEcsmOhNJblp1rbUi1WQxw3ZQ7cWKZu5ReAhFtb P1BYOrTlTlyJyk4mCpVUmXxOYvHy9RFTwrGvsI5KsLb5+keHz7M6BnjyU2a/jQ== 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 4PGW0k5fqcz190s; Tue, 14 Feb 2023 19:07:02 +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 31EJ72bU045988; Tue, 14 Feb 2023 19:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EJ72Fd045987; Tue, 14 Feb 2023 19:07:02 GMT (envelope-from git) Date: Tue, 14 Feb 2023 19:07:02 GMT Message-Id: <202302141907.31EJ72Fd045987@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 05cd597bc448 - main - sysutils/reggae: Update to 0.3.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 05cd597bc448027ced0af7b4b055da56be371cca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=05cd597bc448027ced0af7b4b055da56be371cca commit 05cd597bc448027ced0af7b4b055da56be371cca Author: Goran Mekić AuthorDate: 2023-02-14 17:14:31 +0000 Commit: Fernando Apesteguía CommitDate: 2023-02-14 19:02:41 +0000 sysutils/reggae: Update to 0.3.0 ChangeLog: https://github.com/cbsd/reggae/releases/tag/0.3.0 * Support jail.conf * Enable pkg-upgrade command for base jails * Support base and cbsd jails with PKG_PROXY * Improve registration in DNS/PF * Remove non-VNET registration script * Improve documentation * Use jexec in order to support base jails PR: 269544 Reported by: meka@tilda.center (maintainer) --- sysutils/reggae/Makefile | 5 ++--- sysutils/reggae/distinfo | 6 +++--- sysutils/reggae/pkg-plist | 16 +++++++++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/sysutils/reggae/Makefile b/sysutils/reggae/Makefile index ce8a2e91e573..021ada95d758 100644 --- a/sysutils/reggae/Makefile +++ b/sysutils/reggae/Makefile @@ -1,5 +1,5 @@ PORTNAME= reggae -DISTVERSION= 0.2.8 +DISTVERSION= 0.3.0 CATEGORIES= sysutils MAINTAINER= meka@tilda.center @@ -9,8 +9,7 @@ WWW= https://github.com/cbsd/reggae LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${LOCALBASE}/bin/cbsd:sysutils/cbsd \ - sudo:security/sudo +RUN_DEPENDS= sudo:security/sudo USE_GITHUB= yes GH_ACCOUNT= cbsd diff --git a/sysutils/reggae/distinfo b/sysutils/reggae/distinfo index 1514210dbce6..d09ed68e7e80 100644 --- a/sysutils/reggae/distinfo +++ b/sysutils/reggae/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673309915 -SHA256 (cbsd-reggae-0.2.8_GH0.tar.gz) = 1d1ebc9f3920b04f5caf2f8d6ae2f4601d12729067a3ffbbe9598f904b6b95b7 -SIZE (cbsd-reggae-0.2.8_GH0.tar.gz) = 50875 +TIMESTAMP = 1676362530 +SHA256 (cbsd-reggae-0.3.0_GH0.tar.gz) = f14b6b905365930798089cf3b4e390f5ada6ef8ae15e762c16fc6c7e24b9a81e +SIZE (cbsd-reggae-0.3.0_GH0.tar.gz) = 54224 diff --git a/sysutils/reggae/pkg-plist b/sysutils/reggae/pkg-plist index 6ef6f9b5f99f..7fc3ca8574d3 100644 --- a/sysutils/reggae/pkg-plist +++ b/sysutils/reggae/pkg-plist @@ -42,10 +42,8 @@ man/man1/reggae.1.gz %%DATADIR%%/cbsd-profile/system/facts.d/reggae_ip %%DATADIR%%/cbsd-profile/system/master_create.d/placeholder %%DATADIR%%/cbsd-profile/system/master_poststart.d/placeholder -%%DATADIR%%/cbsd-profile/system/master_poststop.d/deregister.sh %%DATADIR%%/cbsd-profile/system/master_poststop.d/placeholder %%DATADIR%%/cbsd-profile/system/master_prestart.d/placeholder -%%DATADIR%%/cbsd-profile/system/master_prestart.d/register.sh %%DATADIR%%/cbsd-profile/system/master_prestop.d/placeholder %%DATADIR%%/cbsd-profile/system/remove.d/placeholder %%DATADIR%%/cbsd-profile/system/rename.d/placeholder @@ -54,7 +52,9 @@ man/man1/reggae.1.gz %%DATADIR%%/id_rsa %%DATADIR%%/id_rsa.pub %%DATADIR%%/mk/ansible.mk +%%DATADIR%%/mk/base-jail.mk %%DATADIR%%/mk/bhyve-service.mk +%%DATADIR%%/mk/cbsd-jail.mk %%DATADIR%%/mk/chef.mk %%DATADIR%%/mk/common.mk %%DATADIR%%/mk/frameworks/freenit.project.mk @@ -69,23 +69,27 @@ man/man1/reggae.1.gz %%DATADIR%%/mk/shell.mk %%DATADIR%%/mk/use.mk %%DATADIR%%/scripts/apply-proxy.sh +%%DATADIR%%/scripts/base-init.sh +%%DATADIR%%/scripts/base-network-init.sh %%DATADIR%%/scripts/bhyve-init.sh %%DATADIR%%/scripts/cbsd-init.sh +%%DATADIR%%/scripts/cbsd-network-init.sh %%DATADIR%%/scripts/chef-provision.sh %%DATADIR%%/scripts/default.conf %%DATADIR%%/scripts/expect-run.sh %%DATADIR%%/scripts/get-config.sh %%DATADIR%%/scripts/get-ip.sh +%%DATADIR%%/scripts/host-init.sh %%DATADIR%%/scripts/import.sh %%DATADIR%%/scripts/init.sh -%%DATADIR%%/scripts/master-init.sh +%%DATADIR%%/scripts/mkjail.sh %%DATADIR%%/scripts/network-init.sh %%DATADIR%%/scripts/pf.sh %%DATADIR%%/scripts/pkg-upgrade.sh %%DATADIR%%/scripts/project-init.sh %%DATADIR%%/scripts/puppet-provision.sh %%DATADIR%%/scripts/read-pass.sh -%%DATADIR%%/scripts/register.sh +%%DATADIR%%/scripts/rmjail.sh %%DATADIR%%/scripts/salt-provision.sh %%DATADIR%%/scripts/scp.sh %%DATADIR%%/scripts/service.sh @@ -109,6 +113,7 @@ man/man1/reggae.1.gz %%DATADIR%%/templates/ansible/group_vars/all.tpl %%DATADIR%%/templates/ansible/inventory.local.tpl %%DATADIR%%/templates/ansible/inventory.remote.tpl +%%DATADIR%%/templates/base-jail.conf %%DATADIR%%/templates/cbsd-bhyve.freebsd.conf.tpl %%DATADIR%%/templates/cbsd-vnet.conf.tpl %%DATADIR%%/templates/cbsd.conf.tpl @@ -134,6 +139,7 @@ man/man1/reggae.1.gz %%DATADIR%%/templates/mount-project.sh %%DATADIR%%/templates/netif %%DATADIR%%/templates/network +%%DATADIR%%/templates/network-jail.conf %%DATADIR%%/templates/nsd.conf %%DATADIR%%/templates/pf.conf %%DATADIR%%/templates/pkg.conf @@ -144,6 +150,6 @@ man/man1/reggae.1.gz %%DATADIR%%/templates/setup-vm.sh %%DATADIR%%/templates/sudoers %%DATADIR%%/templates/unbound.conf -%%DATADIR%%/templates/unbound_cbsd.conf %%DATADIR%%/templates/unbound_control.conf +%%DATADIR%%/templates/unbound_reggae.conf %%DATADIR%%/templates/xorg.sh