diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-02-07 12:26:48 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-02-07 12:26:48 +0000 |
commit | a27b717e4af96bb8cce6909dff0cdc44d7e3e331 (patch) | |
tree | 4e1adafe76daf4fc0b9d9b6bdae339d7e9845784 /distrib | |
parent | b781cee160f915f2043c7a04bd9c366fff0f8204 (diff) |
sync
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/sets/lists/base/md.alpha | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.amd64 | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.armish | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.armv7 | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.aviion | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.hppa | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.hppa64 | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.i386 | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.landisk | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.loongson | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.luna88k | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.macppc | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.octeon | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.sgi | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.socppc | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.sparc | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.sparc64 | 2 | ||||
-rw-r--r-- | distrib/sets/lists/base/md.zaurus | 2 | ||||
-rw-r--r-- | distrib/sets/lists/comp/mi | 3 |
19 files changed, 20 insertions, 19 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 6ce07b7b554..4a7f773a6ae 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -95,7 +95,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 b1360ba6820..31e4b5dda0b 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -101,7 +101,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 0ead0b39137..2e1af05b065 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -68,7 +68,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 97e4b952b0e..43a968f7a9b 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -39,7 +39,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 4774a9f3884..c312ee0fd90 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -32,7 +32,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 5157f335f5c..a969a726242 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -97,7 +97,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 f6ddba44676..2d0bcedfa50 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -97,7 +97,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 042ebc300d5..fa2abc846f4 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -103,7 +103,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 3f8415d2050..e2241c6850c 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -63,7 +63,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 414a41b8dbe..452cb39f300 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -68,7 +68,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 76cc9883a15..0d46f93b22b 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -35,7 +35,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 f7b338e9b48..4e8eb6d5365 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -98,7 +98,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 73cb420410a..6de3243eb73 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -33,7 +33,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 e325ea6ccbd..923c2d13ed0 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -97,7 +97,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 e87882e96b5..41bf4cc8d59 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -91,7 +91,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 ae4b02bae6b..c427a997047 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -41,7 +41,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 59d9e0572cb..7ce7ff79893 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -99,7 +99,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 8e35e20c02f..f4482663c9b 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -66,7 +66,7 @@ ./usr/lib/libstdc++.so.57.0 ./usr/lib/libtermcap.so.14.0 ./usr/lib/libtermlib.so.14.0 -./usr/lib/libtls.so.1.1 +./usr/lib/libtls.so.2.0 ./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 8a69ad68c66..896e74fc706 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -5606,7 +5606,8 @@ ./usr/share/man/man3/tls_config_set_cert_file.3 ./usr/share/man/man3/tls_config_set_cert_mem.3 ./usr/share/man/man3/tls_config_set_ciphers.3 -./usr/share/man/man3/tls_config_set_ecdhcurve.3 +./usr/share/man/man3/tls_config_set_dheparams.3 +./usr/share/man/man3/tls_config_set_ecdhecurve.3 ./usr/share/man/man3/tls_config_set_key_file.3 ./usr/share/man/man3/tls_config_set_key_mem.3 ./usr/share/man/man3/tls_config_set_protocols.3 |