Prepare for 2.12.0.4; also close s6-svscan's stderr on exit when special

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

7 files changed, 24 insertions, 7 deletions

diff --git a/COPYING b/COPYING
index 08c9298..2ea7ac0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2024 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 42cc911..3cb6a92 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.1.0 or later: https://skarnet.org/software/skalibs/
-  - Recommended: execline version 2.9.4.0 or later: https://skarnet.org/software/execline/
+  - skalibs version 2.14.1.1 or later: https://skarnet.org/software/skalibs/
+  - Recommended: execline version 2.9.5.0 or later: https://skarnet.org/software/execline/
     (You can disable this requirement at configure time, but will
     lose some functionality.)
   - Optional: nsss version 0.2.0.4 or later: https://skarnet.org/software/nsss/
diff --git a/NEWS b/NEWS
index 821cb41..ddf39d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6.
 
+In 2.12.0.4
+-----------
+
+ - Bugfixes.
+
+
 In 2.12.0.3
 -----------
 
diff --git a/doc/index.html b/doc/index.html
index 75ee0d3..8e8c987 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -83,12 +83,12 @@ with s6</a> </li>
  <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.14.1.0 or later. It's a build-time requirement. It's also a run-time
+2.14.1.1 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 really recommended for full functionality):
 <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.4.0 or later. When s6 is built with execline support (which is the default),
+2.9.5.0 or later. When s6 is built with execline support (which is the default),
 execline is a build-time requirement, and also a run-time requirement for
 certain binaries that spawn scripts interpreted with
 <a href="//skarnet.org/software/execline/execlineb.html">execlineb</a>. </li>
@@ -115,7 +115,7 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.12.0.3.tar.gz">2.12.0.3</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.12.0.4.tar.gz">2.12.0.4</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index e5d3166..2cd9f64 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.12.0.4 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.1.1. </li>
+ <li> <a href="//skarnet.org/software/execline/">skalibs</a>
+recommended dependency bumped to 2.9.5.0. </li>
+</ul>
+
 <h2> in 2.12.0.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 3b59d6e..d4309b2 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.12.0.3
+version=2.12.0.4
 category=admin
 package_macro_name=S6
diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c
index 9c3a02f..be2dd37 100644
--- a/src/supervision/s6-svscan.c
+++ b/src/supervision/s6-svscan.c
@@ -156,6 +156,8 @@ static inline void close_pipes (void)
     fd_close(1) ;
     if (open2("/dev/null", O_WRONLY) < 0)
       strerr_warnwu1sys("open /dev/null") ;
+    if (fd_copy(2, 1) == -1)
+      strerr_warnwu1sys("redirect stderr to /dev/null") ;
   }
 }