From c5c52f1a1f22bcd9ed2d0f2b547152b7e2d1b9ab Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 10 Nov 2023 12:10:17 +0000
Subject:  Prepare for 0.0.1.4. Drop -01 from s6-ioconnect invocation.

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                                            |  2 +-
 NEWS                                               |  6 ++++++
 doc/index.html                                     |  6 +++---
 doc/upgrade.html                                   | 11 +++++++++++
 package/info                                       |  2 +-
 src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c |  3 +--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index 0fa9f0b..b5d9f14 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
   - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/
-  - s6 version 2.11.4.0 or later: https://skarnet.org/software/s6/
+  - s6 version 2.12.0.1 or later: https://skarnet.org/software/s6/
   - (optional but recommended): s6-networking version 2.6.0.0 or later:
       https://skarnet.org/software/s6-networking/
 
diff --git a/NEWS b/NEWS
index 99be71d..9e17eb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for smtpd-starttls-proxy.
 
+In 0.0.1.4
+----------
+
+ - Drop the -01 option to s6-ioconnect invocation.
+
+
 In 0.0.1.3
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index ad67ffc..95e5277 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -38,9 +38,9 @@ inetd-like mail servers that do not already support it.
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.12.0.0 or later. It's a build-time and run-time requirement. </li>
+2.12.0.1 or later. It's a build-time and run-time requirement. </li>
  <li> Recommended at run-time: <a href="//skarnet.org/software/s6-networking/">s6-networking</a> version
-2.6.0.0 or later. It's not a requirement, but you won't be able
+2.7.0.0 or later. It's not a requirement, but you won't be able
 to do much with smtpd-starttls-proxy if you don't have a suitable
 UCSPI-TLS server tool, and <a href="//skarnet.org/software/s6-networking/">s6-networking</a>
 provides a simple one. </li>
@@ -57,7 +57,7 @@ provides a simple one. </li>
 
 <ul>
  <li> The current released version of smtpd-starttls-proxy is
-<a href="smtpd-starttls-proxy-0.0.1.3.tar.gz">0.0.1.3</a>. </li>
+<a href="smtpd-starttls-proxy-0.0.1.4.tar.gz">0.0.1.4</a>. </li>
  <li> You can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/smtpd-starttls-proxy/">smtpd-starttls-proxy
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 445a8bd..caab1e6 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,17 @@
 
 <h1> What has changed in smtpd-starttls-proxy </h1>
 
+<h2> in 0.0.1.4 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.0.0 </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.12.0.1 </li>
+ <li> <a href="//skarnet.org/software/s6-networking/">s6-networking</a>
+recommended dependency bumped to 2.7.0.0 </li>
+</ul>
+
 <h2> in 0.0.1.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index eaf7e29..db41955 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=smtpd-starttls-proxy
-version=0.0.1.3
+version=0.0.1.4
 category=mail
 package_macro_name=SMTPD_STARTTLS_PROXY
diff --git a/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c b/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
index 506d24c..e9ef7ab 100644
--- a/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
+++ b/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
@@ -344,10 +344,9 @@ static void child (int fdr, int fdw)
   {
     char fmtr[UINT_FMT] ;
     char fmtw[UINT_FMT] ;
-    char const *newargv[7] = { S6_EXTBINPREFIX "s6-ioconnect", "-r", fmtr, "-w", fmtw, 0, 0 } ;
+    char const *newargv[6] = { S6_EXTBINPREFIX "s6-ioconnect", "-r", fmtr, "-w", fmtw, 0 } ;
     fmtr[uint_fmt(fmtr, fdr)] = 0 ;
     fmtw[uint_fmt(fmtw, fdw)] = 0 ;
-    if (wantexec == 1) newargv[5] = "-01" ;
     xexec(newargv) ;
   }
 }
-- 
cgit v1.2.3