Prepare for 2.5.1.6 ; adapt to skalibs-2.11.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

13 files changed, 75 insertions, 20 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..6279422
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,5 @@
+ Please add a Signed-Off-By: line at the end of your commit,
+which certifies that you have the right and authority to pass
+it on as an open-source patch, as explicited in the Developer's
+Certificate of Origin available in this project's DCO file,
+or at https://developercertificate.org/
diff --git a/DCO b/DCO
new file mode 100644
index 0000000..8201f99
--- /dev/null
+++ b/DCO
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/INSTALL b/INSTALL
index ce985ef..ee445fa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.10.0.3 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 3.5 or later.
diff --git a/NEWS b/NEWS
index aa591b1..e1917d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-utils.
 
+In 2.5.1.6
+----------
+
+ - Adaptation to skalibs-2.11.0.0.
+
+
 In 2.5.1.5
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 9f3cece..80d3fcd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -117,7 +117,7 @@ the previous versions of s6-linux-utils and the current one. </li>
 
 <ul>
  <li> <tt>s6-linux-utils</tt> is discussed on the
-<a href="//skarnet.org/lists.html#skaware">skaware</a> mailing-list. </li>
+<a href="//skarnet.org/lists/#skaware">skaware</a> mailing-list. </li>
 </ul>
 
 <h2> Similar work </h2>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 9ddde71..2f6d15a 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.5.1.6 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.0.0. </li>
+</ul>
+
 <h2> in 2.5.1.5 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 34aa103..5668d1f 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.5.1.5
+version=2.5.1.6
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/s6-logwatch.c b/src/minutils/s6-logwatch.c
index 28739af..a8675e1 100644
--- a/src/minutils/s6-logwatch.c
+++ b/src/minutils/s6-logwatch.c
@@ -110,7 +110,7 @@ int main (int argc, char const *const *argv)
   unsigned int maxlen = 4096 ;
   PROG = "s6-logwatch" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "m:", &l) ;
@@ -142,7 +142,7 @@ int main (int argc, char const *const *argv)
     state = B_WAITING ;
   }
   else state = B_READING ;
-  if (sig_ignore(SIGPIPE) == -1) strerr_diefu1sys(111, "sig_ignore(SIGPIPE)") ;
+  if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "sig_ignore(SIGPIPE)") ;
   if (state == B_READING)
   {
     if (!readit(fd)) strerr_diefu3sys(111, "read from ", dir, "/current") ;
diff --git a/src/minutils/s6-mount.c b/src/minutils/s6-mount.c
index 382a0c4..4dd9ed5 100644
--- a/src/minutils/s6-mount.c
+++ b/src/minutils/s6-mount.c
@@ -112,7 +112,7 @@ int main (int argc, char const *const *argv)
   PROG = "s6-mount" ;
   {
     int doall = 0 ;
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "nz:arwt:o:", &l) ;
diff --git a/src/minutils/s6-ps.c b/src/minutils/s6-ps.c
index fa9ce57..39d7211 100644
--- a/src/minutils/s6-ps.c
+++ b/src/minutils/s6-ps.c
@@ -131,7 +131,7 @@ int main (int argc, char const *const *argv)
   PROG = "s6-ps" ;
 
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "Hlw:W:o:", &l) ;
diff --git a/src/minutils/s6-ps.h b/src/minutils/s6-ps.h
index b0aadcc..eb56dc1 100644
--- a/src/minutils/s6-ps.h
+++ b/src/minutils/s6-ps.h
@@ -140,10 +140,10 @@ extern void s6ps_otree (pscan_t *, unsigned int, avltreen *, unsigned int *) ;
 
 extern int s6ps_compute_boottime (pscan_t *, unsigned int) ;
 
-typedef int pfieldfmt_func_t (pscan_t *, size_t *, size_t *) ;
-typedef pfieldfmt_func_t *pfieldfmt_func_t_ref ;
+typedef int pfieldfmt_func (pscan_t *, size_t *, size_t *) ;
+typedef pfieldfmt_func *pfieldfmt_func_ref ;
 
-extern pfieldfmt_func_t_ref *s6ps_pfield_fmt ;
+extern pfieldfmt_func_ref *s6ps_pfield_fmt ;
 
 extern void *left_dtok (unsigned int, void *) ;
 extern int uint32_cmp (void const *, void const *, void *) ;
diff --git a/src/minutils/s6ps_pfield.c b/src/minutils/s6ps_pfield.c
index f2e3f7f..f527d25 100644
--- a/src/minutils/s6ps_pfield.c
+++ b/src/minutils/s6ps_pfield.c
@@ -91,7 +91,7 @@ static char const *const opttable[PFIELD_PHAIL] =
 
 char const *const *s6ps_opttable = opttable ;
 
-static tain_t boottime = TAIN_EPOCH ;
+static tain boottime = TAIN_EPOCH ;
 
 static int fmt_64 (pscan_t *p, size_t *pos, size_t *len, uint64_t u)
 {                                                          
@@ -204,7 +204,7 @@ int s6ps_compute_boottime (pscan_t *p, unsigned int mypos)
   else
   {
     unsigned int hz = gethz() ;
-    tain_t offset = { .sec = { .x = p[mypos].start / hz }, .nano = (p[mypos].start % hz) * (1000000000 / hz) } ;
+    tain offset = { .sec = { .x = p[mypos].start / hz }, .nano = (p[mypos].start % hz) * (1000000000 / hz) } ;
     tain_sub(&boottime, &STAMP, &offset) ;
     return 1 ;
   }
@@ -309,7 +309,7 @@ static int fmt_start (pscan_t *p, size_t *pos, size_t *len)
 {
   struct tm starttm ;
   unsigned int hz = gethz() ;
-  tain_t blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ;
+  tain blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ;
   tain_add(&blah, &boottime, &blah) ;
   if (!localtm_from_tai(&starttm, tain_secp(&blah), 1)) return 0 ;
   return fmt_timedate(p, pos, len, &starttm) ;
@@ -479,7 +479,7 @@ static int fmt_env (pscan_t *p, size_t *pos, size_t *len)
 
 static uint64_t gettotalj (uint64_t j)
 {
-  tain_t totaltime ;
+  tain totaltime ;
   unsigned int hz = gethz() ;
   tain_sub(&totaltime, &STAMP, &boottime) ;
   j = totaltime.sec.x * hz + totaltime.nano / (1000000000 / hz) - j ;
@@ -506,7 +506,7 @@ static int fmt_cttime (pscan_t *p, size_t *pos, size_t *len)
 static int fmt_tstart (pscan_t *p, size_t *pos, size_t *len)
 {
   unsigned int hz = gethz() ;
-  tain_t blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ;
+  tain blah = { .sec = { .x = p->start / hz }, .nano = (p->start % hz) * (1000000000 / hz) } ;
   if (!stralloc_readyplus(&p->data, TIMESTAMP)) return 0 ;
   tain_add(&blah, &boottime, &blah) ;
   *pos = p->data.len ;
@@ -520,7 +520,7 @@ static int fmt_cpcpu (pscan_t *p, size_t *pos, size_t *len)
   return percent(&p->data, 10000 * (p->utime + p->stime + p->cutime + p->cstime) / gettotalj(p->start), pos, len) ;
 }
 
-static pfieldfmt_func_t_ref pfieldfmt_table[PFIELD_PHAIL] =
+static pfieldfmt_func_ref pfieldfmt_table[PFIELD_PHAIL] =
 {
   &fmt_pid,
   &fmt_comm,
@@ -557,4 +557,4 @@ static pfieldfmt_func_t_ref pfieldfmt_table[PFIELD_PHAIL] =
   &fmt_cpcpu
 } ;
 
-pfieldfmt_func_t_ref *s6ps_pfield_fmt = pfieldfmt_table ;
+pfieldfmt_func_ref *s6ps_pfield_fmt = pfieldfmt_table ;
diff --git a/src/minutils/s6ps_statparse.c b/src/minutils/s6ps_statparse.c
index 56e00f9..fe4c355 100644
--- a/src/minutils/s6ps_statparse.c
+++ b/src/minutils/s6ps_statparse.c
@@ -17,8 +17,8 @@
 
 #define STATVARS 49
 
-typedef size_t scanfunc_t (char const *, void *) ;
-typedef scanfunc_t *scanfunc_t_ref ;
+typedef size_t sca$1_func (char const *, void *) ;
+typedef sca$1_func *sca$1_func_ref ;
 
 static size_t f64 (char const *s, void *u64)
 {
@@ -48,7 +48,7 @@ DEFUNS(fint, int)
 DEFUNS(fpid, pid_t)
 DEFUNU(fdev, dev_t)
 
-static scanfunc_t_ref scanfuncs[STATVARS] =
+static sca$1_func_ref scanfuncs[STATVARS] =
 {
   &fpid, /* ppid */
   &fpid, /* pgrp */