From: deraadt Date: Fri, 18 Apr 2014 15:58:18 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c092c02bc9ca8a0a6444909d1c0d17b216ed5d4e;p=openbsd sync --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 53d909890bc..0dc2ba72e95 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -70,7 +70,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 49cc3dd88fb..78c811670d7 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -76,7 +76,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index ba075f66d3e..7f8bdc83554 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -43,7 +43,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index a28e781339c..e5f3adaaec1 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -12,7 +12,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion index 4d04264e73d..ea9b2febd92 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -7,7 +7,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index ad61a76a787..ab5e1e36823 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -72,7 +72,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 848ea70cd64..632058ba975 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -73,7 +73,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index ead7a102cb0..9d8be98991e 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -78,7 +78,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index 9649e89d08e..670b636ce8b 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -33,7 +33,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 8f67ca6ca29..d41c797ec38 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -39,7 +39,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 5c355afc553..9d896f4b7d8 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -9,7 +9,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 98458d10be5..00a9151956b 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -73,7 +73,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index e3aaeb23fc6..3b254330263 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -3,7 +3,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index e77f9b1e55f..634da04d166 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -68,7 +68,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index 8c950c70ab0..c7fe23aba24 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -66,7 +66,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index 8c46a22e0f7..783f1502f5a 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -14,7 +14,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 25ad7382a0f..b583ab76b40 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -74,7 +74,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1 diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index 3958c9934c5..3748f3f70dc 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -41,7 +41,7 @@ ./usr/lib/libasn1.so.20.0 ./usr/lib/libc.so.74.0 ./usr/lib/libcom_err.so.20.0 -./usr/lib/libcrypto.so.24.0 +./usr/lib/libcrypto.so.25.0 ./usr/lib/libcurses.so.14.0 ./usr/lib/libedit.so.5.0 ./usr/lib/libevent.so.4.1