Prepare for 2.5.1.4; fix s6-tlsserver -Y|-y

Signed-off-by: Laurent Bercot <ska@appnovation.com>

7 files changed, 36 insertions, 13 deletions

diff --git a/AUTHORS b/AUTHORS
index 07ac7ed..cf75642 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,3 +17,4 @@ Thanks to:
   Amitai Schleier <schmonz@schmonz.com>
   Petr Vaněk <arkamar@atlas.cz>
   Alex Grabowski <hurufu@gmail.com>
+  pjvm <pjvm742@disroot.org>
diff --git a/INSTALL b/INSTALL
index e290057..6c0a775 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,10 +6,10 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.1.0 or later: https://skarnet.org/software/skalibs/
-  - Optional (but recommended): execline version 2.9.2.0 or later: https://skarnet.org/software/execline/
-  - s6 version 2.11.3.0 or later: https://skarnet.org/software/s6/
-  - s6-dns version 2.3.5.5 or later: https://skarnet.org/software/s6-dns/
+  - skalibs version 2.13.2.0 or later: https://skarnet.org/software/skalibs/
+  - Optional (but recommended): execline version 2.9.4.0 or later: https://skarnet.org/software/execline/
+  - s6 version 2.11.4.0 or later: https://skarnet.org/software/s6/
+  - s6-dns version 2.3.6.0 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.5.3 or later: https://libressl.org/
diff --git a/NEWS b/NEWS
index e60a53f..49ec901 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-networking.
 
+In 2.5.1.4
+----------
+
+ - Bugfixes.
+
+
 In 2.5.1.3
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index f22be77..0238664 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -55,15 +55,15 @@ as extensions to the s6 ecosystem.
  <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.13.1.0 or later. It's a build-time requirement. It's also a run-time
+2.13.2.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> (Optional, but recommended) <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.2.0 or later. It's a build-time and run-time requirement. </li>
+2.9.4.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.11.3.0 or later. It's a build-time and run-time requirement. </li>
+2.11.4.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.5.5 or later. It's a build-time requirement. It's also a run-time
+2.3.6.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:
@@ -72,7 +72,7 @@ libraries. </li>
 or later. </li>
    <li> Or <a href="https://libressl.org/">LibreSSL</a> version 3.5.3
 or later. </li>
-   <li> Or <a href="https://openssl.org/">OpenSSL</a> version 1.1.1t
+   <li> Or <a href="https://openssl.org/">OpenSSL</a> version 1.1.1u
 or later <em>and</em>
 <a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
 version 3.5.2 or later. </li>
@@ -91,7 +91,7 @@ run-time requirement if you link against its shared version. </li>
 
 <ul>
  <li> The current released version of s6-networking is
-<a href="s6-networking-2.5.1.3.tar.gz">2.5.1.3</a>. </li>
+<a href="s6-networking-2.5.1.4.tar.gz">2.5.1.4</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-networking/">s6-networking
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d3bd996..8b87b42 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,19 @@
 
 <h1> What has changed in s6-networking </h1>
 
+<h2> in 2.5.1.4 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.2.0 </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+optional dependency bumped to 2.9.4.0 </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.11.4.0 </li>
+ <li> <a href="https://openssl.org">OpenSSL</a>
+optional dependency bumped to 1.1.1u </li>
+</ul>
+
 <h2> in 2.5.1.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index ace1017..e693bf6 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-networking
-version=2.5.1.3
+version=2.5.1.4
 category=net
 package_macro_name=S6_NETWORKING
diff --git a/src/tls/s6-tlsserver.c b/src/tls/s6-tlsserver.c
index e5215f4..533e856 100644
--- a/src/tls/s6-tlsserver.c
+++ b/src/tls/s6-tlsserver.c
@@ -47,6 +47,7 @@ struct options_s
   unsigned int ruleswhat : 2 ;
   unsigned int flagS : 1 ;
   unsigned int flagy : 1 ;
+  unsigned int flagY : 1 ;
   unsigned int flagZ : 1 ;
   unsigned int onlyvars : 1 ;
   unsigned int doaccess : 1 ;
@@ -79,6 +80,7 @@ struct options_s
   .ruleswhat = 0, \
   .flagS = 0, \
   .flagy = 0, \
+  .flagY = 0, \
   .flagZ = 0, \
   .onlyvars = 0, \
   .doaccess = 0, \
@@ -128,8 +130,8 @@ int main (int argc, char const *const *argv)
         case 'x' : o.rules = l.arg ; o.ruleswhat = 2 ; o.doaccess = 1 ; break ;
         case 'S' : o.flagS = 1 ; break ;
         case 's' : o.flagS = 0 ; break ;
-        case 'Y' : o.flagy = 0 ; break ;
-        case 'y' : o.flagy = 1 ; break ;
+        case 'Y' : o.flagY = 1 ; o.flagy = 0 ; break ;
+        case 'y' : o.flagy = 1 ; o.flagY = 0 ; break ;
         case 'K' : if (!uint0_scan(l.arg, &o.kimeout)) dieusage() ; break ;
         case 'Z' : o.flagZ = 1 ; break ;
         case 'z' : o.flagZ = 0 ; break ;
@@ -218,6 +220,7 @@ int main (int argc, char const *const *argv)
       newargv[m++] = o.verbosity ? "-v2" : "-v0" ;
     if (o.flagS) newargv[m++] = "-S" ;
     if (o.flagy) newargv[m++] = "-y" ;
+    else if (o.flagY) newargv[m++] = "-Y" ;
     if (o.kimeout)
     {
       newargv[m++] = "-K" ;