From 977d6ca915355954ae6215b0aa577c24fc257efe Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 21 Dec 2022 13:32:36 +0000 Subject: Update execline dep; s6-envdir QoL Signed-off-by: Laurent Bercot --- INSTALL | 2 +- doc/index.html | 2 +- doc/upgrade.html | 2 +- src/daemontools-extras/s6-envdir.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index 51ce682..c535c20 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.13.0.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.9.0.2 or later: https://skarnet.org/software/execline/ + - execline version 2.9.1.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.2 or later: https://skarnet.org/software/nsss/ diff --git a/doc/index.html b/doc/index.html index 1210f03..c0c8403 100644 --- a/doc/index.html +++ b/doc/index.html @@ -88,7 +88,7 @@ requirement if you link against the shared version of the skalibs library.
  • (Optional, but really recommended for full functionality): execline version -2.9.0.2 or later. When s6 is built with execline support (which is the default), +2.9.1.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 execlineb.
    • diff --git a/doc/upgrade.html b/doc/upgrade.html index dcf6f7a..077b9d8 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -26,7 +26,7 @@ dependency bumped to 2.13.0.0.
  • nsss optional dependency bumped to 0.2.0.2.
  • execline -recommended dependency bumped to 2.9.0.2.
    • +recommended dependency bumped to 2.9.1.0.

    in 2.11.1.2

    diff --git a/src/daemontools-extras/s6-envdir.c b/src/daemontools-extras/s6-envdir.c index 6c55d12..a265fdf 100644 --- a/src/daemontools-extras/s6-envdir.c +++ b/src/daemontools-extras/s6-envdir.c @@ -36,6 +36,6 @@ int main (int argc, char const *const *argv) argc -= l.ind ; argv += l.ind ; if (argc < 2) strerr_dieusage(100, USAGE) ; if ((envdir_internal(*argv++, &modifs, options, nullis) < 0) && (insist || (errno != ENOENT))) - strerr_diefu1sys(111, "envdir") ; + strerr_diefu2sys(111, "envdir ", argv[-1]) ; xmexec_m(argv, modifs.s, modifs.len) ; } -- cgit v1.2.3