Date: Thu, 19 Aug 2021 06:01:25 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: 2c90cb7caa37 - 2021Q3 - sysutils/cbsd: update to 13.0.13 Message-ID: <202108190601.17J61POI006719@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c90cb7caa3746c424d04f74f6d9d216d7391ffc commit 2c90cb7caa3746c424d04f74f6d9d216d7391ffc Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2021-08-19 06:00:22 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2021-08-19 06:01:20 +0000 sysutils/cbsd: update to 13.0.13 Change: https://github.com/cbsd/cbsd/releases/tag/v13.0.13 Submitted by: maintainer (cherry picked from commit 850062c06efc569f0d8356eebf3c3727ecb7a6c1) --- sysutils/cbsd/Makefile | 3 +- sysutils/cbsd/distinfo | 6 +- .../patch-etc_defaults_jail-freebsd-default.conf | 19 ----- sysutils/cbsd/pkg-plist | 89 ++++++++++------------ 4 files changed, 46 insertions(+), 71 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 7a73f88dc826..92d40342483f 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,6 +1,5 @@ PORTNAME= cbsd -DISTVERSION= 13.0.12 -PORTREVISION= 1 +DISTVERSION= 13.0.13 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index f78ee1d34235..a5e2fee3f7b4 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628843802 -SHA256 (cbsd-cbsd-13.0.12_GH0.tar.gz) = f6b2b9cade438dd2e9e5750667e4b458fd21b834ce5d6b345e116e27c5465907 -SIZE (cbsd-cbsd-13.0.12_GH0.tar.gz) = 5404137 +TIMESTAMP = 1629332079 +SHA256 (cbsd-cbsd-13.0.13_GH0.tar.gz) = 72896ad51f44d20f9103d04c5ecbb2045faa9ac66e2d558680c39bfd71cc072a +SIZE (cbsd-cbsd-13.0.13_GH0.tar.gz) = 5403187 diff --git a/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf b/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf deleted file mode 100644 index 25b5b35a41fe..000000000000 --- a/sysutils/cbsd/files/patch-etc_defaults_jail-freebsd-default.conf +++ /dev/null @@ -1,19 +0,0 @@ ---- etc/defaults/jail-freebsd-default.conf.orig 2021-08-13 08:31:58 UTC -+++ etc/defaults/jail-freebsd-default.conf -@@ -40,15 +40,7 @@ systemskeldir="${workdir}/share/jail-system-default" - removejconf="1" # remove jconf after jcreate? 0 - don't remove - delpkglist="1" # remove pkglist file after jcreate? 0 - don't remove - --# pkg bootstrap for new jail? --case "${platform}" in -- DragonFly) -- pkg_bootstrap=0 -- ;; -- *) -- pkg_bootstrap="1" -- ;; --esac -+pkg_bootstrap="1" - - # JAIL.CONF part - # default params whitch is overwrite zero-value for jcreate, jconstruct-tui, makejconf diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist index c662f4101958..4489019ff39a 100644 --- a/sysutils/cbsd/pkg-plist +++ b/sysutils/cbsd/pkg-plist @@ -18,32 +18,10 @@ cbsd/bin/cfetch cbsd/bin/rexe cbsd/cbsd.conf cbsd/etc/cbsd.mtree -cbsd/etc/defaults/bclone.conf -cbsd/etc/defaults/bexec.conf -cbsd/etc/defaults/bhyve-default-default.conf -cbsd/etc/defaults/blogin.conf -cbsd/etc/defaults/bls.conf -cbsd/etc/defaults/brctl.conf -cbsd/etc/defaults/bscp.conf -cbsd/etc/defaults/bstart.conf -cbsd/etc/defaults/bstop.conf -cbsd/etc/defaults/buildworld.conf -cbsd/etc/defaults/cbsdfile.conf -cbsd/etc/defaults/cbsdrsyncd.conf -cbsd/etc/defaults/cloud-init.conf -cbsd/etc/defaults/color-white.conf -cbsd/etc/defaults/color.conf -cbsd/etc/defaults/dhcpd.conf -cbsd/etc/defaults/dhcpdv6.conf -cbsd/etc/defaults/distcc.conf 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/etcupdate.conf -cbsd/etc/defaults/fetch_iso.conf -cbsd/etc/defaults/fetch.conf -cbsd/etc/defaults/forms_env.conf cbsd/etc/defaults/FreeBSD-bases.conf cbsd/etc/defaults/FreeBSD-baseupdate.conf cbsd/etc/defaults/FreeBSD-kernel-BHYVE-amd64-14 @@ -66,9 +44,31 @@ cbsd/etc/defaults/FreeBSD-kernels.conf cbsd/etc/defaults/FreeBSD-sources.conf cbsd/etc/defaults/FreeBSD-srvbrowser.conf cbsd/etc/defaults/FreeBSD-userlist.conf +cbsd/etc/defaults/HardenedBSD-bases.conf +cbsd/etc/defaults/bclone.conf +cbsd/etc/defaults/bexec.conf +cbsd/etc/defaults/bhyve-default-default.conf +cbsd/etc/defaults/blogin.conf +cbsd/etc/defaults/bls.conf +cbsd/etc/defaults/brctl.conf +cbsd/etc/defaults/bscp.conf +cbsd/etc/defaults/bstart.conf +cbsd/etc/defaults/bstop.conf +cbsd/etc/defaults/buildworld.conf +cbsd/etc/defaults/cbsdfile.conf +cbsd/etc/defaults/cbsdrsyncd.conf +cbsd/etc/defaults/cloud-init.conf +cbsd/etc/defaults/color-white.conf +cbsd/etc/defaults/color.conf +cbsd/etc/defaults/dhcpd.conf +cbsd/etc/defaults/dhcpdv6.conf +cbsd/etc/defaults/distcc.conf +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/geli.conf cbsd/etc/defaults/global.conf -cbsd/etc/defaults/HardenedBSD-bases.conf cbsd/etc/defaults/helpers.conf cbsd/etc/defaults/jail-freebsd-cbsdpuppet.conf cbsd/etc/defaults/jail-freebsd-centos_7.conf @@ -113,11 +113,6 @@ cbsd/etc/defaults/upgrade.conf cbsd/etc/defaults/virtualbox-default-default.conf cbsd/etc/defaults/vls.conf cbsd/etc/defaults/vm-dflybsd-x86-6.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 -cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.0.conf -cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-21-RELEASE-amd64-21.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-x64-11.4.conf @@ -127,41 +122,41 @@ cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.0-LATEST.conf cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-21.conf 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-pfSense-2-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-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 +cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.0.conf +cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-21-RELEASE-amd64-21.conf +cbsd/etc/defaults/vm-freebsd-pfSense-2-RELEASE-amd64.conf cbsd/etc/defaults/vm-linux-Android-x86.conf cbsd/etc/defaults/vm-linux-ArchLinux-x86-2021.conf cbsd/etc/defaults/vm-linux-CentOS-7-x86_64-minimal.conf cbsd/etc/defaults/vm-linux-CentOS-7-x86_64.conf cbsd/etc/defaults/vm-linux-CentOS-stream-8-x86_64.conf cbsd/etc/defaults/vm-linux-ClearLinux-Server-x86_64.conf +cbsd/etc/defaults/vm-linux-Debian-x86-10.conf +cbsd/etc/defaults/vm-linux-Debian-x86-11.conf +cbsd/etc/defaults/vm-linux-Debian-x86-9-minimal.conf +cbsd/etc/defaults/vm-linux-Debian-x86-9.conf +cbsd/etc/defaults/vm-linux-FreePBX-64bit-21.conf +cbsd/etc/defaults/vm-linux-Kali-2021-amd64.conf +cbsd/etc/defaults/vm-linux-OracleLinux-7.conf +cbsd/etc/defaults/vm-linux-OracleLinux-8.conf +cbsd/etc/defaults/vm-linux-Parrot-security-4-x64.conf +cbsd/etc/defaults/vm-linux-TinyCore-x86-12.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-7-x86_64.conf cbsd/etc/defaults/vm-linux-cloud-CentOS-stream-8-x86_64.conf 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-ubuntuserver-amd64-18.04.conf -cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-19.10.conf cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.conf -cbsd/etc/defaults/vm-linux-CoreOS.conf -cbsd/etc/defaults/vm-linux-Debian-x86-10.conf -cbsd/etc/defaults/vm-linux-Debian-x86-9-minimal.conf -cbsd/etc/defaults/vm-linux-Debian-x86-9.conf cbsd/etc/defaults/vm-linux-fedora-server-33-x86_64.conf cbsd/etc/defaults/vm-linux-fedora-server-34-x86_64.conf -cbsd/etc/defaults/vm-linux-FreePBX-64bit-20.conf -cbsd/etc/defaults/vm-linux-Kali-2021-amd64.conf -cbsd/etc/defaults/vm-linux-Knoppix-x86-8.conf -cbsd/etc/defaults/vm-linux-kubuntu-amd64-20.conf cbsd/etc/defaults/vm-linux-opensuse-leap-15-x86.conf -cbsd/etc/defaults/vm-linux-OracleLinux-7.conf -cbsd/etc/defaults/vm-linux-OracleLinux-8.conf -cbsd/etc/defaults/vm-linux-Parrot-security-4-x64.conf -cbsd/etc/defaults/vm-linux-RancherOS-latest.conf -cbsd/etc/defaults/vm-linux-TinyCore-x86-11.conf -cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-20.04.conf -cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-18.04.conf +cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-21.04.conf cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-20.04.conf cbsd/etc/defaults/vm-linux-vyos-1.4.conf cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-9.conf @@ -171,10 +166,10 @@ cbsd/etc/defaults/vm-openbsd-x86-6.conf cbsd/etc/defaults/vm-other-FreeDOS.conf cbsd/etc/defaults/vm-other-Haiku-r1.conf cbsd/etc/defaults/vm-other-Minoca.conf -cbsd/etc/defaults/vm-other-omnios-2020.conf cbsd/etc/defaults/vm-other-OpenIndiana-2021.conf cbsd/etc/defaults/vm-other-ReactOS.conf cbsd/etc/defaults/vm-other-SmartOS.conf +cbsd/etc/defaults/vm-other-omnios-2021.conf cbsd/etc/defaults/vm-windows-10_86x_64x.conf cbsd/etc/defaults/vm-windows-8_86x_64x.conf cbsd/etc/defaults/vnc.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108190601.17J61POI006719>