sync

17 files changed, 1 insertions, 31 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index dc2a5e325b3..a3b2c87dac7 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1281,8 +1281,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d704437e3cd..0ae4f092ad1 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1311,8 +1311,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index ed423aa94d1..161c82aaa55 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1298,8 +1298,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 86d7ef26ab9..ca957c81c60 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1229,8 +1229,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 350d59ac716..fde18ed10aa 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1236,8 +1236,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index e339e318048..2698ac1f6ce 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1195,8 +1195,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 75860e35c5e..eaf3a468fa6 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1200,8 +1200,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 7ce90c6e029..47d18521c70 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1166,8 +1166,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 220fda20797..c5516e45372 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1231,8 +1231,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index d083f22a24d..e87e8450a5b 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1198,8 +1198,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index abaea7a0275..8541ec4818e 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1229,8 +1229,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 592347233c6..e8cfaddacab 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1224,8 +1224,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 3c97971d0f8..7b3f7aa0a1e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -769,8 +769,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f0a8eb30f9b..71fbcde2733 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -827,8 +827,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbf.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbfvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/uslhcomreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/utvfu.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 9d9e24a0ee8..7e582210ce1 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -54,6 +54,7 @@
 ./etc/examples/chio.conf
 ./etc/examples/dhclient.conf
 ./etc/examples/dhcpd.conf
+./etc/examples/doas.conf
 ./etc/examples/dvmrpd.conf
 ./etc/examples/eigrpd.conf
 ./etc/examples/exports
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c8fe82370e5..55933a83c1f 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -773,8 +773,6 @@
 ./usr/include/dev/usb/usbdi.h
 ./usr/include/dev/usb/usbdi_util.h
 ./usr/include/dev/usb/usbdivar.h
-./usr/include/dev/usb/usbf.h
-./usr/include/dev/usb/usbfvar.h
 ./usr/include/dev/usb/usbhid.h
 ./usr/include/dev/usb/uslhcomreg.h
 ./usr/include/dev/usb/utvfu.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 84004d6129e..4c629ec4c3b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1850,7 +1850,6 @@
 ./usr/share/man/man4/urtw.4
 ./usr/share/man/man4/urtwn.4
 ./usr/share/man/man4/usb.4
-./usr/share/man/man4/usbf.4
 ./usr/share/man/man4/uscom.4
 ./usr/share/man/man4/uslcom.4
 ./usr/share/man/man4/uslhcom.4