Prepare for 2.3.5.2, adapt sig_ignore api

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

6 files changed, 24 insertions, 9 deletions

diff --git a/INSTALL b/INSTALL
index 5085d80..cac7145 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.10.0.3 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.11.0.0 or later: http://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index c79e1ad..f5f5aeb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-dns.
 
+In 2.3.5.2
+----------
+
+ - Adaptation to skalibs-2.11.0.0.
+
+
 In 2.3.5.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index afd87c3..5c5a528 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -58,7 +58,7 @@ to the s6 ecosystem.
  <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.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>
 </ul>
 
@@ -72,7 +72,7 @@ requirement if you link against the shared version of the skalibs library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6-dns is <a href="s6-dns-2.3.5.1.tar.gz">2.3.5.1</a>. </li>
+ <li> The current released version of s6-dns is <a href="s6-dns-2.3.5.2.tar.gz">2.3.5.2</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-dns/">s6-dns
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index b9e85a6..979442e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-dns </h1>
 
+<h2> in 2.3.5.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.11.0.0. </li>
+</ul>
+
 <h2> in 2.3.5.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index a863495..bf33e48 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-dns
-version=2.3.5.1
+version=2.3.5.2
 category=web
 package_macro_name=S6_DNS
diff --git a/src/skadns/skadnsd.c b/src/skadns/skadnsd.c
index c405574..2a5c2fe 100644
--- a/src/skadns/skadnsd.c
+++ b/src/skadns/skadnsd.c
@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <signal.h>
+
 #include <skalibs/types.h>
 #include <skalibs/error.h>
 #include <skalibs/strerr2.h>
@@ -14,10 +15,11 @@
 #include <skalibs/iopause.h>
 #include <skalibs/textmessage.h>
 #include <skalibs/textclient.h>
+
 #include <s6-dns/s6dns.h>
 #include <s6-dns/skadns.h>
 
-typedef struct dnsio_s dnsio_t, *dnsio_t_ref ;
+typedef struct dnsio_s dnsio, *dnsio_ref ;
 struct dnsio_s
 {
   unsigned int xindex ;
@@ -26,12 +28,12 @@ struct dnsio_s
 } ;
 #define DNSIO_ZERO { .xindex = SKADNS_MAXCONCURRENCY, .dt = S6DNS_ENGINE_ZERO, .id = 0 }
 
-static dnsio_t a[SKADNS_MAXCONCURRENCY] ;
+static dnsio a[SKADNS_MAXCONCURRENCY] ;
 static unsigned int sp = 0 ;
 
 static void remove (unsigned int i)
 {
-  dnsio_t tmp ;
+  dnsio tmp ;
   tmp = a[sp-1] ;
   a[--sp] = a[i] ;
   a[i] = tmp ;
@@ -111,7 +113,7 @@ int main (void)
 
   if (ndelay_on(0) < 0) strerr_diefu2sys(111, "ndelay_on ", "0") ;
   if (ndelay_on(1) < 0) strerr_diefu2sys(111, "ndelay_on ", "1") ;
-  if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  if (!sig_ignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
   tain_now_set_stopwatch_g() ;
   if (!s6dns_init()) strerr_diefu1sys(111, "s6dns_init") ;
 
@@ -122,7 +124,7 @@ int main (void)
       strerr_diefu1sys(111, "sync with client") ;
   }
   {
-    static dnsio_t const zero = DNSIO_ZERO ;
+    static dnsio const zero = DNSIO_ZERO ;
     unsigned int i = 0 ;
     for (; i < SKADNS_MAXCONCURRENCY ; i++) a[i] = zero ;
   }