From: deraadt Date: Sat, 11 Apr 2015 16:17:45 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c6d28d48282f40ee605f935c4f2ec459dfdd99e3;p=openbsd sync --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index cb5c9d72182..bb48b8b3a72 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 3b2005eaedf..ae3969c8fe9 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index 45d2a1ac0f9..c9783b6b586 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index 76f32c8189e..4e093c71358 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion index 1bf07d1b157..d2516d18a55 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -1,5 +1,5 @@ ./usr/lib/libc.so.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index cc1df5e2826..1f61253d7ba 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 1ecf27cbd41..cf5f0adef3f 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index a3a3a22941c..ea0817d41e6 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index ec0b4bc8bee..2cb191e4902 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index f5fa76ec3ce..1a1af86cec5 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 3821b5efdbc..06c0d0491e1 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 7f306baf5ee..ed571e66832 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 50ef68b0468..d4650771576 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 4299fe941b3..dab6079c31f 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index 5261c8cf61d..3eaca6f888b 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index c52ae717504..3e0f1df07e6 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 30d2c031b92..04e8b995dff 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index 59726adc9c9..f15b1cf5e01 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.79.0 -./usr/lib/libcrypto.so.32.0 +./usr/lib/libcrypto.so.33.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.2 ./usr/lib/libevent.so.4.1