sync

16 files changed, 62 insertions, 14 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c736b26d34b..98604bce93d 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -384,3 +384,6 @@
 ./usr/lib/perl5/site_perl/alpha-openbsd/sched.ph
 ./usr/lib/perl5/site_perl/alpha-openbsd/spinlock.ph
 ./usr/lib/perl5/site_perl/alpha-openbsd/sys/kthread.ph
+./usr/lib/perl5/site_perl/alpha-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/alpha-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/alpha-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 6978d6f8c39..0dbf497c789 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -10,7 +10,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4/2.8.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4/2.8.1/include/objc
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.0
 ./usr/lib/libdes.so.6.0
@@ -594,3 +594,6 @@
 ./usr/share/keymaps/amiga/sw.map
 ./usr/share/keymaps/amiga/us.map
 ./usr/lib/perl5/site_perl/m68k-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index a4d53906f70..d9935c73d81 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -11,7 +11,7 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.4/2.8.1/include
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.4/2.8.1/include/objc
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.0
 ./usr/lib/libdes.so.6.0
@@ -412,3 +412,6 @@
 ./usr/mipsel-unknown-openbsd2.4/lib
 ./usr/mipsel-unknown-openbsd2.4/lib/ldscripts
 ./usr/lib/perl5/site_perl/mips-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/mips-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/mips-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/mips-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index ff47a337fd0..3b0ef2015f2 100644
--- a/distrib/sets/lists/base/md.atari
+++ b/distrib/sets/lists/base/md.atari
@@ -3,7 +3,7 @@
 ./usr/bin/ldd
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcurses.so.4.2
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -31,3 +31,6 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/libexec/ld.so
 ./usr/sbin/iteconfig
+./usr/lib/perl5/site_perl/m68k-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index cbbbcdcabaa..aa2b34c6c99 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -4,7 +4,7 @@
 ./usr/include/readline
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libc_r.so.0.0
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.1
@@ -597,3 +597,6 @@
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
 ./usr/lib/perl5/site_perl/m68k-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 501285771da..eae6fdf95a5 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -7,7 +7,7 @@
 ./usr/include/i386
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.4
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libc_r.so.0.0
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.1
@@ -404,7 +404,6 @@
 ./usr/lib/perl5/site_perl/i386-openbsd/net
 ./usr/lib/perl5/site_perl/i386-openbsd/net/bpf.ph
 ./usr/lib/perl5/site_perl/i386-openbsd/net/bpfdesc.ph
-./usr/lib/perl5/site_perl/i386-openbsd/net/encap.ph
 ./usr/lib/perl5/site_perl/i386-openbsd/net/if.ph
 ./usr/lib/perl5/site_perl/i386-openbsd/net/if_arp.ph
 ./usr/lib/perl5/site_perl/i386-openbsd/net/if_atm.ph
@@ -643,3 +642,6 @@
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
 ./usr/lib/perl5/site_perl/i386-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/i386-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/i386-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/i386-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 9811ac453c5..d8bd1082e8a 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -9,7 +9,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4/2.8.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4/2.8.1/include/objc
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.1
 ./usr/lib/libdes.so.6.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 5ae7156986d..c6229090be8 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -4,7 +4,7 @@
 ./usr/include/m68k
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.4
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libc_r.so.0.0
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.1
@@ -610,3 +610,6 @@
 ./usr/mdec/sboot
 ./usr/mdec/stboot
 ./usr/lib/perl5/site_perl/m68k-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/m68k-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index bc0eb19d882..8310a2edda2 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -16,3 +16,6 @@
 ./usr/mdec/netboot
 ./usr/mdec/stboot
 ./usr/lib/perl5/site_perl/m88k-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/m88k-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/m88k-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/m88k-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index ea3fb80b603..c9e1c632ace 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -3,7 +3,7 @@
 ./usr/bin/ldd
 ./usr/include/ns32k
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcurses.so.4.2
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 7e193e9a18b..e38ae6d496e 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -8,7 +8,7 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.4/2.8.1/include
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.4/2.8.1/include/objc
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.0
 ./usr/lib/libdes.so.6.0
@@ -423,3 +423,6 @@
 ./usr/mipsel-unknown-openbsd2.4/lib
 ./usr/mipsel-unknown-openbsd2.4/lib/ldscripts
 ./usr/lib/perl5/site_perl/mips-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/mips-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/mips-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/mips-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 66ef87ce248..cd97cace28a 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -7,7 +7,7 @@
 ./usr/include/sparc
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.4
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libc_r.so.0.0
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.1
@@ -612,3 +612,6 @@
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
 ./usr/lib/perl5/site_perl/sparc-openbsd/dbm.ph
+./usr/lib/perl5/site_perl/sparc-openbsd/net/if_bridge.ph
+./usr/lib/perl5/site_perl/sparc-openbsd/skipjack.ph
+./usr/lib/perl5/site_perl/sparc-openbsd/sys/pool.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 74156b26b9a..c58b2751465 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -4,7 +4,7 @@
 ./usr/bin/ldd
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.21.0
+./usr/lib/libc.so.21.1
 ./usr/lib/libcrypto.so.1.0
 ./usr/lib/libcurses.so.5.0
 ./usr/lib/libdes.so.6.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index b37b277dfca..d6191adfb7f 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1362,6 +1362,7 @@
 ./usr/share/man/man3
 ./usr/share/man/man4
 ./usr/share/man/man4/amiga
+./usr/share/man/man4/arc
 ./usr/share/man/man4/arm32
 ./usr/share/man/man4/atari
 ./usr/share/man/man4/hp300
@@ -2505,3 +2506,5 @@
 ./var/yp/README
 ./usr/bin/zegrep
 ./usr/bin/zfgrep
+./usr/sbin/brconfig
+./var/www/icons/small
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 8ee870f6ed8..b11a350a19f 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -730,7 +730,6 @@
 ./usr/include/ndbm.h
 ./usr/include/net/bpf.h
 ./usr/include/net/bpfdesc.h
-./usr/include/net/encap.h
 ./usr/include/net/if.h
 ./usr/include/net/if_arp.h
 ./usr/include/net/if_atm.h
@@ -2822,3 +2821,6 @@
 ./usr/include/netinet6/debug.h
 ./usr/include/netinet6/debug_inet6.h
 ./usr/include/netinet6/osdep.h
+./usr/include/net/if_bridge.h
+./usr/include/skipjack.h
+./usr/include/sys/pool.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index a638c183d8d..f90e0beff59 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -594,7 +594,6 @@
 ./usr/share/man/cat4/adw.0
 ./usr/share/man/cat4/ahc.0
 ./usr/share/man/cat4/alpha
-./usr/share/man/cat4/alpha/autoconf.0
 ./usr/share/man/cat4/alpha/com.0
 ./usr/share/man/cat4/alpha/cy.0
 ./usr/share/man/cat4/alpha/ed.0
@@ -1342,3 +1341,18 @@
 ./usr/share/man/man4/pmax
 ./usr/share/man/man4/powerpc
 ./usr/share/man/cat3/keybound.0
+./usr/share/man/cat1/zcmp.0
+./usr/share/man/cat1/zegrep.0
+./usr/share/man/cat1/zfgrep.0
+./usr/share/man/cat4/arc
+./usr/share/man/cat4/arc/autoconf.0
+./usr/share/man/cat4/arc/com.0
+./usr/share/man/cat4/arc/ed.0
+./usr/share/man/cat4/arc/intro.0
+./usr/share/man/cat4/arc/le.0
+./usr/share/man/cat4/arc/lpt.0
+./usr/share/man/cat4/arc/pms.0
+./usr/share/man/cat4/arc/wd.0
+./usr/share/man/cat4/bridge.0
+./usr/share/man/cat8/brconfig.0
+./usr/share/man/cat8/ipsecadm.0