From: deraadt Date: Fri, 23 Oct 2015 06:22:28 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1a48238b4b06015ef985de1fc41a237e62e537cf;p=openbsd sync --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 504403fc58d..b338dda044d 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -61,7 +61,7 @@ ./sbin/kbd ./sbin/mount_ntfs ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -85,7 +85,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 91fea12bcb4..fa3be4f1393 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -67,7 +67,7 @@ ./sbin/mount_ntfs ./sbin/wsconsctl ./usr/bin/pctr -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -91,7 +91,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index 9ffc6203bfd..6fac0c9ca87 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -34,7 +34,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -58,7 +58,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index 9aaeafd0202..dc4aa29f98b 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -29,7 +29,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -53,7 +53,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion index fa734701315..b47c38f39bb 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -1,4 +1,4 @@ -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -22,7 +22,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index a08d3257093..2551f2046df 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -63,7 +63,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -87,7 +87,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 3ab1e445ccc..f6860f8cd4f 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -63,7 +63,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -87,7 +87,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index df7347d6816..aea26163ebd 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -69,7 +69,7 @@ ./sbin/mount_ntfs ./sbin/wsconsctl ./usr/bin/pctr -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -93,7 +93,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index 64b9875eac5..5643e38054e 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -29,7 +29,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -53,7 +53,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 718fdfd24bc..2728aabf065 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -34,7 +34,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -58,7 +58,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 3bcb3f796b8..26017950319 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -1,7 +1,7 @@ ./etc/examples/wsconsctl.conf ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -25,7 +25,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 2e865e4f29b..8200016e1c0 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -64,7 +64,7 @@ ./sbin/kbd ./sbin/pdisk ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -88,7 +88,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 7acbab8f9b8..7355d82a275 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -1,5 +1,5 @@ ./etc/examples/wsconsctl.conf -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -23,7 +23,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index c8bc540c762..9ddcd4459dd 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -63,7 +63,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -87,7 +87,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index e0950e2d7fb..1c819181304 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -57,7 +57,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -81,7 +81,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index 97fe7cc6bae..c8e78c37301 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -7,7 +7,7 @@ ./etc/firmware/tigon2 ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -31,7 +31,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index eeba7edc1b3..cf41f40080a 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -65,7 +65,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -89,7 +89,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index e9bb24d2b7b..ed984bcc28a 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -32,7 +32,7 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl -./usr/lib/libc.so.83.0 +./usr/lib/libc.so.84.0 ./usr/lib/libcrypto.so.36.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 @@ -56,7 +56,7 @@ ./usr/lib/libpanelw.so.6.0 ./usr/lib/libpcap.so.8.0 ./usr/lib/libperl.so.17.1 -./usr/lib/libpthread.so.19.0 +./usr/lib/libpthread.so.20.0 ./usr/lib/libradius.so.1.0 ./usr/lib/libreadline.so.4.0 ./usr/lib/librpcsvc.so.2.0 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 629086fdfcc..202e3c28778 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -6500,6 +6500,7 @@ ./usr/share/man/man9/ml_dechain.9 ./usr/share/man/man9/ml_dequeue.9 ./usr/share/man/man9/ml_empty.9 +./usr/share/man/man9/ml_enlist.9 ./usr/share/man/man9/ml_enqueue.9 ./usr/share/man/man9/ml_filter.9 ./usr/share/man/man9/ml_init.9 @@ -6617,7 +6618,6 @@ ./usr/share/man/man9/rt_timer_remove_all.9 ./usr/share/man/man9/rtable_add.9 ./usr/share/man/man9/rtable_exists.9 -./usr/share/man/man9/rtable_get.9 ./usr/share/man/man9/rtable_l2.9 ./usr/share/man/man9/rtable_l2set.9 ./usr/share/man/man9/rtalloc.9