Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Sep 2021 08:59:48 GMT
From:      Kirill Ponomarev <krion@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 61df48660054 - main - sysutils/cbsd: update to 13.0.15
Message-ID:  <202109200859.18K8xmix001688@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by krion:

URL: https://cgit.FreeBSD.org/ports/commit/?id=61df4866005428899d9b184461cdf5302c278d44

commit 61df4866005428899d9b184461cdf5302c278d44
Author:     Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2021-09-20 08:58:41 +0000
Commit:     Kirill Ponomarev <krion@FreeBSD.org>
CommitDate: 2021-09-20 08:59:36 +0000

    sysutils/cbsd: update to 13.0.15
    
    Changes: https://github.com/cbsd/cbsd/releases/tag/v13.0.15
---
 sysutils/cbsd/Makefile                     |  3 +--
 sysutils/cbsd/distinfo                     |  6 +++---
 sysutils/cbsd/files/patch-sudoexec_initenv | 13 -------------
 sysutils/cbsd/pkg-plist                    | 10 ++++++----
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index e86df2c437da..b6be8968466c 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	13.0.14
-PORTREVISION=	1
+DISTVERSION=	13.0.15
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 86941268b2a6..340c801fe434 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630862270
-SHA256 (cbsd-cbsd-13.0.14_GH0.tar.gz) = 071949b6e337ca59412070e931dc737c6f5d8732da8acd71f6d299f64c36f111
-SIZE (cbsd-cbsd-13.0.14_GH0.tar.gz) = 5404866
+TIMESTAMP = 1632126286
+SHA256 (cbsd-cbsd-13.0.15_GH0.tar.gz) = fb39d44041fcabee47580517d816a60cb144ef92cfc687d770570d67f45389e6
+SIZE (cbsd-cbsd-13.0.15_GH0.tar.gz) = 5415426
diff --git a/sysutils/cbsd/files/patch-sudoexec_initenv b/sysutils/cbsd/files/patch-sudoexec_initenv
deleted file mode 100644
index 2d7d12b09058..000000000000
--- a/sysutils/cbsd/files/patch-sudoexec_initenv
+++ /dev/null
@@ -1,13 +0,0 @@
---- sudoexec/initenv.orig	2021-09-05 15:55:48 UTC
-+++ sudoexec/initenv
-@@ -683,6 +683,10 @@ phase5()
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-xen.schema xen
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vnetnic.schema vnetnic
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vmpackages.schema vmpackages
-+	_tmpval=$( ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT name FROM vmpackages WHERE name=\"small1\" LIMIT 1" )
-+	if [ -z "${_tmpval}" ]; then
-+		${miscdir}/sqlcli ${dbdir}/local.sqlite "INSERT INTO vmpackages ( name, pkg_vm_cpus, pkg_vm_ram, pkg_vm_disk, owner ) VALUES ( 'small1', '1', '1g', '10g', 'admin' )"
-+	fi
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/inv.${nodename}.sqlite ${distdir}/share/local-vm_cpu_topology.schema vm_cpu_topology
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/cbsdtaskd.sqlite ${distdir}/share/cbsdtaskd-taskd.schema taskd
- 	env workdir=${workdir} /usr/local/bin/cbsd ${miscdir}/updatesql ${dbdir}/vpnet.sqlite ${distdir}/share/vpnet-vpnet.schema vpnet
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index 24ef4db6b2b0..9def2432e7af 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -40,6 +40,8 @@ cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-13.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-13.1
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14.0
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14.0
 cbsd/etc/defaults/FreeBSD-kernels.conf
 cbsd/etc/defaults/FreeBSD-sources.conf
 cbsd/etc/defaults/FreeBSD-srvbrowser.conf
@@ -67,6 +69,7 @@ cbsd/etc/defaults/etcupdate.conf
 cbsd/etc/defaults/fetch.conf
 cbsd/etc/defaults/fetch_iso.conf
 cbsd/etc/defaults/forms_env.conf
+cbsd/etc/defaults/forms_export_vars.conf
 cbsd/etc/defaults/geli.conf
 cbsd/etc/defaults/global.conf
 cbsd/etc/defaults/helpers.conf
@@ -125,8 +128,6 @@ cbsd/etc/defaults/vm-freebsd-HardenedBSD-x64-14.0-LATEST.conf
 cbsd/etc/defaults/vm-freebsd-OPNsense-21-RELEASE-amd64.conf
 cbsd/etc/defaults/vm-freebsd-TrueNAS-x64-12.conf
 cbsd/etc/defaults/vm-freebsd-XigmaNAS-12.conf
-cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ghrunner-ufs-x64-13.0.conf
-cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ghrunner-zfs-x64-13.0.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-12.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.0.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-12.2.conf
@@ -156,6 +157,8 @@ cbsd/etc/defaults/vm-linux-cloud-Debian-x86-10.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-11.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-9.conf
 cbsd/etc/defaults/vm-linux-cloud-kubernetes-20.conf
+cbsd/etc/defaults/vm-linux-cloud-Oracle-7-x86_64.conf
+cbsd/etc/defaults/vm-linux-cloud-Oracle-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Rocky-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.conf
 cbsd/etc/defaults/vm-linux-fedora-server-33-x86_64.conf
@@ -885,6 +888,7 @@ cbsd/tools/getnics-by-ip
 cbsd/tools/help
 cbsd/tools/history
 cbsd/tools/images
+cbsd/tools/images-list
 cbsd/tools/imghelper
 cbsd/tools/imghelper-tui
 cbsd/tools/imgpart
@@ -1025,8 +1029,6 @@ cbsd/upgrade/patch/p9-13.0/patch-13x-usr.sbin-bhyve-virtio.h
 cbsd/upgrade/patch/vxlan-13.0/patch-sys-net-if_vxlan.c
 cbsd/upgrade/patch/vxlan-14.0/patch-sys-net-if_vxlan.c
 cbsd/upgrade/post-patch-11.0.6.0
-cbsd/upgrade/pre-patch-11.1.11.0
-cbsd/upgrade/pre-patch-11.1.12.0
 cbsd/upgrade/pre-patch-11.1.15.0
 cbsd/upgrade/pre-patch-11.1.17.0
 cbsd/upgrade/pre-patch-11.1.17.1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109200859.18K8xmix001688>