Date: Tue, 7 Feb 2023 14:46:08 GMT From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2ac08014336f - 2023Q1 - sysutils/cbsd: Update to 13.1.22 Message-ID: <202302071446.317Ek854060789@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ac08014336fbe5ac045aea27bc18a619f79eb6e commit 2ac08014336fbe5ac045aea27bc18a619f79eb6e Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2023-02-07 14:44:44 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2023-02-07 14:46:04 +0000 sysutils/cbsd: Update to 13.1.22 Changes: https://github.com/cbsd/cbsd/releases/tag/v13.1.22 (cherry picked from commit 9579e6273dbf8b243f3f15a9560e31ac24082d13) --- sysutils/cbsd/Makefile | 2 +- sysutils/cbsd/distinfo | 6 +++--- sysutils/cbsd/files/cbsd-statsd-bhyve.in | 4 ++-- sysutils/cbsd/files/cbsd-statsd-jail.in | 16 ++++++++++------ sysutils/cbsd/pkg-plist | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 03573641a5e6..f03bd509102c 100644 --- 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 index 72a67c81ae74..63d8ad5ed359 100644 --- 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 index 6aa40abc7f8f..be56087326c1 100644 --- 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 index e650b07ab252..d109f76ebbbd 100644 --- 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 index bf81ea105589..d34bc72d4895 100644 --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302071446.317Ek854060789>