sync

20 files changed, 41 insertions, 41 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 9efc4e3c38c..d3a2f319461 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -68,7 +68,7 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -98,7 +98,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 9fc0482a89a..e979adfc094 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -74,7 +74,7 @@
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -104,7 +104,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index dfb71c42ecf..2649c7df952 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -41,7 +41,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -71,7 +71,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 0cbe95faf7c..6cf361ae51b 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -10,7 +10,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -40,7 +40,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 32176097e01..bc6e4f582cd 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -5,7 +5,7 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.5/3.3.6/include
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.5/3.3.6/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -35,7 +35,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 940b1167ba4..206e6cd973d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -70,7 +70,7 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -100,7 +100,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 676d4581cc0..83bac9cab88 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -71,7 +71,7 @@
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.5/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.5/3.3.5/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -101,7 +101,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 786c272a7b5..26bdf43ebaa 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -76,7 +76,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -106,7 +106,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 5f0d555d345..d7f6ff25470 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -31,7 +31,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -61,7 +61,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index e0f50467350..2cb613abd11 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -37,7 +37,7 @@
 ./sbin/wsconsctl
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.5
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -67,7 +67,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 44c651dbf4a..1498439b6cf 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -7,7 +7,7 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.5/3.3.6/include
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.5/3.3.6/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -37,7 +37,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index fc504e4f572..d1d54469bdb 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -71,7 +71,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -101,7 +101,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 02ce1ae1635..76f3776c6a1 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,7 +1,7 @@
 ./sbin/kbd
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.5
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -31,7 +31,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 5cbead0a523..4ac1ff7f4d4 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -66,7 +66,7 @@
 ./sbin/wsconsctl
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.5
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -96,7 +96,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index c405f561ea3..3374b3530d3 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -94,7 +94,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 85d60cf2d8f..1cbeca233c6 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -12,7 +12,7 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -42,7 +42,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 3a0eea1e647..17fb1e823d6 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -72,7 +72,7 @@
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -102,7 +102,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 0ddba0b0783..4dbcf988cba 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -39,7 +39,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.5/4.2.1/specs
 ./usr/lib/libc.so.76.0
-./usr/lib/libcrypto.so.29.0
+./usr/lib/libcrypto.so.30.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.1
 ./usr/lib/libevent.so.4.1
@@ -69,7 +69,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.26.0
+./usr/lib/libssl.so.27.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 227f3cc3ada..9ebbe2f11c9 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -52,7 +52,10 @@
 ./etc/examples/chio.conf
 ./etc/examples/dhcpd.conf
 ./etc/examples/dvmrpd.conf
+./etc/examples/exports
+./etc/examples/ftpchroot
 ./etc/examples/hostapd.conf
+./etc/examples/hosts.lpd
 ./etc/examples/ifstated.conf
 ./etc/examples/iked.conf
 ./etc/examples/inetd.conf
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index bb827f019d5..0c04fbcf025 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -10,14 +10,13 @@
 ./etc/dhclient.conf
 ./etc/disktab
 ./etc/dumpdates
-./etc/exports
+./etc/examples/printcap
+./etc/examples/remote
 ./etc/fbtab
-./etc/ftpchroot
 ./etc/ftpusers
 ./etc/gettytab
 ./etc/group
 ./etc/hosts
-./etc/hosts.lpd
 ./etc/hotplug
 ./etc/iked/pubkeys/fqdn
 ./etc/iked/pubkeys/ipv4
@@ -78,14 +77,12 @@
 ./etc/ppp/chap-secrets
 ./etc/ppp/options
 ./etc/ppp/pap-secrets
-./etc/printcap
 ./etc/pwd.db
 ./etc/rc
 ./etc/rc.conf
 ./etc/rc.local
 ./etc/rc.securelevel
 ./etc/rc.shutdown
-./etc/remote
 ./etc/shells
 ./etc/skel/.Xdefaults
 ./etc/skel/.cshrc