sysutils/cbsd: Update to 13.1.22

Changes: https://github.com/cbsd/cbsd/releases/tag/v13.1.22
freebsd · Feb 7, 2023 · 9579e62 · 9579e62
1 parent 239a9eb
commit 9579e62
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	13.1.21
+DISTVERSION=	13.1.22
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru

diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673263052
-SHA256 (cbsd-cbsd-13.1.21_GH0.tar.gz) = 5db2d3039b9d33f2eed4564508ee2e8ba2d5fba7ca9fd23a38edf5da867ff07f
-SIZE (cbsd-cbsd-13.1.21_GH0.tar.gz) = 6491392
+TIMESTAMP = 1675691336
+SHA256 (cbsd-cbsd-13.1.22_GH0.tar.gz) = 690102d823657f7ba0fdc85ee5a01f45bfb7a32f1886b9abb101c537cad8faf1
+SIZE (cbsd-cbsd-13.1.22_GH0.tar.gz) = 6495176
diff --git a/sysutils/cbsd/files/cbsd-statsd-bhyve.in b/sysutils/cbsd/files/cbsd-statsd-bhyve.in
@@ -40,14 +40,14 @@ if [ ! -f ${subr} ]; then
 fi
 
 . ${globalconf}
-. ${subr}
+. ${subrdir}/nc.subr
 
 cbsd_statsd_bhyve_start()
 {
 	local args= racct_enabled=
 
 	# RACCT enabled?
-	racct_enabled=$( /sbin/sysctl -qn kern.racct.enable )
+	racct_enabled=$( sysctl -qn kern.racct.enable )
 	[ $? -ne 0 ] && err 1 "cbsd-statsd-bhyve: RACCT not enabled"
 	[ "${racct_enabled}" != "1" ] && err 1 "cbsd-statsd-bhyve: RACCT not enabled"
 

diff --git a/sysutils/cbsd/files/cbsd-statsd-jail.in b/sysutils/cbsd/files/cbsd-statsd-jail.in
@@ -24,11 +24,9 @@ restart_cmd=${name}_restart
 extra_commands="restart"
 
 command="%%PREFIX%%/cbsd/tools/racct-jail-statsd"
-pidfile="/var/run/$name.pid"
+pidfile="${cbsd_workdir}/var/run/${name}.pid"
 command_args="&"
 
-pidfile=/var/run/racct-jail-statsd.pid
-
 if [ ! -f ${globalconf} ]; then
 	echo "cbsd: no such ${globalconf}";
 	exit 1
@@ -40,14 +38,14 @@ if [ ! -f ${subr} ]; then
 fi
 
 . ${globalconf}
-. ${subr}
+. ${subrdir}/nc.subr
 
 cbsd_statsd_jail_start()
 {
-	local args= racct_enabled=
+	local args= racct_enabled= pool_name= prometheus_listen4= prometheus_listen6= prometheus_port=
 
 	# RACCT enabled?
-	racct_enabled=$( /sbin/sysctl -qn kern.racct.enable )
+	racct_enabled=$( sysctl -qn kern.racct.enable )
 	[ $? -ne 0 ] && err 1 "cbsd-statsd-jail: RACCT not enabled"
 	[ "${racct_enabled}" != "1" ] && err 1 "cbsd-statsd-jail: RACCT not enabled"
 
@@ -56,6 +54,12 @@ cbsd_statsd_jail_start()
 	[ -n "${log_level}" ] && args="${args} --log_level=${log_level}"
 	[ -n "${loop_interval}" ] && args="${args} --loop_interval=${loop_interval}"
 	[ -n "${save_loop_count}" ] && args="${args} --save_loop_count=${save_loop_count}"
+	[ -z "${pool_name}" ] && pool_name=$( hostname )
+	[ -n "${pool_name}" ] && args="${args} --pool_name=${pool_name}"
+	[ -n "${prometheus_listen4}" ] && args="${args} --prometheus_listen4=${prometheus_listen4}"
+	[ -n "${prometheus_listen6}" ] && args="${args} --prometheus_listen6=${prometheus_listen6}"
+	[ -z "${prometheus_port}" ] && prometheus_port=9999
+	[ -n "${prometheus_port}" ] && args="${args} --prometheus_port=${prometheus_port}"
 
 	case "${prometheus_exporter_enable}" in
 		[Yy][Ee][Ss])

diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
@@ -202,7 +202,7 @@ cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.0-LATEST.conf
 cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-22.conf
 cbsd/etc/defaults/vm-freebsd-HardenedBSD-x64-13-STABLE.conf
 cbsd/etc/defaults/vm-freebsd-MidnightBSD-x64-2.conf
-cbsd/etc/defaults/vm-freebsd-OPNsense-22-RELEASE-amd64.conf
+cbsd/etc/defaults/vm-freebsd-OPNsense-23-RELEASE-amd64.conf
 cbsd/etc/defaults/vm-freebsd-TrueNAS-CORE-x64-13.conf
 cbsd/etc/defaults/vm-freebsd-XigmaNAS-13.conf
 cbsd/etc/defaults/vm-freebsd-cloud-firestarter-ufs-x64-14.conf
@@ -970,6 +970,7 @@ cbsd/system/unregister_base
 cbsd/system/unregister_kernel
 cbsd/system/upgrade
 cbsd/system/world
+cbsd/tools/apply
 cbsd/tools/attachgeli
 cbsd/tools/attachzfs
 cbsd/tools/bases