From 0de4e6e0703f47be954f4cfa37648dd58665c819 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Nov 2020 12:55:39 +0000
Subject:  Fix build with skalibs 2.10.0.0; document dependencies

---
 doc/index.html         | 24 ++++++++++++++----------
 doc/libstls/index.html | 10 +++++++---
 doc/upgrade.html       |  6 +++++-
 3 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index f402ab3..1160f7a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -44,23 +44,27 @@ compiled with IPv6 support, s6-networking is IPv6-ready.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.9.4.0 or later. It's a build-time requirement. It's also a run-time
+2.10.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.6.1.1 or later. It's a build-time and run-time requirement. </li>
+2.7.0.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.9.2.0 or later. It's a build-time and run-time requirement. </li>
+2.10.0.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
 2.3.3.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the s6-dns
 libraries. </li>
  <li> If you want to build the secure communication tools:
   <ul>
-   <li> Either <a href="https://libressl.org/">LibreSSL</a> version 3.1.4
-or later </li>
-   <li> Or <a href="https://bearssl.org/">BearSSL</a> version 0.6
+   <li> Either <a href="https://bearssl.org/">BearSSL</a> version 0.6
 or later. <strong>This is a beta version.</strong> </li>
+   <li> Or <a href="https://libressl.org/">LibreSSL</a> version 3.2.2
+or later </li>
+   <li> Or <a href="https://openssl.org/">OpenSSL</a> version 1.1.1h
+or later <em>and</em>
+<a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
+version 3.3.0 or later </li>
   </ul> The chosen library is a build-time requirement, and also a
 run-time requirement if you link against its shared version. </li>
 </ul>
@@ -141,13 +145,13 @@ relevant page.
 <ul>
 <li> An <a href="tls-overview.html">overview</a> of the TLS-related programs </li>
 <li><a href="s6-tlsclient.html">The <tt>s6-tlsclient</tt> program</a></li>
-<li><a href="s6-tlsc.html">The <tt>s6-tlsc</tt> program</a></li>
-<li><a href="s6-tlsc-io.html">The <tt>s6-tlsc-io</tt> program</a></li>
-<li><a href="s6-ucspitlsc.html">The <tt>s6-ucspitlsc</tt> program</a></li>
 <li><a href="s6-tlsserver.html">The <tt>s6-tlsserver</tt> program</a></li>
+<li><a href="s6-tlsc.html">The <tt>s6-tlsc</tt> program</a></li>
 <li><a href="s6-tlsd.html">The <tt>s6-tlsd</tt> program</a></li>
-<li><a href="s6-tlsd-io.html">The <tt>s6-tlsd-io</tt> program</a></li>
+<li><a href="s6-ucspitlsc.html">The <tt>s6-ucspitlsc</tt> program</a></li>
 <li><a href="s6-ucspitlsd.html">The <tt>s6-ucspitlsd</tt> program</a></li>
+<li><a href="s6-tlsc-io.html">The <tt>s6-tlsc-io</tt> program</a></li>
+<li><a href="s6-tlsd-io.html">The <tt>s6-tlsd-io</tt> program</a></li>
 </ul>
 
 <h4> TCP access control </h4>
diff --git a/doc/libstls/index.html b/doc/libstls/index.html
index 0983fef..3be3464 100644
--- a/doc/libstls/index.html
+++ b/doc/libstls/index.html
@@ -24,8 +24,11 @@
  <tt>libstls</tt> is a small support library for the
 <a href="../s6-tlsc.html">s6-tlsc</a> and
 <a href="../s6-tlsd.html">s6-tlsd</a> executables when they're built
-against the <a href="https://www.libressl.org/">LibreSSL</a>
-backend. You can use it in your own programs, but since
+against the <em>libtls</em> API, whether that API is implemented via
+<a href="https://libressl.org/">LibreSSL</a> or via
+<a href="https://.openssl.org/">OpenSSL</a> with the addition of
+<a href="https://git.causal.agency/libretls/about/">LibreTLS</a>.
+You can use it in your own programs, but since
 <a href="https://man.openbsd.org/OpenBSD-current/man3/tls_init.3">libtls</a>
 is already relatively high-level, it's probably not very useful.
 </p>
@@ -42,7 +45,8 @@ and the <tt>tls.h</tt> header, are visible in your header search path. </li>
 
 <ul>
  <li> Make sure the s6-networking libraries, as well as the skalibs
-libraries, and the LibreSSL libraries, are visible in your library search path. </li>
+libraries, and the libraries needed by libtls, are visible in your
+library search path. </li>
  <li> Link against <tt>-lstls</tt>, <tt>-lskarnet</tt>, <tt>-ltls</tt>,
 <tt>-lssl</tt>, <tt>-lcrypto</tt>,
 <tt>`cat $sysdeps/socket.lib`</tt>, <tt>`cat $sysdeps/spawn.lib`</tt>, and
diff --git a/doc/upgrade.html b/doc/upgrade.html
index eabebb6..4df1cb7 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -21,8 +21,12 @@
 <h2> in 2.4.0.0 </h2>
 
 <ul>
+ <li> <a href="https://openssl.org/">OpenSSL</a> plus
+<a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
+can now be used as a backend, since LibreTLS provides an
+implementation of the libtls API. </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
-dependency bumped to 2.9.4.0. </li>
+dependency bumped to 2.10.0.0. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a>
 has been made optional. It's still enabled by default; disabling
 it with the <tt>--disable-execline</tt> configure option disables
-- 
cgit v1.2.3