sync

13 files changed, 60 insertions, 39 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index e370c2d1637..c6a6ab22ed7 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -661,3 +661,4 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/memrange.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index afcd1b19390..7bfa53c885c 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -10,11 +10,11 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -36,8 +36,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -689,3 +689,4 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/memrange.ph
 ./usr/lib/libperl.so.5.3
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index eeaf8d3515d..12de46d62c9 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.6/2.8.1/include
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1/include/objc
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
+./usr/lib/libc.so.24.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.5.0
@@ -444,3 +444,4 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/memrange.ph
 ./usr/lib/libperl.so.5.3
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 99c70777690..575a55baa6e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -27,11 +27,11 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -54,8 +54,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -689,3 +689,4 @@
 ./usr/mdec/uboot.lif
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 60a5e6b47f4..62cda0be61f 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -30,11 +30,11 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -57,8 +57,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -735,3 +735,4 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_gif.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/net_osdep.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 8147b4501ff..9e14e68ad3f 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -7,11 +7,11 @@
 ./usr/include/mac68k
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -33,8 +33,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -683,3 +683,4 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/memrange.ph
 ./usr/lib/libperl.so.5.3
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index a88275fac0d..04242c8b56c 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -8,11 +8,11 @@
 ./usr/include/mvme68k
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -34,8 +34,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -684,3 +684,4 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/memrange.ph
 ./usr/lib/libperl.so.5.3
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 8f4363b96bd..3c222731ab6 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -416,3 +416,4 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/memrange.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index cdb5c31c610..faff757a083 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -7,11 +7,11 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -30,8 +30,8 @@
 ./usr/lib/libpcap.so.1.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -697,3 +697,4 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/memrange.ph
 ./usr/lib/libperl.so.5.3
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 8a9cdfe20ce..554e8a7deca 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -389,3 +389,4 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/memrange.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 37e4127fd12..08ed6e3930a 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -13,11 +13,11 @@
 ./usr/include/sparc
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.3
-./usr/lib/libc_r.so.1.2
+./usr/lib/libc.so.24.0
+./usr/lib/libc_r.so.2.0
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
-./usr/lib/libcurses.so.5.2
+./usr/lib/libcurses.so.6.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
@@ -39,8 +39,8 @@
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
-./usr/lib/libtermcap.so.5.2
-./usr/lib/libtermlib.so.5.2
+./usr/lib/libtermcap.so.6.0
+./usr/lib/libtermlib.so.6.0
 ./usr/lib/libutil.so.4.4
 ./usr/lib/libwrap.so.1.1
 ./usr/lib/libz.so.1.3
@@ -711,3 +711,4 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_gif.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/net_osdep.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_token.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_gre.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index edfd48557d0..684a9a8214a 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -265,7 +265,6 @@
 ./usr/include/dev/pci/if_lmc_types.h
 ./usr/include/dev/pci/if_lmcioctl.h
 ./usr/include/dev/pci/if_lmcvar.h
-./usr/include/dev/pci/if_mxreg.h
 ./usr/include/dev/pci/if_pnreg.h
 ./usr/include/dev/pci/if_rlreg.h
 ./usr/include/dev/pci/if_sfreg.h
@@ -383,7 +382,6 @@
 ./usr/include/dev/raidframe/rf_sstf.h
 ./usr/include/dev/raidframe/rf_states.h
 ./usr/include/dev/raidframe/rf_stripelocks.h
-./usr/include/dev/raidframe/rf_sys.h
 ./usr/include/dev/raidframe/rf_threadid.h
 ./usr/include/dev/raidframe/rf_threadstuff.h
 ./usr/include/dev/raidframe/rf_types.h
@@ -3315,3 +3313,5 @@
 ./usr/share/mk/bsd.subdir.mk
 ./usr/share/mk/bsd.sys.mk
 ./var/db/libc.tags
+./usr/include/net/if_gre.h
+./usr/include/netinet/ip_gre.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 736be30730b..78e4dda9eb8 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -595,6 +595,15 @@
 ./usr/share/man/cat3/inet6_rthdr_reverse.0
 ./usr/share/man/cat3/inet6_rthdr_segments.0
 ./usr/share/man/cat3/inet6_rthdr_space.0
+./usr/share/man/cat3/pthread_attr_destroy.0
+./usr/share/man/cat3/pthread_attr_getdetachstate.0
+./usr/share/man/cat3/pthread_attr_getstackaddr.0
+./usr/share/man/cat3/pthread_attr_getstacksize.0
+./usr/share/man/cat3/pthread_attr_init.0
+./usr/share/man/cat3/pthread_attr_setdetachstate.0
+./usr/share/man/cat3/pthread_attr_setstackaddr.0
+./usr/share/man/cat3/pthread_attr_setstacksize.0
+./usr/share/man/cat3/pthread_set_name_np.0
 ./usr/share/man/cat3/set_form_userptr.0
 ./usr/share/man/cat3/set_form_win.0
 ./usr/share/man/cat3/set_item_init.0
@@ -860,6 +869,7 @@
 ./usr/share/man/cat4/ffs_softupdates.0
 ./usr/share/man/cat4/fpa.0
 ./usr/share/man/cat4/fxp.0
+./usr/share/man/cat4/gre.0
 ./usr/share/man/cat4/hp300/autoconf.0
 ./usr/share/man/cat4/hp300/cons.0
 ./usr/share/man/cat4/hp300/ct.0
@@ -935,7 +945,6 @@
 ./usr/share/man/cat4/icsphy.0
 ./usr/share/man/cat4/idp.0
 ./usr/share/man/cat4/ifmedia.0
-./usr/share/man/cat4/imp.0
 ./usr/share/man/cat4/inet.0
 ./usr/share/man/cat4/inphy.0
 ./usr/share/man/cat4/ip.0
@@ -1261,6 +1270,7 @@
 ./usr/share/man/cat7/msafer.0
 ./usr/share/man/cat7/ports.0
 ./usr/share/man/cat7/re_format.0
+./usr/share/man/cat7/securelevel.0
 ./usr/share/man/cat7/symlink.0
 ./usr/share/man/cat7/term.0
 ./usr/share/man/cat8/ab.0