diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-15 09:59:40 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-15 10:00:59 +0000 |
| commit | 12cc2e509c1253e08b5fea654e80eb308bc08025 (patch) | |
| tree | b8ebf40b7e202ab63cd063edafd0ca1575cd5c84 | |
| parent | 179829aa7b2e275f17c4f8ac465cbfabf0ff7f9b (diff) | |
| download | s6-2.2.2.0.tar.xz | |
- remove now useless tain_now() check in s6-setlockv2.2.2.0
- version: 2.2.2.0
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 3 | ||||
| -rw-r--r-- | src/daemontools-extras/s6-setlock.c | 2 |
4 files changed, 8 insertions, 5 deletions
@@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/ - - execline version 2.1.4.1 or later: http://skarnet.org/software/execline/ + - skalibs version 2.3.8.0 or later: http://skarnet.org/software/skalibs/ + - execline version 2.1.4.2 or later: http://skarnet.org/software/execline/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/doc/index.html b/doc/index.html index 20e3f6b..7773901 100644 --- a/doc/index.html +++ b/doc/index.html @@ -83,11 +83,11 @@ 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="http://skarnet.org/software/skalibs/">skalibs</a> version -2.3.7.1 or later. It's a build-time requirement. It's also a run-time +2.3.8.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> <a href="http://skarnet.org/software/execline/">execline</a> version -2.1.4.1 or later. It's a build-time and run-time requirement. </li> +2.1.4.2 or later. It's a build-time and run-time requirement. </li> </ul> <h3> Licensing </h3> diff --git a/doc/upgrade.html b/doc/upgrade.html index 91c088e..c65f1fb 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -23,6 +23,9 @@ <ul> <li> <a href="s6-svscan.html">s6-svscan</a> now supports the <tt>-s</tt> option for configurable signal management. </li> + <li> GNU make dependency pushed back to 3.81. </li> + <li> skalibs dependency bumped to 2.3.8.0. </li> + <li> execline dependency bumped to 2.1.4.2. </li> </ul> <h2> in 2.2.1.1 </h2> diff --git a/src/daemontools-extras/s6-setlock.c b/src/daemontools-extras/s6-setlock.c index f2ce79e..15970ed 100644 --- a/src/daemontools-extras/s6-setlock.c +++ b/src/daemontools-extras/s6-setlock.c @@ -58,7 +58,7 @@ int main (int argc, char const *const *argv, char const *const *envp) int p[2] ; unsigned int pid ; char c ; - if (!tain_now_g()) strerr_diefu1sys(111, "tain_now") ; + tain_now_g() ; tain_from_millisecs(&deadline, timeout) ; tain_add_g(&deadline, &deadline) ; pid = child_spawn(S6_LIBEXECPREFIX "s6lockd-helper", cargv, cenvp, p, 2) ; |