From 2b5d1f8971ab16ef310f997ef8436f2c3cceb055 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 22 Jan 2015 13:16:24 +0000 Subject: [PATCH] sync --- distrib/sets/lists/base/md.alpha | 6 +++--- distrib/sets/lists/base/md.amd64 | 6 +++--- distrib/sets/lists/base/md.armish | 6 +++--- distrib/sets/lists/base/md.armv7 | 6 +++--- distrib/sets/lists/base/md.aviion | 6 +++--- distrib/sets/lists/base/md.hppa | 6 +++--- distrib/sets/lists/base/md.hppa64 | 6 +++--- distrib/sets/lists/base/md.i386 | 6 +++--- distrib/sets/lists/base/md.landisk | 6 +++--- distrib/sets/lists/base/md.loongson | 6 +++--- distrib/sets/lists/base/md.luna88k | 6 +++--- distrib/sets/lists/base/md.macppc | 6 +++--- distrib/sets/lists/base/md.octeon | 6 +++--- distrib/sets/lists/base/md.sgi | 6 +++--- distrib/sets/lists/base/md.socppc | 6 +++--- distrib/sets/lists/base/md.sparc | 6 +++--- distrib/sets/lists/base/md.sparc64 | 6 +++--- distrib/sets/lists/base/md.zaurus | 6 +++--- distrib/sets/lists/comp/mi | 1 + 19 files changed, 55 insertions(+), 54 deletions(-) diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 0069204b638..ba050771457 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -62,7 +62,7 @@ ./sbin/mount_ntfs ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -91,11 +91,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 0a89c8d0271..a72aa8ddbf2 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -68,7 +68,7 @@ ./sbin/wsconsctl ./usr/bin/pctr ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -97,11 +97,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index c319e0a2745..a8171277cb2 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -35,7 +35,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -64,11 +64,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index a6fa17ca19b..fd7f70e79ea 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -6,7 +6,7 @@ ./etc/firmware/run-rt3071 ./sbin/kbd ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -35,11 +35,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion index 577c953f58d..ba16a820539 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -1,5 +1,5 @@ ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -28,11 +28,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index f6c9b5942c8..f23eb602440 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -64,7 +64,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -93,11 +93,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index a6422b14eb6..34fd9792d29 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -64,7 +64,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -93,11 +93,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index 4f51b2685ca..04b36e73043 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -70,7 +70,7 @@ ./sbin/wsconsctl ./usr/bin/pctr ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -99,11 +99,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index 35c8d157f6e..cfb7afed0f3 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -30,7 +30,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -59,11 +59,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index cfd86e0534c..3f92f63d825 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -35,7 +35,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -64,11 +64,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index d872240484c..efa7a964cd7 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -2,7 +2,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -31,11 +31,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 32f6cf68277..2d2ac7ba98b 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -65,7 +65,7 @@ ./sbin/pdisk ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -94,11 +94,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 3dad3805685..be289ded62e 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -1,6 +1,6 @@ ./etc/examples/wsconsctl.conf ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -29,11 +29,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 6a4ee71d48c..0895748837d 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -64,7 +64,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -93,11 +93,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index 54ca270b357..cf35486efa4 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -58,7 +58,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -87,11 +87,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index 9edacdfa5f3..43f1f1539ff 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -8,7 +8,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -37,11 +37,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index d31204ae702..fcd43561ebd 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -66,7 +66,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -95,11 +95,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index afd35404468..8fc0586852b 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -33,7 +33,7 @@ ./sbin/kbd ./sbin/wsconsctl ./usr/lib/libc.so.78.1 -./usr/lib/libcrypto.so.30.3 +./usr/lib/libcrypto.so.30.4 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 @@ -62,11 +62,11 @@ ./usr/lib/libskey.so.6.0 ./usr/lib/libsndio.so.6.0 ./usr/lib/libsqlite3.so.28.0 -./usr/lib/libssl.so.30.0 +./usr/lib/libssl.so.30.1 ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.0 +./usr/lib/libtls.so.1.1 ./usr/lib/libusbhid.so.7.0 ./usr/lib/libutil.so.12.1 ./usr/lib/libz.so.5.0 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 5dcc711d2f8..80cf8eca9f1 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -5598,6 +5598,7 @@ ./usr/share/man/man3/tls_config_insecure_noverifyhost.3 ./usr/share/man/man3/tls_config_new.3 ./usr/share/man/man3/tls_config_set_ca_file.3 +./usr/share/man/man3/tls_config_set_ca_mem.3 ./usr/share/man/man3/tls_config_set_ca_path.3 ./usr/share/man/man3/tls_config_set_cert_file.3 ./usr/share/man/man3/tls_config_set_cert_mem.3 -- 2.20.1