git: 05cd597bc448 - main - sysutils/reggae: Update to 0.3.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Feb 2023 19:07:02 UTC
The branch main has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=05cd597bc448027ced0af7b4b055da56be371cca
commit 05cd597bc448027ced0af7b4b055da56be371cca
Author: Goran Mekić <meka@tilda.center>
AuthorDate: 2023-02-14 17:14:31 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
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