From nobody Tue Apr 11 15:02:58 2023 X-Original-To: dev-commits-ports-branches@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 4PwpxG6BB7z450ky; Tue, 11 Apr 2023 15:02:58 +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 4PwpxG63Cyz3PdJ; Tue, 11 Apr 2023 15:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681225378; 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=Jm6EfM1l/v+r5bl9C+VcfOEdW/vbWHvOM1Y9XtEC2j8=; b=F3nwKH1RGq0jHxbbMDQDra3EpEYICX6dwA8ucxWLsKrRZihfl8PP91/gMw0Rp175qF+SON IQWyn2+/q3DtOK2IAYF4gV+uSyuwVEjpxMPpBTF/B2MSDkzypE4tdBT9e3hnsGR31kQ9vZ JndUrtBFb6YJWW3l6XkRl5g6nlmqWp9j5igjVEH5qieKNhs08F+gKolvjhvN0X8pa0Tyb2 3LFLVRlbOtu4tJ31zjIsewSawrtEb6GdRLZUFIFXYBfh7mVURIYoVXxXPFJQ590q0nRfV3 0oP+6AyaC2E69bD3sMOH1NMXRgUquQc5gCB+oEEGayaHn/OGxXW52ifvbrFRQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681225378; 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=Jm6EfM1l/v+r5bl9C+VcfOEdW/vbWHvOM1Y9XtEC2j8=; b=dl4gN8MUfGDDZVG4sf7uELRq+8gN9p4PxZO9yBVSVdzwZQoewmWZJ/nTgdFFJTIGu8wAT+ cR16pRhYzzYyyOEc4Y6WnmAbukNP/Du/NDL6VuE7A4EJV2gqlkdgaa5iwceU0NwfHyQcp8 wyhiJN6qs8h3BSZ6YWbnAlziEJsyB09GH01PqxEqAtnsgWnr5yfnlMMLx/sK/yG68nvpZQ qBt+AdIoxknhG4yUNCSwPKfMQVI+kF4+bafXK7Z5mrN8Jl9s+SUYhDn0/cyw3U6pe3xl7I tgM7ySHfhvZgp0fwFH6ZyjNFyfuwCJjIOpAhUI+/WS9EMupeUV2SloOa47aeTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681225378; a=rsa-sha256; cv=none; b=MCE42Yei4yKUZwIDHcWj68CCbCCQY+soVMiyVU23aeobyW7hHPQWDwu/3ph5Ard8cTvIwb DDiHcb27/c3/oDW60IqiqZ8R9X1a+zxsSDVkFqltmRfPhtvtd4MrxthYzr5AwPvmOUXpP8 3yFQlydeXypPwTIwECoBK+F6gambiFErafaOqQpENAxGB3I87f1Q9TQjlRLLiZY9O19aMj FqeaxSTJhrpC9Pqi9OQzIu30iXLxjmvG5VZMcNJyUKAcza/YskneeVc3roid12DeEqER8I eNvn/CjSMFuKloNWY+38gvIWSiYddJxP4asHoBaX6z4M/Qecg91sb0BPQq32RQ== 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 4PwpxG55Y6zMSK; Tue, 11 Apr 2023 15:02:58 +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 33BF2wxS079913; Tue, 11 Apr 2023 15:02:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BF2wmg079912; Tue, 11 Apr 2023 15:02:58 GMT (envelope-from git) Date: Tue, 11 Apr 2023 15:02:58 GMT Message-Id: <202304111502.33BF2wmg079912@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: a3c25f937fbb - 2023Q2 - sysutils/cbsd: Update to 13.2.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: a3c25f937fbbee25e08c4cb8e0b8f84547b5ad55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c25f937fbbee25e08c4cb8e0b8f84547b5ad55 commit a3c25f937fbbee25e08c4cb8e0b8f84547b5ad55 Author: Kirill Ponomarev AuthorDate: 2023-04-11 15:02:16 +0000 Commit: Kirill Ponomarev CommitDate: 2023-04-11 15:02:55 +0000 sysutils/cbsd: Update to 13.2.0 Changes: https://github.com/cbsd/cbsd/releases/tag/v13.2.0 (cherry picked from commit 45b352edf6d039b3fc820ca523fb7aef3c093906) --- sysutils/cbsd/Makefile | 2 +- sysutils/cbsd/distinfo | 6 ++--- sysutils/cbsd/files/cbsd-statsd-bhyve.in | 43 ++++++++++++++++++++++++++--- sysutils/cbsd/files/cbsd-statsd-hoster.in | 32 +++++++++++++++++++++- sysutils/cbsd/files/cbsd-statsd-jail.in | 39 ++++++++++++++++++++++++++- sysutils/cbsd/pkg-plist | 45 ++++++++++++++++++------------- 6 files changed, 139 insertions(+), 28 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 18aac78bbd26..64e93fafcbd4 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,5 @@ PORTNAME= cbsd -DISTVERSION= 13.1.25 +DISTVERSION= 13.2.0 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index 6b1ee9e82532..95d2b866f7d5 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678483389 -SHA256 (cbsd-cbsd-13.1.25_GH0.tar.gz) = dc005618918e9eacd3e5156ceb849aae00898d4a384ec36c8ecae859f8e2673d -SIZE (cbsd-cbsd-13.1.25_GH0.tar.gz) = 6498616 +TIMESTAMP = 1681030881 +SHA256 (cbsd-cbsd-13.2.0_GH0.tar.gz) = a6c216111874b75251df5e10da48165e15abb2903d34bf00c36bfc345f87c667 +SIZE (cbsd-cbsd-13.2.0_GH0.tar.gz) = 6503615 diff --git a/sysutils/cbsd/files/cbsd-statsd-bhyve.in b/sysutils/cbsd/files/cbsd-statsd-bhyve.in index be56087326c1..14de0265d510 100644 --- a/sysutils/cbsd/files/cbsd-statsd-bhyve.in +++ b/sysutils/cbsd/files/cbsd-statsd-bhyve.in @@ -20,14 +20,18 @@ export workdir="${cbsd_workdir}" globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} start_cmd=${name}_start +stop_cmd=${name}_stop restart_cmd=${name}_restart extra_commands="restart" command="%%PREFIX%%/cbsd/tools/racct-bhyve-statsd" -pidfile="/var/run/$name.pid" -command_args="&" +pidfile="${cbsd_workdir}/var/run/${name}.pid" +daemon_pidfile="${cbsd_workdir}/var/run/${name}-daemon.pid" +daemon_logdir="/var/log/${name}" +workdir_normalize=$( echo ${cbsd_workdir} | /usr/bin/tr "/" "_" ) +daemon_logfile="${daemon_logdir}/cbsd-statsd-bhyve${workdir_normalize}.log" -pidfile=/var/run/racct-bhyve-statsd.pid +command_args="&" if [ ! -f ${globalconf} ]; then echo "cbsd: no such ${globalconf}"; @@ -42,6 +46,34 @@ fi . ${globalconf} . ${subrdir}/nc.subr +cbsd_statsd_bhyve_stop() +{ + local _pids + + if [ -f "${daemon_pidfile}" ]; then + _pids=$( pgrep -F ${daemon_pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${daemon_pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + if [ -f "${pidfile}" ]; then + _pids=$( pgrep -F ${pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + + return 0 +} + cbsd_statsd_bhyve_start() { local args= racct_enabled= @@ -84,7 +116,10 @@ cbsd_statsd_bhyve_start() ;; esac - exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-bhyve-statsd ${args} + [ ! -d ${daemon_logdir} ] && mkdir -p ${daemon_logdir} + touch ${daemon_logfile} + + /usr/sbin/daemon -f -R5 -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} } cbsd_statsd_bhyve_restart() diff --git a/sysutils/cbsd/files/cbsd-statsd-hoster.in b/sysutils/cbsd/files/cbsd-statsd-hoster.in index 730898d63964..a8aa94a8d3c0 100644 --- a/sysutils/cbsd/files/cbsd-statsd-hoster.in +++ b/sysutils/cbsd/files/cbsd-statsd-hoster.in @@ -20,6 +20,7 @@ export workdir="${cbsd_workdir}" globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} start_cmd=${name}_start +stop_cmd=${name}_stop restart_cmd=${name}_restart extra_commands="restart" @@ -46,6 +47,35 @@ fi . ${globalconf} . ${subrdir}/nc.subr + +cbsd_statsd_hoster_stop() +{ + local _pids + + if [ -f "${daemon_pidfile}" ]; then + _pids=$( pgrep -F ${daemon_pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${daemon_pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + if [ -f "${pidfile}" ]; then + _pids=$( pgrep -F ${pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + + return 0 +} + cbsd_statsd_hoster_start() { local args= racct_enabled= @@ -91,7 +121,7 @@ cbsd_statsd_hoster_start() [ ! -d ${daemon_logdir} ] && mkdir -p ${daemon_logdir} touch ${daemon_logfile} - /usr/sbin/daemon -f -R5 -p ${pidfile} -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} + /usr/sbin/daemon -f -R5 -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} } cbsd_statsd_hoster_restart() diff --git a/sysutils/cbsd/files/cbsd-statsd-jail.in b/sysutils/cbsd/files/cbsd-statsd-jail.in index d109f76ebbbd..6c529ce1c0b9 100644 --- a/sysutils/cbsd/files/cbsd-statsd-jail.in +++ b/sysutils/cbsd/files/cbsd-statsd-jail.in @@ -20,11 +20,17 @@ export workdir="${cbsd_workdir}" globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} start_cmd=${name}_start +stop_cmd=${name}_stop restart_cmd=${name}_restart extra_commands="restart" command="%%PREFIX%%/cbsd/tools/racct-jail-statsd" pidfile="${cbsd_workdir}/var/run/${name}.pid" +daemon_pidfile="${cbsd_workdir}/var/run/${name}-daemon.pid" +daemon_logdir="/var/log/${name}" +workdir_normalize=$( echo ${cbsd_workdir} | /usr/bin/tr "/" "_" ) +daemon_logfile="${daemon_logdir}/cbsd-statsd-jail${workdir_normalize}.log" + command_args="&" if [ ! -f ${globalconf} ]; then @@ -40,6 +46,34 @@ fi . ${globalconf} . ${subrdir}/nc.subr +cbsd_statsd_jail_stop() +{ + local _pids + + if [ -f "${daemon_pidfile}" ]; then + _pids=$( pgrep -F ${daemon_pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${daemon_pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + if [ -f "${pidfile}" ]; then + _pids=$( pgrep -F ${pidfile} 2>&1 ) + _err=$? + /bin/rm -f ${pidfile} + if [ ${_err} -eq 0 ]; then + kill -9 ${_pids} + else + echo "pgrep: ${_pids}" + fi + fi + + return 0 +} + cbsd_statsd_jail_start() { local args= racct_enabled= pool_name= prometheus_listen4= prometheus_listen6= prometheus_port= @@ -88,7 +122,10 @@ cbsd_statsd_jail_start() ;; esac - exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-jail-statsd ${args} + [ ! -d ${daemon_logdir} ] && mkdir -p ${daemon_logdir} + touch ${daemon_logfile} + + /usr/sbin/daemon -f -R5 -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} } cbsd_statsd_jail_restart() diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist index ab70780761e8..7d745aa95085 100644 --- a/sysutils/cbsd/pkg-plist +++ b/sysutils/cbsd/pkg-plist @@ -18,6 +18,13 @@ cbsd/README.DragonflyBSD.md cbsd/README.HardenedBSD.md cbsd/README.OpenBSD.md cbsd/README.md +%%BHYVE_GOP%%cbsd/upgrade/patch/efigop.fd +%%FBSD%%cbsd/misc/next-vale-port +%%FBSD%%cbsd/tools/bridge +%%FBSD%%cbsd/tools/racct-bhyve-statsd +%%FBSD%%cbsd/tools/racct-hoster-statsd +%%FBSD%%cbsd/tools/racct-jail-statsd +%%FBSD%%cbsd/tools/vale-ctl cbsd/bhyvectl/bcheckpoint cbsd/bhyvectl/bchroot cbsd/bhyvectl/bcleanup @@ -74,19 +81,22 @@ cbsd/etc/defaults/DragonFly-kernel-GENERIC-x86_64-4.6 cbsd/etc/defaults/DragonFly-kernel-GENERIC-x86_64-4.7 cbsd/etc/defaults/DragonFly-kernel-GENERIC-x86_64-4.8 cbsd/etc/defaults/DragonFly-srvbrowser.conf -cbsd/etc/defaults/FreeBSD-bases.conf +cbsd/etc/defaults/FreeBSD-base_in_pkg-13.2.conf cbsd/etc/defaults/FreeBSD-base_in_pkg-14.0.conf cbsd/etc/defaults/FreeBSD-base_in_pkg.conf +cbsd/etc/defaults/FreeBSD-bases.conf cbsd/etc/defaults/FreeBSD-baseupdate.conf cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-13.0 cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-13.1 cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-13.2 +cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-13.3 cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-14.0 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-12.4 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-13.2 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-13.3 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14.0 +cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-14.0 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-12 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-12.2 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-12.3 @@ -111,7 +121,6 @@ cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-13.0 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-13.1 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14.0 -cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-14.0 cbsd/etc/defaults/FreeBSD-kernels.conf cbsd/etc/defaults/FreeBSD-sources.conf cbsd/etc/defaults/FreeBSD-srvbrowser.conf @@ -165,12 +174,12 @@ cbsd/etc/defaults/logger.conf cbsd/etc/defaults/make-pxe.conf cbsd/etc/defaults/nlogin.conf cbsd/etc/defaults/node.conf +cbsd/etc/defaults/pf.conf.tpl cbsd/etc/defaults/pkgbrowser.conf cbsd/etc/defaults/portsup.conf cbsd/etc/defaults/qemu-default-default.conf cbsd/etc/defaults/qlogin.conf cbsd/etc/defaults/qls.conf -cbsd/etc/defaults/pf.conf.tpl cbsd/etc/defaults/racct-bhyve-statsd.conf cbsd/etc/defaults/racct-hoster-statsd.conf cbsd/etc/defaults/racct-jail-statsd.conf @@ -195,30 +204,35 @@ cbsd/etc/defaults/vls.conf cbsd/etc/defaults/vm-dflybsd-cloud-DragonflyBSD-hammer-x64-6.conf cbsd/etc/defaults/vm-dflybsd-x86-6.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-13.1.conf +cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-13.2.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-bsdinstall-jail.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-from-jail.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-13.1.conf +cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-13.2.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-12.4.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.1.conf +cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.2.conf cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.0-LATEST.conf cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-23.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-MidnightBSD-x64-3.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 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-12.4.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.0.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.1.conf +cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.2.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-12.4.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.0.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.1.conf +cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.2.conf cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.conf cbsd/etc/defaults/vm-freebsd-cloud-GhostBSD-ufs-x64-22.conf cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-22-RELEASE-amd64-22.conf cbsd/etc/defaults/vm-freebsd-cloud-XigmaNAS-13-amd64.conf +cbsd/etc/defaults/vm-freebsd-cloud-firestarter-ufs-x64-14.conf cbsd/etc/defaults/vm-freebsd-helloSystem-x64.conf cbsd/etc/defaults/vm-freebsd-pfSense-2-RELEASE-amd64.conf cbsd/etc/defaults/vm-linux-AlmaLinux-9-x86_64.conf @@ -239,15 +253,14 @@ cbsd/etc/defaults/vm-linux-OracleLinux-7.conf cbsd/etc/defaults/vm-linux-OracleLinux-8.conf cbsd/etc/defaults/vm-linux-OracleLinux-9.conf cbsd/etc/defaults/vm-linux-Parrot-security-5-x64.conf -cbsd/etc/defaults/vm-linux-Starface-7.conf cbsd/etc/defaults/vm-linux-Rocky-8-x86_64.conf cbsd/etc/defaults/vm-linux-Rocky-9-x86_64.conf +cbsd/etc/defaults/vm-linux-Slackware-x86-15.conf +cbsd/etc/defaults/vm-linux-Starface-7.conf cbsd/etc/defaults/vm-linux-Tails-5.conf cbsd/etc/defaults/vm-linux-TinyCore-x86-13.conf cbsd/etc/defaults/vm-linux-TrueNAS-Scale-22.conf cbsd/etc/defaults/vm-linux-VoidLinux-2022-x86_64.conf -cbsd/etc/defaults/vm-linux-cloud-firestarter-11.conf -cbsd/etc/defaults/vm-linux-cloud-firestarter-debian-11.conf cbsd/etc/defaults/vm-linux-cloud-Alma-9-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Arch-x86-2022.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-7-x86_64.conf @@ -267,6 +280,7 @@ cbsd/etc/defaults/vm-linux-cloud-Oracle-9-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Parrot-5-amd64.conf cbsd/etc/defaults/vm-linux-cloud-Rocky-8-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-Rocky-9-x86_64.conf +cbsd/etc/defaults/vm-linux-cloud-firestarter-debian-11.conf cbsd/etc/defaults/vm-linux-cloud-kubernetes-26.conf cbsd/etc/defaults/vm-linux-cloud-ubuntudesktop-amd64-22.04.conf cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.conf @@ -368,7 +382,6 @@ cbsd/misc/fmagic cbsd/misc/ipv6range cbsd/misc/mtree cbsd/misc/next-ng-port -%%FBSD%%cbsd/misc/next-vale-port cbsd/misc/nics-list cbsd/misc/pwcrypt cbsd/misc/resolv @@ -492,6 +505,7 @@ cbsd/qemuctl/qemu-nic-tui cbsd/qemuctl/qget cbsd/qemuctl/qlogin cbsd/qemuctl/qls +cbsd/qemuctl/qorder cbsd/qemuctl/qremove cbsd/qemuctl/qset cbsd/qemuctl/qsetup-tui @@ -725,10 +739,10 @@ cbsd/share/examples/env_start/nfsv4/env_start_nfs.conf cbsd/share/examples/env_start/nfsv4/env_start_nfs.sh cbsd/share/examples/jails-fstab/ntfs-3g.sh cbsd/share/examples/nodes/add.d/addhost.sh -cbsd/share/grafana/CBSD_Jail_cluster_v0.0.json cbsd/share/forms.schema cbsd/share/forms_system.schema cbsd/share/forms_yesno.schema +cbsd/share/grafana/CBSD_Jail_cluster_v0.0.json cbsd/share/helpers/dhcpd/cbsd-dhcpd.conf cbsd/share/helpers/dhcpd/dhcpd_fixed.tpl cbsd/share/helpers/dhcpd/make_cbsd_dhcpd.sh @@ -949,9 +963,9 @@ cbsd/system/buildworld cbsd/system/delete-old-libs cbsd/system/distribution cbsd/system/etcupdate +cbsd/system/install-pkg-world cbsd/system/installkernel cbsd/system/installworld -cbsd/system/install-pkg-world cbsd/system/kernel cbsd/system/mkdistribution cbsd/system/module @@ -989,7 +1003,6 @@ cbsd/tools/bhyve-p9shares cbsd/tools/bhyve-ppt cbsd/tools/bootmgmt cbsd/tools/bootmgmt-pxe -%%FBSD%%cbsd/tools/bridge cbsd/tools/carpcfg cbsd/tools/carpcontrol cbsd/tools/cbsdchown @@ -1066,9 +1079,6 @@ cbsd/tools/path2jail cbsd/tools/pkgbrowsecat cbsd/tools/pkgbrowser cbsd/tools/pull -%%FBSD%%cbsd/tools/racct-bhyve-statsd -%%FBSD%%cbsd/tools/racct-hoster-statsd -%%FBSD%%cbsd/tools/racct-jail-statsd cbsd/tools/rctlcounters cbsd/tools/replacewdir cbsd/tools/repo @@ -1093,7 +1103,6 @@ cbsd/tools/trafstat cbsd/tools/unmountfstab cbsd/tools/unmountmd cbsd/tools/up -%%FBSD%%cbsd/tools/vale-ctl cbsd/tools/valecfg cbsd/tools/valecfg-tui cbsd/tools/vhidcfg @@ -1110,7 +1119,6 @@ cbsd/tools/zfs-migrator cbsd/upgrade/patch/BHYVE_UEFI_VARS.fd cbsd/upgrade/patch/bhyve-vesa-fb-13.0/patch-13x-usr.sbin-bhyve-pci_fbuf.c cbsd/upgrade/patch/efi.fd -%%BHYVE_GOP%%cbsd/upgrade/patch/efigop.fd cbsd/upgrade/patch/efirefd.fd cbsd/upgrade/patch/efirefn.fd cbsd/upgrade/patch/iov-13.0/README.md @@ -1211,7 +1219,6 @@ cbsd/upgrade/pre-patch-12.0.5.0 cbsd/upgrade/pre-patch-12.0.5.1 cbsd/upgrade/pre-patch-12.0.6.0 cbsd/upgrade/pre-patch-12.0.6.1 -cbsd/upgrade/pre-patch-13.1.1.0 cbsd/upgrade/pre-patch-12.1.10.0 cbsd/upgrade/pre-patch-12.1.10.1 cbsd/upgrade/pre-patch-12.1.10.2 @@ -1241,6 +1248,7 @@ cbsd/upgrade/pre-patch-13.0.3.0 cbsd/upgrade/pre-patch-13.0.3.1 cbsd/upgrade/pre-patch-13.0.4.0 cbsd/upgrade/pre-patch-13.0.5.0 +cbsd/upgrade/pre-patch-13.1.1.0 cbsd/vboxctl/vconfig cbsd/vboxctl/vconstruct-tui cbsd/vboxctl/vcontrol-tui @@ -1262,6 +1270,7 @@ cbsd/xenctl/xget cbsd/xenctl/xlogin cbsd/xenctl/xls cbsd/xenctl/xmigrate +cbsd/xenctl/xorder cbsd/xenctl/xregister cbsd/xenctl/xremove cbsd/xenctl/xset