git: 8e05a6e24d04 - main - sysutils/cbsd: update to 13.0.18

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kirill Ponomarev <krion_at_FreeBSD.org>
Date: Fri, 19 Nov 2021 19:10:01 UTC
The branch main has been updated by krion:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8e05a6e24d0476e5603bb3f2c2d3bc54c49a94b9

commit 8e05a6e24d0476e5603bb3f2c2d3bc54c49a94b9
Author:     Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2021-11-19 19:09:01 +0000
Commit:     Kirill Ponomarev <krion@FreeBSD.org>
CommitDate: 2021-11-19 19:09:01 +0000

    sysutils/cbsd: update to 13.0.18
    
    Reported by:    maintainer
---
 sysutils/cbsd/Makefile  |   2 +-
 sysutils/cbsd/distinfo  |   6 +-
 sysutils/cbsd/pkg-plist | 396 ++++++++++++++++++++++++++++--------------------
 3 files changed, 237 insertions(+), 167 deletions(-)

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 67631b1c4666..ef123c93b113 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	13.0.17
+DISTVERSION=	13.0.18
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index ac1d28ee0e2a..1a0bd817e993 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635362838
-SHA256 (cbsd-cbsd-13.0.17_GH0.tar.gz) = 3e04dd8c80a1e6e7d917160e5e1d5d13765df403b620f7e5238b9b390ec21e35
-SIZE (cbsd-cbsd-13.0.17_GH0.tar.gz) = 5422174
+TIMESTAMP = 1637346820
+SHA256 (cbsd-cbsd-13.0.18_GH0.tar.gz) = 658294ec28ad15d68a537f01859fbd95c785ab6c7321de9fe9b5a3810ea25edf
+SIZE (cbsd-cbsd-13.0.18_GH0.tar.gz) = 5477521
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index ea8656bceab6..ab71447bcfbd 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -9,6 +9,14 @@ man/man8/cbsd.8.gz
 libexec/bsdconfig/cbsd
 cbsd/.gitignore
 cbsd/.ssh/config
+cbsd/ISSUE_TEMPLATE.md
+cbsd/LICENSE
+cbsd/Makefile
+cbsd/ObsoleteFiles
+cbsd/README.DragonflyBSD.md
+cbsd/README.HardenedBSD.md
+cbsd/README.OpenBSD.md
+cbsd/README.md
 cbsd/bin/cbsdsftp
 cbsd/bin/cbsdsftp6
 cbsd/bin/cbsdssh
@@ -16,7 +24,9 @@ cbsd/bin/cbsdssh6
 cbsd/bin/cfetch
 cbsd/bin/rexe
 cbsd/cbsd.conf
+cbsd/etc/Makefile
 cbsd/etc/cbsd.mtree
+cbsd/etc/defaults/DragonFly-bases.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
@@ -100,6 +110,9 @@ cbsd/etc/defaults/nlogin.conf
 cbsd/etc/defaults/node.conf
 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/racct-bhyve-statsd.conf
 cbsd/etc/defaults/racct-hoster-statsd.conf
 cbsd/etc/defaults/racct-jail-statsd.conf
@@ -122,22 +135,25 @@ 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-FreeBSD-aarch64-13.0.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.0.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-11.4.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-12.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.0.conf
 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-13-STABLE.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-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-ufs-x64-14.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-FreeBSD-ufs-x64-14.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.conf
 cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-21-RELEASE-amd64-21.conf
 cbsd/etc/defaults/vm-freebsd-pfSense-2-RELEASE-amd64.conf
@@ -146,12 +162,13 @@ 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-CentOS-stream-9-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-FreePBX-64bit-16.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
@@ -160,16 +177,17 @@ cbsd/etc/defaults/vm-linux-Rocky-8-x86_64.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-CentOS-stream-9-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-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-kubernetes-21.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.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-fedora-server-35-x86_64.conf
 cbsd/etc/defaults/vm-linux-opensuse-leap-15-x86.conf
 cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-21.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-20.04.conf
@@ -195,16 +213,13 @@ cbsd/etc/defaults/xlogin.conf
 cbsd/etc/defaults/xls.conf
 cbsd/etc/defaults/xstop.conf
 cbsd/etc/defaults/zfs.conf
-cbsd/etc/Makefile
 cbsd/etc/modules.conf
 cbsd/etc/spice.conf
-cbsd/ISSUE_TEMPLATE.md
 cbsd/jailctl/bcheckpoint
 cbsd/jailctl/bchroot
 cbsd/jailctl/bcleanup
 cbsd/jailctl/bclone
 cbsd/jailctl/bconfig
-cbsd/jailctl/bcontrol-tui
 cbsd/jailctl/bcreate
 cbsd/jailctl/bdescr
 cbsd/jailctl/bdestroy
@@ -217,10 +232,8 @@ cbsd/jailctl/blogin
 cbsd/jailctl/bls
 cbsd/jailctl/bmigrate
 cbsd/jailctl/border
-cbsd/jailctl/border-tui
 cbsd/jailctl/bpause
 cbsd/jailctl/bpcibus
-cbsd/jailctl/brctl-tui
 cbsd/jailctl/bregister
 cbsd/jailctl/bremove
 cbsd/jailctl/brename
@@ -228,7 +241,6 @@ cbsd/jailctl/brenice
 cbsd/jailctl/brestart
 cbsd/jailctl/bscp
 cbsd/jailctl/bset
-cbsd/jailctl/bsetup-tui
 cbsd/jailctl/bsnapshot
 cbsd/jailctl/bstart
 cbsd/jailctl/bstop
@@ -243,7 +255,6 @@ cbsd/jailctl/jcleanup
 cbsd/jailctl/jclone
 cbsd/jailctl/jcoldmigrate
 cbsd/jailctl/jconfig
-cbsd/jailctl/jcontrol-tui
 cbsd/jailctl/jcreate
 cbsd/jailctl/jdescr
 cbsd/jailctl/jdestroy
@@ -256,11 +267,9 @@ cbsd/jailctl/jls
 cbsd/jailctl/jmkrcconf
 cbsd/jailctl/jmkrctlconf
 cbsd/jailctl/jorder
-cbsd/jailctl/jorder-tui
 cbsd/jailctl/jpause
 cbsd/jailctl/jrclone
 cbsd/jailctl/jrctl
-cbsd/jailctl/jrctl-tui
 cbsd/jailctl/jregister
 cbsd/jailctl/jremove
 cbsd/jailctl/jrename
@@ -268,7 +277,6 @@ cbsd/jailctl/jrenice
 cbsd/jailctl/jrestart
 cbsd/jailctl/jscp
 cbsd/jailctl/jset
-cbsd/jailctl/jsetup-tui
 cbsd/jailctl/jsnapshot
 cbsd/jailctl/jstart
 cbsd/jailctl/jstatus
@@ -277,13 +285,23 @@ cbsd/jailctl/jswmode
 cbsd/jailctl/junregister
 cbsd/jailctl/jupgrade
 cbsd/jailctl/jwhereis
+cbsd/jailctl/qcleanup
+cbsd/jailctl/qconfig
+cbsd/jailctl/qcreate
+cbsd/jailctl/qdestroy
+cbsd/jailctl/qget
+cbsd/jailctl/qlogin
+cbsd/jailctl/qls
+cbsd/jailctl/qremove
+cbsd/jailctl/qset
+cbsd/jailctl/qstart
+cbsd/jailctl/qstop
+cbsd/jailctl/qwhereis
 cbsd/jailctl/vconfig
-cbsd/jailctl/vcontrol-tui
 cbsd/jailctl/vcreate
 cbsd/jailctl/vls
 cbsd/jailctl/vremove
 cbsd/jailctl/vset
-cbsd/jailctl/vsetup-tui
 cbsd/jailctl/vstart
 cbsd/jailctl/vstop
 cbsd/jailctl/xcheckpoint
@@ -297,12 +315,10 @@ cbsd/jailctl/xmigrate
 cbsd/jailctl/xregister
 cbsd/jailctl/xremove
 cbsd/jailctl/xset
-cbsd/jailctl/xsetup-tui
 cbsd/jailctl/xstart
 cbsd/jailctl/xstop
 cbsd/jailctl/xunregister
-cbsd/LICENSE
-cbsd/Makefile
+cbsd/jailctl/xwhereis
 cbsd/man/cbsd-jconstruct-tui.8
 cbsd/man/cbsd-jdescr.8
 cbsd/man/cbsd-jlogin.8
@@ -371,6 +387,7 @@ cbsd/modules/bsdconf.d/cloud-tpl/windows/network_data.json
 cbsd/modules/bsdconf.d/cloudinit
 cbsd/modules/bsdconf.d/ftp
 cbsd/modules/bsdconf.d/grouplist
+cbsd/modules/bsdconf.d/metadata.conf
 cbsd/modules/bsdconf.d/passwd
 cbsd/modules/bsdconf.d/pw
 cbsd/modules/bsdconf.d/securecmd
@@ -382,6 +399,7 @@ cbsd/modules/bsdconf.d/userlist
 cbsd/modules/cbsd_queue.d/bin-sample/notify.sh
 cbsd/modules/cbsd_queue.d/cbsd_queue
 cbsd/modules/cbsd_queue.d/etc-sample/cbsd_queue.conf
+cbsd/modules/cbsd_queue.d/metadata.conf
 cbsd/modules/cbsd_queue.d/securecmd
 cbsd/modules/cbsd_redis.d/etc-sample/cbsd-ext.conf
 cbsd/modules/cbsd_redis.d/extra/.optional
@@ -395,13 +413,15 @@ cbsd/modules/forms.d/brctl/initforms.sh
 cbsd/modules/forms.d/jrctl/cbsdsys
 cbsd/modules/forms.d/jrctl/helpers.conf
 cbsd/modules/forms.d/jrctl/initforms.sh
-cbsd/modules/pkg.d/etc-sample/pkg.conf
 cbsd/modules/pkg.d/ObsoleteFiles
+cbsd/modules/pkg.d/etc-sample/pkg.conf
+cbsd/modules/pkg.d/metadata.conf
 cbsd/modules/pkg.d/pkg
 cbsd/modules/pkg.d/pkg.conf
 cbsd/modules/pkg.d/pkg.subr
 cbsd/modules/pkg.d/securecmd
 cbsd/modules/placeholder
+cbsd/modules/zfsinstall.d/metadata.conf
 cbsd/modules/zfsinstall.d/securecmd
 cbsd/modules/zfsinstall.d/zfsinstall
 cbsd/modules/zfsinstall.d/zfsinstall.subr
@@ -410,31 +430,109 @@ cbsd/nodectl/nlogin
 cbsd/nodectl/node
 cbsd/nodectl/nodeaddkey
 cbsd/nodectl/nodescp
-cbsd/ObsoleteFiles
 cbsd/rc.d/cbsd-statsd-bhyve
 cbsd/rc.d/cbsd-statsd-hoster
 cbsd/rc.d/cbsd-statsd-jail
 cbsd/rc.d/cbsdd
 cbsd/rc.d/cbsdrsyncd
 cbsd/rc.d/jails-astart
-cbsd/README.DragonflyBSD.md
-cbsd/README.HardenedBSD.md
-cbsd/README.OpenBSD.md
-cbsd/README.md
 cbsd/release/generate-release.sh
 cbsd/release/install.sh
 cbsd/release/mkisoimages.sh
 cbsd/sbin/netmask
 cbsd/securecmd
+cbsd/share/DragonFly-git_branches.conf
+cbsd/share/DragonFly-jail-skel/etc/crontab
+cbsd/share/DragonFly-jail-skel/etc/group
+cbsd/share/DragonFly-jail-skel/etc/mail/aliases
+cbsd/share/DragonFly-jail-skel/etc/mail/aliases.db
+cbsd/share/DragonFly-jail-skel/etc/make.conf
+cbsd/share/DragonFly-jail-skel/etc/master.passwd
+cbsd/share/DragonFly-jail-skel/etc/motd
+cbsd/share/DragonFly-jail-skel/etc/passwd
+cbsd/share/DragonFly-jail-skel/etc/pwd.db
+cbsd/share/DragonFly-jail-skel/etc/rc.conf
+cbsd/share/DragonFly-jail-skel/etc/spwd.db
+cbsd/share/DragonFly-jail-skel/root/.bashrc
+cbsd/share/DragonFly-jail-skel/root/.cshrc
+cbsd/share/FreeBSD-filebases_11.txt.xz
+cbsd/share/FreeBSD-filebases_12.txt.xz
+cbsd/share/FreeBSD-filebases_13.txt.xz
+cbsd/share/FreeBSD-filebases_14.txt.xz
+cbsd/share/FreeBSD-filemin_11.txt.xz
+cbsd/share/FreeBSD-filemin_12.txt.xz
+cbsd/share/FreeBSD-filemin_13.txt.xz
+cbsd/share/FreeBSD-filemin_14.txt.xz
+cbsd/share/FreeBSD-git_branches.conf
+cbsd/share/FreeBSD-jail-centos-7-skel/placeholder
+cbsd/share/FreeBSD-jail-centos-7-system-skel/fstab.local
+cbsd/share/FreeBSD-jail-centos-7-system-skel/tests/00.check_distribution.sh
+cbsd/share/FreeBSD-jail-debian-buster-skel/placeholder
+cbsd/share/FreeBSD-jail-debian-buster-system-skel/fstab.local
+cbsd/share/FreeBSD-jail-debian-buster-system-skel/tests/00.check_distribution.sh
+cbsd/share/FreeBSD-jail-kfreebsd-wheezy-skel/placeholder
+cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/fstab.local
+cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/tests/00.check_distribution.sh
+cbsd/share/FreeBSD-jail-puppet-skel/etc/crontab
+cbsd/share/FreeBSD-jail-puppet-skel/etc/group
+cbsd/share/FreeBSD-jail-puppet-skel/etc/login.conf
+cbsd/share/FreeBSD-jail-puppet-skel/etc/login.conf.db
+cbsd/share/FreeBSD-jail-puppet-skel/etc/mail/aliases
+cbsd/share/FreeBSD-jail-puppet-skel/etc/mail/aliases.db
+cbsd/share/FreeBSD-jail-puppet-skel/etc/make.conf
+cbsd/share/FreeBSD-jail-puppet-skel/etc/master.passwd
+cbsd/share/FreeBSD-jail-puppet-skel/etc/motd
+cbsd/share/FreeBSD-jail-puppet-skel/etc/motd.template
+cbsd/share/FreeBSD-jail-puppet-skel/etc/passwd
+cbsd/share/FreeBSD-jail-puppet-skel/etc/pwd.db
+cbsd/share/FreeBSD-jail-puppet-skel/etc/rc.conf
+cbsd/share/FreeBSD-jail-puppet-skel/etc/rc.d/puppetstart
+cbsd/share/FreeBSD-jail-puppet-skel/etc/spwd.db
+cbsd/share/FreeBSD-jail-puppet-skel/root/.bashrc
+cbsd/share/FreeBSD-jail-puppet-skel/root/.cshrc
+cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/auth.conf-dist
+cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/puppet.conf
+cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/puppet.conf-dist
+cbsd/share/FreeBSD-jail-skel/etc/crontab
+cbsd/share/FreeBSD-jail-skel/etc/group
+cbsd/share/FreeBSD-jail-skel/etc/login.conf
+cbsd/share/FreeBSD-jail-skel/etc/login.conf.db
+cbsd/share/FreeBSD-jail-skel/etc/mail/aliases
+cbsd/share/FreeBSD-jail-skel/etc/mail/aliases.db
+cbsd/share/FreeBSD-jail-skel/etc/make.conf
+cbsd/share/FreeBSD-jail-skel/etc/master.passwd
+cbsd/share/FreeBSD-jail-skel/etc/motd
+cbsd/share/FreeBSD-jail-skel/etc/motd.template
+cbsd/share/FreeBSD-jail-skel/etc/passwd
+cbsd/share/FreeBSD-jail-skel/etc/pwd.db
+cbsd/share/FreeBSD-jail-skel/etc/rc.conf
+cbsd/share/FreeBSD-jail-skel/etc/spwd.db
+cbsd/share/FreeBSD-jail-skel/root/.bashrc
+cbsd/share/FreeBSD-jail-skel/root/.cshrc
+cbsd/share/FreeBSD-jail-ubuntu-focal-skel/placeholder
+cbsd/share/FreeBSD-jail-ubuntu-focal-system-skel/fstab.local
+cbsd/share/FreeBSD-jail-ubuntu-focal-system-skel/tests/00.check_distribution.sh
+cbsd/share/FreeBSD-jail-vnet-skel/etc/crontab
+cbsd/share/FreeBSD-jail-vnet-skel/etc/group
+cbsd/share/FreeBSD-jail-vnet-skel/etc/login.conf
+cbsd/share/FreeBSD-jail-vnet-skel/etc/login.conf.db
+cbsd/share/FreeBSD-jail-vnet-skel/etc/mail/aliases
+cbsd/share/FreeBSD-jail-vnet-skel/etc/mail/aliases.db
+cbsd/share/FreeBSD-jail-vnet-skel/etc/make.conf
+cbsd/share/FreeBSD-jail-vnet-skel/etc/master.passwd
+cbsd/share/FreeBSD-jail-vnet-skel/etc/motd
+cbsd/share/FreeBSD-jail-vnet-skel/etc/motd.template
+cbsd/share/FreeBSD-jail-vnet-skel/etc/passwd
+cbsd/share/FreeBSD-jail-vnet-skel/etc/pwd.db
+cbsd/share/FreeBSD-jail-vnet-skel/etc/rc.conf
+cbsd/share/FreeBSD-jail-vnet-skel/etc/spwd.db
+cbsd/share/FreeBSD-jail-vnet-skel/root/.bashrc
+cbsd/share/FreeBSD-jail-vnet-skel/root/.cshrc
+cbsd/share/FreeBSD-jail2iso-prunelist
+cbsd/share/HardenedBSD-filebases_11.txt.xz
+cbsd/share/HardenedBSD-git_branches.conf
 cbsd/share/autocompletion/bash/CBSDCompletion.bash
 cbsd/share/autocompletion/zsh/_cbsd
-cbsd/share/bhyve_cpu_topology.conf
-cbsd/share/bhyve_dskcontroller.conf
-cbsd/share/bhyve_nvme.conf
-cbsd/share/bhyve_p9shares.conf
-cbsd/share/bhyve_pcibus.conf
-cbsd/share/bhyve_settings.conf
-cbsd/share/bhyve_soundhw.conf
 cbsd/share/bhyve-system-default/create.d/placeholder
 cbsd/share/bhyve-system-default/facts.d/placeholder
 cbsd/share/bhyve-system-default/master_create.d/placeholder
@@ -451,9 +549,19 @@ cbsd/share/bhyve.conf
 cbsd/share/bhyve/bhyve-controller.subr
 cbsd/share/bhyve/bhyve-dsk.subr
 cbsd/share/bhyve/bhyve-nvme.subr
+cbsd/share/bhyve_cpu_topology.conf
+cbsd/share/bhyve_dskcontroller.conf
+cbsd/share/bhyve_nvme.conf
+cbsd/share/bhyve_p9shares.conf
+cbsd/share/bhyve_pcibus.conf
+cbsd/share/bhyve_settings.conf
+cbsd/share/bhyve_soundhw.conf
 cbsd/share/bhyvedsk.conf
 cbsd/share/bhyvenic.conf
 cbsd/share/bhyverun.sh
+cbsd/share/bsdconfig/cbsd/INDEX
+cbsd/share/bsdconfig/cbsd/Makefile
+cbsd/share/bsdconfig/cbsd/USAGE
 cbsd/share/bsdconfig/cbsd/basecfg
 cbsd/share/bsdconfig/cbsd/bhyve-cfg-nvme
 cbsd/share/bsdconfig/cbsd/bhyve-dskcontroller
@@ -469,34 +577,39 @@ cbsd/share/bsdconfig/cbsd/bhyvenic
 cbsd/share/bsdconfig/cbsd/bhyvenic-cfgnic
 cbsd/share/bsdconfig/cbsd/bhyvenic-newnic
 cbsd/share/bsdconfig/cbsd/cbsd
+cbsd/share/bsdconfig/cbsd/include/Makefile
 cbsd/share/bsdconfig/cbsd/include/bhyvenic.subr
 cbsd/share/bsdconfig/cbsd/include/jailnic.subr
-cbsd/share/bsdconfig/cbsd/include/Makefile
 cbsd/share/bsdconfig/cbsd/include/messages-bhyve-dskcontroller.subr
 cbsd/share/bsdconfig/cbsd/include/messages-bhyve-nvme.subr
 cbsd/share/bsdconfig/cbsd/include/messages-bhyvedsk.subr
 cbsd/share/bsdconfig/cbsd/include/messages-bhyvenic.subr
 cbsd/share/bsdconfig/cbsd/include/messages-jailnic.subr
 cbsd/share/bsdconfig/cbsd/include/messages-nodecfg.subr
+cbsd/share/bsdconfig/cbsd/include/messages-qemudsk.subr
+cbsd/share/bsdconfig/cbsd/include/messages-qemunic.subr
 cbsd/share/bsdconfig/cbsd/include/messages-repo.subr
 cbsd/share/bsdconfig/cbsd/include/messages-xendsk.subr
 cbsd/share/bsdconfig/cbsd/include/messages-xennic.subr
 cbsd/share/bsdconfig/cbsd/include/messages.subr
+cbsd/share/bsdconfig/cbsd/include/qemunic.subr
 cbsd/share/bsdconfig/cbsd/include/xennic.subr
-cbsd/share/bsdconfig/cbsd/INDEX
 cbsd/share/bsdconfig/cbsd/jailcfg
 cbsd/share/bsdconfig/cbsd/jailnic
 cbsd/share/bsdconfig/cbsd/jailnic-cfgnic
 cbsd/share/bsdconfig/cbsd/jailnic-newnic
-cbsd/share/bsdconfig/cbsd/Makefile
 cbsd/share/bsdconfig/cbsd/node
 cbsd/share/bsdconfig/cbsd/node-add
 cbsd/share/bsdconfig/cbsd/node-cfg
+cbsd/share/bsdconfig/cbsd/qemudsk
+cbsd/share/bsdconfig/cbsd/qemudsk-cfgdsk
+cbsd/share/bsdconfig/cbsd/qemudsk-newdsk
+cbsd/share/bsdconfig/cbsd/qemunic
+cbsd/share/bsdconfig/cbsd/qemunic-cfgnic
 cbsd/share/bsdconfig/cbsd/repo
 cbsd/share/bsdconfig/cbsd/repo-bases
 cbsd/share/bsdconfig/cbsd/repo-images
 cbsd/share/bsdconfig/cbsd/repo-kernels
-cbsd/share/bsdconfig/cbsd/USAGE
 cbsd/share/bsdconfig/cbsd/xencfg
 cbsd/share/bsdconfig/cbsd/xendsk
 cbsd/share/bsdconfig/cbsd/xendsk-cfgdsk
@@ -507,21 +620,8 @@ cbsd/share/cbsd_carp.conf
 cbsd/share/cbsdinit.sample
 cbsd/share/cbsdtaskd-taskd.schema
 cbsd/share/devfs.rules.sample
-cbsd/share/DragonFly-git_branches.conf
-cbsd/share/DragonFly-jail-skel/etc/crontab
-cbsd/share/DragonFly-jail-skel/etc/group
-cbsd/share/DragonFly-jail-skel/etc/mail/aliases
-cbsd/share/DragonFly-jail-skel/etc/mail/aliases.db
-cbsd/share/DragonFly-jail-skel/etc/make.conf
-cbsd/share/DragonFly-jail-skel/etc/master.passwd
-cbsd/share/DragonFly-jail-skel/etc/motd
-cbsd/share/DragonFly-jail-skel/etc/passwd
-cbsd/share/DragonFly-jail-skel/etc/pwd.db
-cbsd/share/DragonFly-jail-skel/etc/rc.conf
-cbsd/share/DragonFly-jail-skel/etc/spwd.db
-cbsd/share/DragonFly-jail-skel/root/.bashrc
-cbsd/share/DragonFly-jail-skel/root/.cshrc
 cbsd/share/emulators/ostype_bhyve.subr
+cbsd/share/emulators/ostype_qemu.subr
 cbsd/share/emulators/ostype_virtualbox.subr
 cbsd/share/emulators/ostype_xen.subr
 cbsd/share/etcupdate_11.txt.xz
@@ -552,85 +652,9 @@ 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/forms.schema
 cbsd/share/forms_system.schema
 cbsd/share/forms_yesno.schema
-cbsd/share/forms.schema
-cbsd/share/FreeBSD-filebases_11.txt.xz
-cbsd/share/FreeBSD-filebases_12.txt.xz
-cbsd/share/FreeBSD-filebases_13.txt.xz
-cbsd/share/FreeBSD-filebases_14.txt.xz
-cbsd/share/FreeBSD-filemin_11.txt.xz
-cbsd/share/FreeBSD-filemin_12.txt.xz
-cbsd/share/FreeBSD-filemin_13.txt.xz
-cbsd/share/FreeBSD-filemin_14.txt.xz
-cbsd/share/FreeBSD-git_branches.conf
-cbsd/share/FreeBSD-jail-centos-7-skel/placeholder
-cbsd/share/FreeBSD-jail-centos-7-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-centos-7-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-debian-buster-skel/placeholder
-cbsd/share/FreeBSD-jail-debian-buster-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-debian-buster-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-skel/placeholder
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-puppet-skel/etc/crontab
-cbsd/share/FreeBSD-jail-puppet-skel/etc/group
-cbsd/share/FreeBSD-jail-puppet-skel/etc/login.conf
-cbsd/share/FreeBSD-jail-puppet-skel/etc/login.conf.db
-cbsd/share/FreeBSD-jail-puppet-skel/etc/mail/aliases
-cbsd/share/FreeBSD-jail-puppet-skel/etc/mail/aliases.db
-cbsd/share/FreeBSD-jail-puppet-skel/etc/make.conf
-cbsd/share/FreeBSD-jail-puppet-skel/etc/master.passwd
-cbsd/share/FreeBSD-jail-puppet-skel/etc/motd
-cbsd/share/FreeBSD-jail-puppet-skel/etc/motd.template
-cbsd/share/FreeBSD-jail-puppet-skel/etc/passwd
-cbsd/share/FreeBSD-jail-puppet-skel/etc/pwd.db
-cbsd/share/FreeBSD-jail-puppet-skel/etc/rc.conf
-cbsd/share/FreeBSD-jail-puppet-skel/etc/rc.d/puppetstart
-cbsd/share/FreeBSD-jail-puppet-skel/etc/spwd.db
-cbsd/share/FreeBSD-jail-puppet-skel/root/.bashrc
-cbsd/share/FreeBSD-jail-puppet-skel/root/.cshrc
-cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/auth.conf-dist
-cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/puppet.conf
-cbsd/share/FreeBSD-jail-puppet-skel/usr/local/etc/puppet/puppet.conf-dist
-cbsd/share/FreeBSD-jail-skel/etc/crontab
-cbsd/share/FreeBSD-jail-skel/etc/group
-cbsd/share/FreeBSD-jail-skel/etc/login.conf
-cbsd/share/FreeBSD-jail-skel/etc/login.conf.db
-cbsd/share/FreeBSD-jail-skel/etc/mail/aliases
-cbsd/share/FreeBSD-jail-skel/etc/mail/aliases.db
-cbsd/share/FreeBSD-jail-skel/etc/make.conf
-cbsd/share/FreeBSD-jail-skel/etc/master.passwd
-cbsd/share/FreeBSD-jail-skel/etc/motd
-cbsd/share/FreeBSD-jail-skel/etc/motd.template
-cbsd/share/FreeBSD-jail-skel/etc/passwd
-cbsd/share/FreeBSD-jail-skel/etc/pwd.db
-cbsd/share/FreeBSD-jail-skel/etc/rc.conf
-cbsd/share/FreeBSD-jail-skel/etc/spwd.db
-cbsd/share/FreeBSD-jail-skel/root/.bashrc
-cbsd/share/FreeBSD-jail-skel/root/.cshrc
-cbsd/share/FreeBSD-jail-ubuntu-focal-skel/placeholder
-cbsd/share/FreeBSD-jail-ubuntu-focal-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-ubuntu-focal-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-vnet-skel/etc/crontab
-cbsd/share/FreeBSD-jail-vnet-skel/etc/group
-cbsd/share/FreeBSD-jail-vnet-skel/etc/login.conf
-cbsd/share/FreeBSD-jail-vnet-skel/etc/login.conf.db
-cbsd/share/FreeBSD-jail-vnet-skel/etc/mail/aliases
-cbsd/share/FreeBSD-jail-vnet-skel/etc/mail/aliases.db
-cbsd/share/FreeBSD-jail-vnet-skel/etc/make.conf
-cbsd/share/FreeBSD-jail-vnet-skel/etc/master.passwd
-cbsd/share/FreeBSD-jail-vnet-skel/etc/motd
-cbsd/share/FreeBSD-jail-vnet-skel/etc/motd.template
-cbsd/share/FreeBSD-jail-vnet-skel/etc/passwd
-cbsd/share/FreeBSD-jail-vnet-skel/etc/pwd.db
-cbsd/share/FreeBSD-jail-vnet-skel/etc/rc.conf
-cbsd/share/FreeBSD-jail-vnet-skel/etc/spwd.db
-cbsd/share/FreeBSD-jail-vnet-skel/root/.bashrc
-cbsd/share/FreeBSD-jail-vnet-skel/root/.cshrc
-cbsd/share/FreeBSD-jail2iso-prunelist
-cbsd/share/HardenedBSD-filebases_11.txt.xz
-cbsd/share/HardenedBSD-git_branches.conf
 cbsd/share/helpers/dhcpd/cbsd-dhcpd.conf
 cbsd/share/helpers/dhcpd/dhcpd_fixed.tpl
 cbsd/share/helpers/dhcpd/make_cbsd_dhcpd.sh
@@ -677,12 +701,17 @@ cbsd/share/local-jailnic.schema
 cbsd/share/local-jails.schema
 cbsd/share/local-local.schema
 cbsd/share/local-net.schema
+cbsd/share/local-qemu-pcibus.schema
+cbsd/share/local-qemu-settings.schema
+cbsd/share/local-qemu.schema
+cbsd/share/local-qemudsk.schema
+cbsd/share/local-qemunic.schema
 cbsd/share/local-rctl.schema
 cbsd/share/local-storage_media_map.schema
 cbsd/share/local-storage_pools.schema
 cbsd/share/local-unconfigured.schema
-cbsd/share/local-vale_ports.schema
 cbsd/share/local-vale.schema
+cbsd/share/local-vale_ports.schema
 cbsd/share/local-virtualbox.schema
 cbsd/share/local-virtualboxdsk.schema
 cbsd/share/local-virtualboxnic.schema
@@ -696,6 +725,24 @@ cbsd/share/local-xen.schema
 cbsd/share/local-xendsk.schema
 cbsd/share/local-xennic.schema
 cbsd/share/node-nodelist.schema
+cbsd/share/qemu-system-default/create.d/placeholder
+cbsd/share/qemu-system-default/facts.d/placeholder
+cbsd/share/qemu-system-default/master_create.d/placeholder
+cbsd/share/qemu-system-default/master_poststart.d/placeholder
+cbsd/share/qemu-system-default/master_poststop.d/placeholder
+cbsd/share/qemu-system-default/master_prestart.d/placeholder
+cbsd/share/qemu-system-default/master_prestop.d/placeholder
+cbsd/share/qemu-system-default/master_reboot.d/placeholder
+cbsd/share/qemu-system-default/placeholder
+cbsd/share/qemu-system-default/remove.d/placeholder
+cbsd/share/qemu-system-default/start.d/placeholder
+cbsd/share/qemu-system-default/stop.d/placeholder
+cbsd/share/qemu.conf
+cbsd/share/qemu/qemu-dsk.subr
+cbsd/share/qemu_pcibus.conf
+cbsd/share/qemu_settings.conf
+cbsd/share/qemudsk.conf
+cbsd/share/qemunic.conf
 cbsd/share/racct.schema
 cbsd/share/rctl.conf
 cbsd/share/storage_pools.conf
@@ -710,13 +757,12 @@ cbsd/share/vpc.conf
 cbsd/share/vpnet-vpnet.schema
 cbsd/share/webdev-jails.schema
 cbsd/share/webdev-jimages.schema
-cbsd/share/webdev-modules_groups.schema
 cbsd/share/webdev-modules.schema
+cbsd/share/webdev-modules_groups.schema
 cbsd/share/webdev-packages.schema
 cbsd/share/webdev-pkg_groups_link.schema
 cbsd/share/webdev-projects.schema
 cbsd/share/webdev-virtual_private_net.schema
-cbsd/share/xen_settings.conf
 cbsd/share/xen-system-default/create.d/placeholder
 cbsd/share/xen-system-default/facts.d/placeholder
 cbsd/share/xen-system-default/master_create.d/placeholder
@@ -731,8 +777,13 @@ cbsd/share/xen-system-default/start.d/placeholder
 cbsd/share/xen-system-default/stop.d/placeholder
 cbsd/share/xen.conf
 cbsd/share/xen/xen-dsk.subr
+cbsd/share/xen_settings.conf
 cbsd/share/xendsk.conf
 cbsd/share/xennic.conf
+cbsd/subr/DragonFly.subr
+cbsd/subr/FreeBSD.subr
+cbsd/subr/HardenedBSD.subr
+cbsd/subr/Linux.subr
 cbsd/subr/ansiicolor.subr
 cbsd/subr/bhyve.subr
 cbsd/subr/bsdconfig.subr
@@ -743,31 +794,31 @@ cbsd/subr/cbsdfile.subr
 cbsd/subr/cbsdinit.subr
 cbsd/subr/dialog.subr
 cbsd/subr/distccache.subr
-cbsd/subr/DragonFly.subr
 cbsd/subr/emulator.subr
 cbsd/subr/env_register.subr
 cbsd/subr/fetch.subr
 cbsd/subr/freebsd_world.subr
-cbsd/subr/FreeBSD.subr
 cbsd/subr/hammer.subr
-cbsd/subr/HardenedBSD.subr
 cbsd/subr/imghelper.subr
 cbsd/subr/initenv.subr
 cbsd/subr/ipfw.subr
 cbsd/subr/jcreate.subr
 cbsd/subr/jfs.subr
 cbsd/subr/jrctl.subr
-cbsd/subr/Linux.subr
+cbsd/subr/jsetup-tui.subr
+cbsd/subr/jstart.subr
 cbsd/subr/mailtools.subr
 cbsd/subr/mdtools.subr
 cbsd/subr/multiple.subr
 cbsd/subr/nc.subr
 cbsd/subr/nodes.subr
+cbsd/subr/qemu.subr
 cbsd/subr/rcconf.subr
 cbsd/subr/rctl.subr
 cbsd/subr/rrcconf.subr
 cbsd/subr/settings-tui-bhyve.subr
 cbsd/subr/settings-tui-jail.subr
+cbsd/subr/settings-tui-qemu.subr
 cbsd/subr/settings-tui-virtual.subr
 cbsd/subr/settings-tui-xen.subr
 cbsd/subr/settings-tui.subr
@@ -776,7 +827,6 @@ cbsd/subr/sudoexec.subr
 cbsd/subr/system.subr
 cbsd/subr/time.subr
 cbsd/subr/tools.subr
-cbsd/subr/TrueOS.subr
 cbsd/subr/universe.subr
 cbsd/subr/virtual.subr
 cbsd/subr/virtualbox.subr
@@ -805,6 +855,11 @@ cbsd/sudoexec/jstart
 cbsd/sudoexec/jstop
 cbsd/sudoexec/junregister
 cbsd/sudoexec/mkdatadir
+cbsd/sudoexec/qcreate
+cbsd/sudoexec/qdestroy
+cbsd/sudoexec/qremove
+cbsd/sudoexec/qstart
+cbsd/sudoexec/qstop
 cbsd/sudoexec/secretsfile
 cbsd/sudoexec/vpc
 cbsd/sudoexec/vremove
@@ -844,23 +899,17 @@ cbsd/tools/attachgeli
 cbsd/tools/attachzfs
 cbsd/tools/bases
 cbsd/tools/baseupdate
-cbsd/tools/bconstruct-tui
 cbsd/tools/bhyve-controller
 cbsd/tools/bhyve-controller-list
-cbsd/tools/bhyve-controller-tui
 cbsd/tools/bhyve-dsk
 cbsd/tools/bhyve-dsk-list
-cbsd/tools/bhyve-dsk-tui
 cbsd/tools/bhyve-exist
 cbsd/tools/bhyve-nic
 cbsd/tools/bhyve-nic-list
-cbsd/tools/bhyve-nic-tui
 cbsd/tools/bhyve-nvme
 cbsd/tools/bhyve-nvme-list
-cbsd/tools/bhyve-nvme-tui
 cbsd/tools/bhyve-p9shares
 cbsd/tools/bhyve-ppt
-cbsd/tools/bhyvecfg-passhtu-tui
 cbsd/tools/bootmgmt
 cbsd/tools/bootmgmt-pxe
 cbsd/tools/bridge
@@ -899,19 +948,15 @@ cbsd/tools/history
 cbsd/tools/images
 cbsd/tools/images-list
 cbsd/tools/imghelper
-cbsd/tools/imghelper-tui
 cbsd/tools/imgpart
 cbsd/tools/imgpart2
 cbsd/tools/imgremove
 cbsd/tools/imgtype
 cbsd/tools/initenv
-cbsd/tools/initenv-tui
 cbsd/tools/iscsi-discovery
 cbsd/tools/jail2iso
 cbsd/tools/jailmapdb
-cbsd/tools/jailnic-tui
 cbsd/tools/jconstruct
-cbsd/tools/jconstruct-tui
 cbsd/tools/jgensecrets
 cbsd/tools/jrsyncconf
 cbsd/tools/kernels
@@ -928,7 +973,6 @@ cbsd/tools/mkjhosts
 cbsd/tools/mountfstab
 cbsd/tools/mountmd
 cbsd/tools/natcfg
-cbsd/tools/natcfg-tui
 cbsd/tools/natoff
 cbsd/tools/naton
 cbsd/tools/netinv
@@ -946,7 +990,6 @@ cbsd/tools/racct-jail-statsd
 cbsd/tools/rctlcounters
 cbsd/tools/replacewdir
 cbsd/tools/repo
-cbsd/tools/repo-tui
 cbsd/tools/retrinv
 cbsd/tools/rsyncdoff
 cbsd/tools/rsyncdon
@@ -956,7 +999,6 @@ cbsd/tools/show_profile_list
 cbsd/tools/sockstat
 cbsd/tools/sources
 cbsd/tools/sqlrep
-cbsd/tools/srvbrowser-tui
 cbsd/tools/sshkey
 cbsd/tools/status
 cbsd/tools/summary
@@ -969,22 +1011,50 @@ cbsd/tools/unmountmd
 cbsd/tools/up
 cbsd/tools/vale-ctl
 cbsd/tools/valecfg
-cbsd/tools/valecfg-tui
-cbsd/tools/vconstruct-tui
 cbsd/tools/vhidcfg
-cbsd/tools/vhidcfg-tui
 cbsd/tools/vm-cpu-topology
-cbsd/tools/vm-cpu-topology-tui
 cbsd/tools/vm-packages
-cbsd/tools/vm-packages-tui
 cbsd/tools/vpc
-cbsd/tools/xconstruct-tui
 cbsd/tools/xen-dsk
 cbsd/tools/xen-dsk-list
-cbsd/tools/xen-dsk-tui
 cbsd/tools/xen-exist
-cbsd/tools/xen-nic-tui
 cbsd/tools/zfs-migrator
+cbsd/tui/bconstruct-tui
+cbsd/tui/bcontrol-tui
+cbsd/tui/bhyve-controller-tui
+cbsd/tui/bhyve-dsk-tui
+cbsd/tui/bhyve-nic-tui
+cbsd/tui/bhyve-nvme-tui
+cbsd/tui/bhyvecfg-passhtu-tui
+cbsd/tui/border-tui
+cbsd/tui/brctl-tui
+cbsd/tui/bsetup-tui
+cbsd/tui/imghelper-tui
+cbsd/tui/initenv-tui
+cbsd/tui/jailnic-tui
+cbsd/tui/jconstruct-tui
+cbsd/tui/jcontrol-tui
+cbsd/tui/jorder-tui
+cbsd/tui/jrctl-tui
+cbsd/tui/jsetup-tui
+cbsd/tui/natcfg-tui
+cbsd/tui/qconstruct-tui
+cbsd/tui/qemu-dsk-tui
+cbsd/tui/qemu-nic-tui
+cbsd/tui/qsetup-tui
+cbsd/tui/repo-tui
+cbsd/tui/srvbrowser-tui
+cbsd/tui/valecfg-tui
+cbsd/tui/vconstruct-tui
+cbsd/tui/vcontrol-tui
+cbsd/tui/vhidcfg-tui
+cbsd/tui/vm-cpu-topology-tui
+cbsd/tui/vm-packages-tui
+cbsd/tui/vsetup-tui
+cbsd/tui/xconstruct-tui
+cbsd/tui/xen-dsk-tui
+cbsd/tui/xen-nic-tui
+cbsd/tui/xsetup-tui
 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
@@ -1011,8 +1081,8 @@ cbsd/upgrade/patch/kmem-11.1/patch-11x-sys-dev-drm2-drm_os_freebsd.h
 cbsd/upgrade/patch/kmem-11.1/patch-11x-sys-kern-kern_jail.c
 cbsd/upgrade/patch/kmem-11.1/patch-11x-sys-sys-jail.h
 cbsd/upgrade/patch/kmem-11.1/patch-11x-sys-sys-priv.h
-cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-dev-drm-drm_os_freebsd.h
 cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-dev-drm-drmP.h
+cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-dev-drm-drm_os_freebsd.h
 cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-dev-drm2-drm_os_freebsd.h
 cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-kern-kern_jail.c
 cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-sys-jail.h
@@ -1020,16 +1090,16 @@ cbsd/upgrade/patch/kmem-12.0/patch-11x-sys-sys-priv.h
 cbsd/upgrade/patch/lro-13.0/patch-usr-sbin-bhyve-net_backends.c
 cbsd/upgrade/patch/lro-14.0/patch-usr-sbin-bhyve-net_backends.c
 cbsd/upgrade/patch/p9-12.0/patch-12x-etc-mtree-BSD.include.dist
-cbsd/upgrade/patch/p9-12.0/patch-12x-lib-lib9p-Makefile
 cbsd/upgrade/patch/p9-12.0/patch-12x-lib-Makefile
+cbsd/upgrade/patch/p9-12.0/patch-12x-lib-lib9p-Makefile
 cbsd/upgrade/patch/p9-12.0/patch-12x-share-mk-bsd.libnames.mk
 cbsd/upgrade/patch/p9-12.0/patch-12x-share-mk-src.libnames.mk
 cbsd/upgrade/patch/p9-12.0/patch-12x-usr.sbin-bhyve-Makefile
 cbsd/upgrade/patch/p9-12.0/patch-12x-usr.sbin-bhyve-pci_virtio_9p.c
 cbsd/upgrade/patch/p9-12.0/patch-12x-usr.sbin-bhyve-virtio.h
 cbsd/upgrade/patch/p9-13.0/patch-13x-etc-mtree-BSD.include.dist
-cbsd/upgrade/patch/p9-13.0/patch-13x-lib-lib9p-Makefile
 cbsd/upgrade/patch/p9-13.0/patch-13x-lib-Makefile
+cbsd/upgrade/patch/p9-13.0/patch-13x-lib-lib9p-Makefile
 cbsd/upgrade/patch/p9-13.0/patch-13x-share-mk-bsd.libnames.mk
 cbsd/upgrade/patch/p9-13.0/patch-13x-share-mk-src.libnames.mk
 cbsd/upgrade/patch/p9-13.0/patch-13x-usr.sbin-bhyve-Makefile
@@ -1101,12 +1171,12 @@ cbsd/upgrade/pre-patch-12.1.5.1
 cbsd/upgrade/pre-patch-12.1.5.2
 cbsd/upgrade/pre-patch-12.1.9.1
 cbsd/upgrade/pre-patch-12.1.9.2
+cbsd/upgrade/pre-patch-13.0.11.0
+cbsd/upgrade/pre-patch-13.0.11.1
+cbsd/upgrade/pre-patch-13.0.11.2
+cbsd/upgrade/pre-patch-13.0.16.0
 cbsd/upgrade/pre-patch-13.0.2.0
 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.0.11.0
-cbsd/upgrade/pre-patch-13.0.11.1
-cbsd/upgrade/pre-patch-13.0.11.2
-cbsd/upgrade/pre-patch-13.0.16.0