summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-12-03 08:50:30 +0000
committerLaurent Bercot <ska@appnovation.com>2021-12-03 08:50:30 +0000
commite3b7cbc8648c098f1ad372251a1d2ec775ff135d (patch)
treeb1a39b38af0449cd6de2a458b35768afdbfd8849
parent47be905828c4c488dd72cd971fe63d595dba1006 (diff)
downloads6-e3b7cbc8648c098f1ad372251a1d2ec775ff135d.tar.xz
Prepare for 2.11.0.1
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--INSTALL2
-rw-r--r--NEWS6
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html7
-rw-r--r--package/info2
-rw-r--r--src/daemontools-extras/s6-envuidgid.c2
6 files changed, 18 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index 1cae199..d20bcde 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/
+ - skalibs version 2.11.1.0 or later: https://skarnet.org/software/skalibs/
- execline version 2.8.1.0 or later: https://skarnet.org/software/execline/
(You can disable this requirement at configure time, but will
lose some functionality.)
diff --git a/NEWS b/NEWS
index e16e211..0be84e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for s6.
+In 2.11.0.1
+-----------
+
+ - Bugfixes.
+
+
In 2.11.0.0
-----------
diff --git a/doc/index.html b/doc/index.html
index ccc99ca..345ab6d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -83,7 +83,7 @@ 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.11.0.0 or later. It's a build-time requirement. It's also a run-time
+2.11.1.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 really recommended for full functionality):
@@ -115,7 +115,7 @@ want nsswitch-like functionality:
<h3> Download </h3>
<ul>
- <li> The current released version of s6 is <a href="s6-2.11.0.0.tar.gz">2.11.0.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.11.0.1.tar.gz">2.11.0.1</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 0225a6b..cec1a63 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
<h1> What has changed in s6 </h1>
+<h2> in 2.11.0.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.0.0. </li>
+</ul>
+
<h2> in 2.11.0.0 </h2>
<ul>
diff --git a/package/info b/package/info
index 0899491..6388be7 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6
-version=2.11.0.0
+version=2.11.0.1
category=admin
package_macro_name=S6
diff --git a/src/daemontools-extras/s6-envuidgid.c b/src/daemontools-extras/s6-envuidgid.c
index 63b7d44..46d4607 100644
--- a/src/daemontools-extras/s6-envuidgid.c
+++ b/src/daemontools-extras/s6-envuidgid.c
@@ -12,7 +12,7 @@
#include <skalibs/djbunix.h>
#include <skalibs/exec.h>
-#define USAGE "s6-envuidgid [ -i | -D defaultuid:defaultgid ] [ -u | -g | -B ] [ -n ] account prog..."
+#define USAGE "s6-envuidgid [ -i | -D defaultuid:defaultgid:defaultgidlist ] [ -u | -g | -B ] [ -n ] account prog..."
#define dieusage() strerr_dieusage(100, USAGE)
static inline size_t scan_defaults (char const *s, uid_t *uid, gid_t *gid, size_t *n, gid_t *tab)