sync

8 files changed, 38 insertions, 35 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 13c5d1c8dbb..afcd1b19390 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.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.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 34e33002a57..eeaf8d3515d 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.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.5.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index e9b96f0571b..99c70777690 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -5,11 +5,29 @@
 ./usr/include/hp300
 ./usr/include/m68k
 ./usr/include/readline
+./usr/lib/apache/modules/libproxy.so
+./usr/lib/apache/modules/mod_auth_anon.so
+./usr/lib/apache/modules/mod_auth_db.so
+./usr/lib/apache/modules/mod_auth_dbm.so
+./usr/lib/apache/modules/mod_auth_digest.so
+./usr/lib/apache/modules/mod_cern_meta.so
+./usr/lib/apache/modules/mod_define.so
+./usr/lib/apache/modules/mod_digest.so
+./usr/lib/apache/modules/mod_info.so
+./usr/lib/apache/modules/mod_log_agent.so
+./usr/lib/apache/modules/mod_log_referer.so
+./usr/lib/apache/modules/mod_mime_magic.so
+./usr/lib/apache/modules/mod_mmap_static.so
+./usr/lib/apache/modules/mod_rewrite.so
+./usr/lib/apache/modules/mod_speling.so
+./usr/lib/apache/modules/mod_unique_id.so
+./usr/lib/apache/modules/mod_usertrack.so
+./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
 ./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.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
@@ -32,6 +50,7 @@
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.0
+./usr/lib/libperl.so.5.3
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.2.0
 ./usr/lib/libstdc++.so.30.0
@@ -376,6 +395,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fstab.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fts.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/glob.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/gmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/grp.ph
@@ -444,14 +464,18 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_dl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_enc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_fddi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_llc.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_media.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_ppp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_pppvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_slvar.ph
+./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_tun.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_types.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/net_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/netisr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/pfkeyv2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/ppp-comp.ph
@@ -471,6 +495,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/olf_abi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/panel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/paths.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-namedb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/pcap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/poll.ph
@@ -502,6 +527,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/spinlock.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/stab.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/stdarg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/stdbool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/stddef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/stdio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/stdlib.ph
@@ -510,6 +536,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/struct.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/acct.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/buf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/callout.ph
@@ -559,6 +586,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/map.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/mbuf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/md5k.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/memrange.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/midiio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/mman.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/mount.ph
@@ -578,6 +606,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/resource.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/resourcevar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/scanio.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/sched.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/scsiio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/select.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/sem.ph
@@ -650,6 +679,7 @@
 ./usr/mdec/bootct
 ./usr/mdec/boothd
 ./usr/mdec/bootsd
+./usr/mdec/cdboot.lif
 ./usr/mdec/ctboot
 ./usr/mdec/hdboot
 ./usr/mdec/installboot
@@ -657,33 +687,5 @@
 ./usr/mdec/rbootd/SYS_UBOOT
 ./usr/mdec/sdboot
 ./usr/mdec/uboot.lif
-./usr/mdec/cdboot.lif
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
-./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_sppp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/pcap-int.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/sched.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/stdbool.ph
-./usr/lib/apache/modules/libproxy.so
-./usr/lib/apache/modules/mod_auth_anon.so
-./usr/lib/apache/modules/mod_auth_db.so
-./usr/lib/apache/modules/mod_auth_dbm.so
-./usr/lib/apache/modules/mod_auth_digest.so
-./usr/lib/apache/modules/mod_cern_meta.so
-./usr/lib/apache/modules/mod_define.so
-./usr/lib/apache/modules/mod_digest.so
-./usr/lib/apache/modules/mod_info.so
-./usr/lib/apache/modules/mod_log_agent.so
-./usr/lib/apache/modules/mod_log_referer.so
-./usr/lib/apache/modules/mod_mime_magic.so
-./usr/lib/apache/modules/mod_mmap_static.so
-./usr/lib/apache/modules/mod_rewrite.so
-./usr/lib/apache/modules/mod_speling.so
-./usr/lib/apache/modules/mod_unique_id.so
-./usr/lib/apache/modules/mod_usertrack.so
-./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/libdata/perl5/site_perl/m68k-openbsd/g2c.ph
-./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
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 7239c85ddf5..8147b4501ff 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -7,7 +7,7 @@
 ./usr/include/mac68k
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 7a4c5658b07..a88275fac0d 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -8,7 +8,7 @@
 ./usr/include/mvme68k
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index e14c420bec9..cdb5c31c610 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -7,7 +7,7 @@
 ./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.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index bf67b1d2725..37e4127fd12 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -13,7 +13,7 @@
 ./usr/include/sparc
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.6
 ./usr/lib/libacl.so.4.1
-./usr/lib/libc.so.23.2
+./usr/lib/libc.so.23.3
 ./usr/lib/libc_r.so.1.2
 ./usr/lib/libcrypto.so.2.0
 ./usr/lib/libcurses++.so.1.1
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 812669182b9..edfd48557d0 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1208,6 +1208,7 @@
 ./usr/include/uvm/uvm_pdaemon.h
 ./usr/include/uvm/uvm_stat.h
 ./usr/include/uvm/uvm_swap.h
+./usr/include/uvm/uvm_swap_encrypt.h
 ./usr/include/uvm/uvm_vnode.h
 ./usr/include/varargs.h
 ./usr/include/vis.h