From 584c1ebc199c5c261f1721bb5389a954fa5d5c0d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 26 Sep 2021 11:09:34 +0000
Subject:  Update LibreSSL/LibreTLS dependencies

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL          |  4 ++--
 NEWS             | 13 +++++--------
 doc/index.html   |  4 ++--
 doc/upgrade.html |  4 ++++
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/INSTALL b/INSTALL
index cac143e..0953f68 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,9 +12,9 @@ Build Instructions
   - s6-dns version 2.3.5.2 or later: https://skarnet.org/software/s6-dns/
   - Depending on whether you build the SSL tools,
         bearssl version 0.6 or later: https://bearssl.org/
-     or libressl version 3.2.5 or later: https://libressl.org/
+     or libressl version 3.3.4 or later: https://libressl.org/
      or openssl version 1.1.1k or later: https://openssl.org/ *in addition to*
-        libretls version 3.3.0 or later: https://git.causal.agency/libretls/about/
+        libretls version 3.3.4 or later: https://git.causal.agency/libretls/about/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index e8e701c..7b18cc7 100644
--- a/NEWS
+++ b/NEWS
@@ -3,14 +3,11 @@ Changelog for s6-networking.
 In 2.5.0.0
 ----------
 
- - Adaptation to skalibs-2.11.0.0
- - minidentd has been removed
-
-
-In 2.4.2.0
-----------
-
- - Actual server-side support for client certificates with BearSSL
+ - Adaptation to skalibs-2.11.0.0.
+ - minidentd removed.
+ - Full client certificate support.
+ - Server-side SNI support.
+ - s6-ucspitls[cd] -v2 now logs whether TLS is activated or not.
 
 
 In 2.4.1.1
diff --git a/doc/index.html b/doc/index.html
index 7e00a20..3cc87e4 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -70,12 +70,12 @@ libraries. </li>
   <ul>
    <li> Either <a href="https://bearssl.org/">BearSSL</a> version 0.6
 or later. </li>
-   <li> Or <a href="https://libressl.org/">LibreSSL</a> version 3.2.5
+   <li> Or <a href="https://libressl.org/">LibreSSL</a> version 3.3.4
 or later. </li>
    <li> Or <a href="https://openssl.org/">OpenSSL</a> version 1.1.1k
 or later <em>and</em>
 <a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
-version 3.3.0 or later. </li>
+version 3.3.4 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>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 6f76750..239182c 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,10 @@ dependency bumped to 2.11.0.0 </li>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a>
 dependency bumped to 2.3.5.2 </li>
  <li> The obsolete <tt>minidentd</tt> program has been removed. </li>
+ <li> <a href="https://libressl.org">LibreSSL</a>
+optional dependency bumped to 3.3.4 </li>
+ <li> <a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
+optional dependency bumped to 3.3.4 </li>
 </ul>
 
 <h2> in 2.4.2.0 </h2>
-- 
cgit v1.2.3