From nobody Tue Feb 07 14:46:08 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 4PB5Xw3Vbwz3n461; Tue, 7 Feb 2023 14:46:08 +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 4PB5Xw2dVmz3mJ3; Tue, 7 Feb 2023 14:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675781168; 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=Gsev1TYzatZKXucjFtEEzYaDbYU1/9Y/APQw7hGseko=; b=kS6mvC1Fa0NVA36YcrNxJx6V17XsMEY+yFHZQdq7MHfcIyP2MesLYNUPGuQ3JljNIkduFb N5DZ8/G66hrpPjpOpSMKwVUuoyBVfmrFycwvnNG3eEHx7tMrqO6RGn2foUktF+qdhumE/Y AuAVdFhGznN51SqYCXhIiZu6V9SYH9Z9NZFItJXw0/cE/8DMixyTQ4na0j0lPtGnewltZe PLMHBX/JOvZeqjrKBR/2TMWjAs2X6Dk0K7ujTp381ZQNe+1o0psss4qlAwnKdAawRyN2gG wpoPEWLR18GLb15gexiEzTM+lZj5rOJp47ysO6UKjTTeHk9YXc2KfOtn6c6C3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675781168; 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=Gsev1TYzatZKXucjFtEEzYaDbYU1/9Y/APQw7hGseko=; b=XuctGG0VvYeIssZ7zbZzioD1i+qadaPdruW52WLApiWWq4SaLkpEMax9Xjs/e6ntRBgBob ceUkbhLIC+UhhxRlptbed3GE73M4Dutx3QxYRfiRu7C7lX+BhFvE13PsjD0lmalngUtcd7 T3l+i4y0SqDz3oXMkvhTACoh7JUdJEHIXasrk6se9cUAGLy9xcbnpj+uc8rNLNxnQSCmhy aLgCGhdK6EktDS9EjU7j+9M53hJ2pX2doIEtgiPSpMtm3N2L0pABYSEqZgr3H0azvQeh71 sB9fyp8bgLynSdrE81ZtcO9Y5MB5uoe4WOnqDLPM5wKmyBALtJgeDDhoQj2rBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675781168; a=rsa-sha256; cv=none; b=yTlL3vyfeNwOgwG4f/cz9jCxeYKX4NPqLLcazkmWKWsajGcOd0zNkGQZnXlwx03NPrb1bM Sq8AVhyUgpJSqlAeIA1w7RSfIDaLoMK8BUa3mRSD8vdH7Ld54z+NBa/b9BpqIMimCc9pUd Imu5zR+6kj+ziPuUK9BOPpvoZRJNaqOstq2FDK0W+arDVleIYCb2HMO+MuKCg3ygEQSTiv 3FjyNZdQpcxLeu6Ix6an5PUCjXr5ueFmhrmboJAWkoQudsaZe9GGg5Of/ACRc/75LwRuEY t3bJSf5hkF0lVBNBt1NWlwCO/Z4r+FDfaPL/JVtFEeMO8/7EA+uCHMzv0zFTtA== 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 4PB5Xw1gxjzKry; Tue, 7 Feb 2023 14:46:08 +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 317Ek8Ai060790; Tue, 7 Feb 2023 14:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317Ek854060789; Tue, 7 Feb 2023 14:46:08 GMT (envelope-from git) Date: Tue, 7 Feb 2023 14:46:08 GMT Message-Id: <202302071446.317Ek854060789@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: 2ac08014336f - 2023Q1 - sysutils/cbsd: Update to 13.1.22 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: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 2ac08014336fbe5ac045aea27bc18a619f79eb6e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ac08014336fbe5ac045aea27bc18a619f79eb6e commit 2ac08014336fbe5ac045aea27bc18a619f79eb6e Author: Kirill Ponomarev AuthorDate: 2023-02-07 14:44:44 +0000 Commit: Kirill Ponomarev 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