From e44f6f51310e5097791abdfd9c9472d9ee1aa794 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 16 Feb 2015 10:51:36 +0000 Subject: sync --- distrib/sets/lists/base/md.alpha | 2 +- distrib/sets/lists/base/md.amd64 | 2 +- distrib/sets/lists/base/md.armish | 2 +- distrib/sets/lists/base/md.armv7 | 2 +- distrib/sets/lists/base/md.aviion | 2 +- distrib/sets/lists/base/md.hppa | 2 +- distrib/sets/lists/base/md.hppa64 | 2 +- distrib/sets/lists/base/md.i386 | 2 +- distrib/sets/lists/base/md.landisk | 2 +- distrib/sets/lists/base/md.loongson | 2 +- distrib/sets/lists/base/md.luna88k | 2 +- distrib/sets/lists/base/md.macppc | 2 +- distrib/sets/lists/base/md.octeon | 2 +- distrib/sets/lists/base/md.sgi | 2 +- distrib/sets/lists/base/md.socppc | 2 +- distrib/sets/lists/base/md.sparc | 2 +- distrib/sets/lists/base/md.sparc64 | 2 +- distrib/sets/lists/base/md.zaurus | 2 +- distrib/sets/lists/comp/mi | 3 +++ 19 files changed, 21 insertions(+), 18 deletions(-) (limited to 'distrib/sets/lists') diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 52ae5ca5223..440ad558e4e 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.2.1 +./usr/lib/libtls.so.2.2 ./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 3e535d25391..667d0a9bb47 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.2.1 +./usr/lib/libtls.so.2.2 ./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 089f2b0fd6b..9b07e82e2e0 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.2.1 +./usr/lib/libtls.so.2.2 ./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 2564ce44374..299c8c35964 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.2.1 +./usr/lib/libtls.so.2.2 ./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 6f4992df073..387179ecf4c 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.2.1 +./usr/lib/libtls.so.2.2 ./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 897338b17dc..5834da3ee91 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.2.1 +./usr/lib/libtls.so.2.2 ./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 54c9cd87223..ed9b0ef232f 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.2.1 +./usr/lib/libtls.so.2.2 ./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 f430d5ad478..77c67a3f8a4 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.2.1 +./usr/lib/libtls.so.2.2 ./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 50c726db098..00d4e0a2afc 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.2.1 +./usr/lib/libtls.so.2.2 ./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 5dc7f8acfe6..40c8ad61c70 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.2.1 +./usr/lib/libtls.so.2.2 ./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 3701c868342..1aa435f266d 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.2.1 +./usr/lib/libtls.so.2.2 ./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 e962496c7e4..5c7e6ac91d9 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.2.1 +./usr/lib/libtls.so.2.2 ./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 dedd95ffb99..773323621b8 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.2.1 +./usr/lib/libtls.so.2.2 ./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 29a1c4909ba..37f5aaee954 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.2.1 +./usr/lib/libtls.so.2.2 ./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 16fee4d51c1..a07f0162d0b 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.2.1 +./usr/lib/libtls.so.2.2 ./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 851cded682f..3d7c0b837cc 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.2.1 +./usr/lib/libtls.so.2.2 ./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 b9f0bccf8c3..e34553da041 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.2.1 +./usr/lib/libtls.so.2.2 ./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 3d6db20ebd6..246e0d4cd1f 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.2.1 +./usr/lib/libtls.so.2.2 ./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 36a1827f2e0..1c6c01e1e95 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -5605,6 +5605,7 @@ ./usr/share/man/man3/tls_config_insecure_noverifycert.3 ./usr/share/man/man3/tls_config_insecure_noverifyhost.3 ./usr/share/man/man3/tls_config_new.3 +./usr/share/man/man3/tls_config_parse_protocols.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 @@ -5620,6 +5621,8 @@ ./usr/share/man/man3/tls_config_verify.3 ./usr/share/man/man3/tls_configure.3 ./usr/share/man/man3/tls_connect.3 +./usr/share/man/man3/tls_connect_fds.3 +./usr/share/man/man3/tls_connect_servername.3 ./usr/share/man/man3/tls_connect_socket.3 ./usr/share/man/man3/tls_error.3 ./usr/share/man/man3/tls_free.3 -- cgit v1.2.3