Prepare for 1.0.4.1

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

8 files changed, 60 insertions, 11 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 35d6541..d4f3454 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 2.6.10 or later.
diff --git a/doc/index.html b/doc/index.html
index be7c5df..77e3203 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -99,7 +99,7 @@ and does not pull in any unnecessary code. </li>
 The Linux kernel must be 2.6.10 or later. </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.10.0.3 or later. It's a build-time requirement. It's also a run-time
+2.11.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> Optionally: <a href="//skarnet.org/software/execline/">execline</a>
@@ -119,7 +119,7 @@ if your <tt>mdev.conf</tt> file contains <tt>+</tt>, <tt>-</tt> or
 
 <ul>
  <li> The current released version of mdevd is
-<a href="mdevd-0.1.4.0.tar.gz">0.1.4.0</a>. </li>
+<a href="mdevd-0.1.4.1.tar.gz">0.1.4.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/mdevd/">mdevd
 git repository</a>:
@@ -157,7 +157,7 @@ the previous versions of mdevd and the current one. </li>
 
 <ul>
  <li> <tt>mdevd</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>
 
 </body>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index b16293e..f63453e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in mdevd </h1>
 
+<h2> in 0.1.4.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.0.0. </li>
+</ul>
+
 <h2> in 0.1.4.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index e68fc98..69e2e4a 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=mdevd
-version=0.1.4.0
+version=0.1.4.1
 category=admin
 package_macro_name=MDEVD
diff --git a/src/mdevd/mdevd-coldplug.c b/src/mdevd/mdevd-coldplug.c
index 720a7cc..596001c 100644
--- a/src/mdevd/mdevd-coldplug.c
+++ b/src/mdevd/mdevd-coldplug.c
@@ -78,7 +78,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   char const *slashsys = "/sys" ;
   PROG = "mdevd-coldplug" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "s:", &l) ;
diff --git a/src/mdevd/mdevd.c b/src/mdevd/mdevd.c
index 06324eb..cbcf2e6 100644
--- a/src/mdevd/mdevd.c
+++ b/src/mdevd/mdevd.c
@@ -524,14 +524,14 @@ static inline int wait_for_loading (char const *sysdevpath, size_t sysdevpathlen
 {
   int lfd = -1 ;
   unsigned int n = 150 ;
-  static tain_t const period = { .sec = TAI_ZERO, .nano = 200000000 } ;
+  static tain const period = { .sec = TAI_ZERO, .nano = 200000000 } ;
   char loadingfn[sysdevpathlen + 9] ;
   memcpy(loadingfn, sysdevpath, sysdevpathlen) ;
   memcpy(loadingfn + sysdevpathlen, "/loading", 9) ;
   tain_now_g() ;
   while (n--)  /* sysfs doesn't support inotify, so we have to poll -_- */
   {
-    tain_t deadline ;
+    tain deadline ;
     lfd = open_write(loadingfn) ;
     if (lfd >= 0) break ;
     tain_add_g(&deadline, &period) ;
@@ -1021,7 +1021,7 @@ int main (int argc, char const *const *argv)
   int docoldplug = 0 ;
   PROG = "mdevd" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "nv:D:o:b:f:s:d:F:C", &l) ;
@@ -1076,14 +1076,14 @@ int main (int argc, char const *const *argv)
   if (x[1].fd < 0) strerr_diefu1sys(111, "init netlink") ;
   x[0].fd = selfpipe_init() ;
   if (x[0].fd < 0) strerr_diefu1sys(111, "init selfpipe") ;
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (sig_altignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
   {
     sigset_t set ;
     sigemptyset(&set) ;
     sigaddset(&set, SIGTERM) ;
     sigaddset(&set, SIGCHLD) ;
     sigaddset(&set, SIGHUP) ;
-    if (selfpipe_trapset(&set) < 0)
+    if (!selfpipe_trapset(&set))
       strerr_diefu1sys(111, "trap signals") ;
   }