aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2026-01-20 08:33:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2026-01-20 08:33:43 +0000
commit96cd0d966a8bc0daad9ec3e18f00e69623f1b5db (patch)
tree1ae7bc1ae87d86ee818f211e0a693ed3669232b5
parent564d45db7a27aa8336405c677bda00b1107b7705 (diff)
downloads6-96cd0d966a8bc0daad9ec3e18f00e69623f1b5db.tar.gz
Invoke s6-ftrigrd with a full environment
That helps when LD_LIBRARY_PATH is necessary.
-rw-r--r--COPYING2
-rw-r--r--INSTALL4
-rw-r--r--NEWS6
-rw-r--r--doc/index.html8
-rw-r--r--doc/upgrade.html9
-rw-r--r--package/info2
-rw-r--r--src/libs6/ftrigr_startf.c5
7 files changed, 26 insertions, 10 deletions
diff --git a/COPYING b/COPYING
index 1a9e8a2..2b1da03 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2025 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2026 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 7babe95..dd6bdaf 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.5.0 or later: https://skarnet.org/software/skalibs/
- - Recommended: execline version 2.9.8.0 or later: https://skarnet.org/software/execline/
+ - skalibs version 2.14.5.1 or later: https://skarnet.org/software/skalibs/
+ - Recommended: execline version 2.9.8.1 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.1.1 or later: https://skarnet.org/software/nsss/
diff --git a/NEWS b/NEWS
index 0b007e0..061674f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for s6.
+In 2.14.0.1
+-----------
+
+ - Bugfixes.
+
+
In 2.14.0.0
-----------
diff --git a/doc/index.html b/doc/index.html
index 1725a9b..feb99e9 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.5.0 or later. It's a build-time requirement. It's also a run-time
+2.14.5.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.8.0 or later. When s6 is built with execline support (which is the default),
+2.9.8.1 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,8 +115,8 @@ want nsswitch-like functionality:
<h3> Download </h3>
<ul>
- <li> The current released version of s6 is <a href="s6-2.14.0.0.tar.gz">2.14.0.0</a>.
-You can access its checksum <a href="s6-2.14.0.0.tar.gz.sha256">here</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.14.0.1.tar.gz">2.14.0.1</a>.
+You can access its checksum <a href="s6-2.14.0.1.tar.gz.sha256">here</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 5108256..ce8d682 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
<h1> What has changed in s6 </h1>
+<h2> in 2.14.0.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.5.1. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+recommended dependency bumped to 2.9.8.1. </li>
+</ul>
+
<h2> in 2.14.0.0 </h2>
<ul>
diff --git a/package/info b/package/info
index 31f9e23..8c56c0c 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6
-version=2.14.0.0
+version=2.14.0.1
category=admin
package_macro_name=S6
diff --git a/src/libs6/ftrigr_startf.c b/src/libs6/ftrigr_startf.c
index 5d2ce16..bc503ba 100644
--- a/src/libs6/ftrigr_startf.c
+++ b/src/libs6/ftrigr_startf.c
@@ -1,11 +1,12 @@
/* ISC license. */
+#include <skalibs/posixplz.h>
#include <skalibs/textclient.h>
+
#include <s6/ftrigr.h>
int ftrigr_startf (ftrigr_t *a, tain const *deadline, tain *stamp)
{
static char const *const cargv[2] = { FTRIGRD_PROG, 0 } ;
- static char const *const cenvp[1] = { 0 } ;
- return textclient_startf(&a->connection, cargv, cenvp, TEXTCLIENT_OPTION_WAITPID, FTRIGR_BANNER1, FTRIGR_BANNER1_LEN, FTRIGR_BANNER2, FTRIGR_BANNER2_LEN, deadline, stamp) ;
+ return textclient_startf(&a->connection, cargv, (char const *const *)environ, TEXTCLIENT_OPTION_WAITPID, FTRIGR_BANNER1, FTRIGR_BANNER1_LEN, FTRIGR_BANNER2, FTRIGR_BANNER2_LEN, deadline, stamp) ;
}