sync

21 files changed, 20 insertions, 2 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 2aceb70b1f4..477ab743315 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1657,6 +1657,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index ddd04632091..8ebf41f96e7 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1685,6 +1685,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index d1c5e05c34e..2babfb8c009 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1718,6 +1718,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index d51341aa4f1..eec888afcce 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1641,6 +1641,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index e4e9efe2f75..803c76e3b9f 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1666,6 +1666,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index ace1812d3ce..461492972a6 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1666,6 +1666,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index f1152e0b067..407dfda2bbc 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1698,6 +1698,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 90c244e4cdf..3bf3406ebcf 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1582,6 +1582,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 62bd4d1d364..242dafd01cc 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1645,6 +1645,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d0f12000fd3..3ccdcc5171d 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1674,6 +1674,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 1cbfd48bc01..a5882d27d84 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1641,6 +1641,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 44701840079..cce3e77910d 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1591,6 +1591,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 6fc3db07667..d19aade645b 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1592,6 +1592,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index bb434a98572..763d73209c4 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1662,6 +1662,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index a8836724c1f..271e107dc25 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1063,6 +1063,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 5aa8bace1af..1818c6b0bbf 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1105,6 +1105,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 0ec88c57c93..351932fe5cc 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -999,6 +999,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index aba9edc505b..9844abe8683 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1659,6 +1659,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_stripvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/net/if_trunk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_tun.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/net/if_vlan_var.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index f3279166127..2d1d128481a 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1721,7 +1721,6 @@
 ./usr/libexec/spellprog
 ./usr/libexec/ssh-keysign
 ./usr/libexec/tcpd
-./usr/libexec/telnetd
 ./usr/libexec/tftpd
 ./usr/libexec/uucpd
 ./usr/libexec/vfontedpr
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 1794ca0fe83..c3f43361d1b 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -961,6 +961,7 @@
 ./usr/include/net/if_sppp.h
 ./usr/include/net/if_stripvar.h
 ./usr/include/net/if_token.h
+./usr/include/net/if_trunk.h
 ./usr/include/net/if_tun.h
 ./usr/include/net/if_types.h
 ./usr/include/net/if_vlan_var.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 2ced5d022cc..a7f5530aa9b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1606,6 +1606,7 @@
 ./usr/share/man/cat4/tlphy.0
 ./usr/share/man/cat4/tqphy.0
 ./usr/share/man/cat4/trm.0
+./usr/share/man/cat4/trunk.0
 ./usr/share/man/cat4/tty.0
 ./usr/share/man/cat4/tun.0
 ./usr/share/man/cat4/twe.0
@@ -2338,7 +2339,6 @@
 ./usr/share/man/cat8/tcpdmatch.0
 ./usr/share/man/cat8/tcpdrop.0
 ./usr/share/man/cat8/tcpdump.0
-./usr/share/man/cat8/telnetd.0
 ./usr/share/man/cat8/tftpd.0
 ./usr/share/man/cat8/timed.0
 ./usr/share/man/cat8/timedc.0