diff options
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | doc/index.html | 6 | ||||
| -rw-r--r-- | doc/upgrade.html | 9 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/conn-tools/s6-accessrules-cdb-from-fs.c | 2 | ||||
| -rw-r--r-- | src/daemontools-extras/lolsyslog.c | 3 | ||||
| -rw-r--r-- | src/libs6/s6_accessrules_backend_fs.c | 2 | ||||
| -rw-r--r-- | src/libs6/s6_svstatus_read.c | 7 | ||||
| -rw-r--r-- | src/supervision/s6-notifyoncheck.c | 2 | ||||
| -rw-r--r-- | src/supervision/s6-supervise.c | 2 |
11 files changed, 33 insertions, 12 deletions
@@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.11.2.0 or later: https://skarnet.org/software/skalibs/ - - execline version 2.8.3.0 or later: https://skarnet.org/software/execline/ + - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/ + - execline version 2.9.0.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.1 or later: https://skarnet.org/software/nsss/ @@ -1,5 +1,11 @@ Changelog for s6. +In 2.11.1.1 +----------- + + - Adaptation to skalibs-2.12.0.0. + + In 2.11.1.0 ----------- diff --git a/doc/index.html b/doc/index.html index b65b704..b9c7bbb 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.11.2.0 or later. It's a build-time requirement. It's also a run-time +2.12.0.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): <a href="//skarnet.org/software/execline/">execline</a> version -2.8.3.0 or later. When s6 is built with execline support (which is the default), +2.9.0.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.11.1.0.tar.gz">2.11.1.0</a>. </li> + <li> The current released version of s6 is <a href="s6-2.11.1.1.tar.gz">2.11.1.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 452e54a..193a8a4 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,15 @@ <h1> What has changed in s6 </h1> +<h2> in 2.11.1.1 </h2> + +<ul> + <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> +dependency bumped to 2.12.0.0. </li> + <li> <a href="//skarnet.org/software/execline/">execline</a> +optional dependency bumped to 2.9.0.0. </li> +</ul> + <h2> in 2.11.1.0 </h2> <ul> diff --git a/package/info b/package/info index 00fce1f..bf699b0 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.11.1.0 +version=2.11.1.1 category=admin package_macro_name=S6 diff --git a/src/conn-tools/s6-accessrules-cdb-from-fs.c b/src/conn-tools/s6-accessrules-cdb-from-fs.c index a6587db..1b0b233 100644 --- a/src/conn-tools/s6-accessrules-cdb-from-fs.c +++ b/src/conn-tools/s6-accessrules-cdb-from-fs.c @@ -86,7 +86,7 @@ static void doit (cdbmaker *c, stralloc *sa, size_t start) sa->len = k+1 ; stralloc_catb(sa, "exec", 5) ; r = openreadnclose(sa->s, tmp.s + tmpbase + 5 + envlen, 4096) ; - if ((r < 0) && (errno != ENOENT)) + if ((r == -1) && (errno != ENOENT)) { cleanup() ; strerr_diefu2sys(111, "openreadnclose ", sa->s) ; diff --git a/src/daemontools-extras/lolsyslog.c b/src/daemontools-extras/lolsyslog.c index a397dae..e62bdef 100644 --- a/src/daemontools-extras/lolsyslog.c +++ b/src/daemontools-extras/lolsyslog.c @@ -82,8 +82,9 @@ size_t lolsyslog_string (char *out, char const *in) out = stpcpy(out, p->c_name ? p->c_name : "unknown") ; *out++ = '.' ; + p = prioritynames ; fp = LOG_PRI(fpr) ; - for (p = prioritynames ; p->c_name ; p++) if (p->c_val == fp) break ; + for (; p->c_name ; p++) if (p->c_val == fp) break ; out = stpcpy(out, p->c_name ? p->c_name : "unknown") ; *out++ = ':' ; *out++ = ' ' ; *out++ = 0 ; return i+2 ; diff --git a/src/libs6/s6_accessrules_backend_fs.c b/src/libs6/s6_accessrules_backend_fs.c index 1995757..12948f6 100644 --- a/src/libs6/s6_accessrules_backend_fs.c +++ b/src/libs6/s6_accessrules_backend_fs.c @@ -41,7 +41,7 @@ s6_accessrules_result_t s6_accessrules_backend_fs (char const *key, size_t keyle memcpy(tmp + dirlen + keylen + 2, "exec", 5) ; { ssize_t r = openreadnclose(tmp, params->exec.s + params->exec.len, 4096) ; - if ((r < 0) && (errno != EACCES) && (errno != ENOENT)) + if ((r == -1) && (errno != EACCES) && (errno != ENOENT)) { if (wasnull) stralloc_free(¶ms->env) ; else params->env.len = envbase ; diff --git a/src/libs6/s6_svstatus_read.c b/src/libs6/s6_svstatus_read.c index 376a0c7..9b21d44 100644 --- a/src/libs6/s6_svstatus_read.c +++ b/src/libs6/s6_svstatus_read.c @@ -1,17 +1,22 @@ /* ISC license. */ +#include <errno.h> #include <string.h> + #include <skalibs/djbunix.h> #include <s6/supervise.h> int s6_svstatus_read (char const *dir, s6_svstatus_t *status) { + ssize_t r ; size_t n = strlen(dir) ; char pack[S6_SVSTATUS_SIZE] ; char tmp[n + 1 + sizeof(S6_SVSTATUS_FILENAME)] ; memcpy(tmp, dir, n) ; memcpy(tmp + n, "/" S6_SVSTATUS_FILENAME, 1 + sizeof(S6_SVSTATUS_FILENAME)) ; - if (openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) < S6_SVSTATUS_SIZE) return 0 ; + r = openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) ; + if (r == -1) return 0 ; + if (r < S6_SVSTATUS_SIZE) return (errno = EPIPE, 0) ; s6_svstatus_unpack(pack, status) ; return 1 ; } diff --git a/src/supervision/s6-notifyoncheck.c b/src/supervision/s6-notifyoncheck.c index a4d0ab1..1be61d2 100644 --- a/src/supervision/s6-notifyoncheck.c +++ b/src/supervision/s6-notifyoncheck.c @@ -36,7 +36,7 @@ static inline int read_uint (char const *file, unsigned int *fd) { char buf[UINT_FMT + 1] ; ssize_t r = openreadnclose_nb(file, buf, UINT_FMT) ; - if (r < 0) return -1 ; + if (r == -1) return -1 ; buf[byte_chr(buf, r, '\n')] = 0 ; return !!uint0_scan(buf, fd) ; } diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c index cc6779a..2060cac 100644 --- a/src/supervision/s6-supervise.c +++ b/src/supervision/s6-supervise.c @@ -82,7 +82,7 @@ static inline void announce (void) static int read_file (char const *file, char *buf, size_t n) { ssize_t r = openreadnclose_nb(file, buf, n) ; - if (r < 0) + if (r == -1) { if (errno != ENOENT) strerr_warnwu2sys("open ", file) ; return 0 ; |