Adapt to skalibs-2.13.0.0

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

23 files changed, 23 insertions, 22 deletions

diff --git a/INSTALL b/INSTALL
index 492cc71..ef2a640 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.12.0.2 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.13.0.0 or later: https://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 62f4a04..50b4746 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ In 2.3.5.5
 ----------
 
  - Bugfixes.
+ - Adaptation to skalibs-2.13.0.0.
  - Workarounds for broken DNS caches.
 
 
diff --git a/doc/index.html b/doc/index.html
index 90d2b35..7cd5688 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.12.0.2 or later. It's a build-time requirement. It's also a run-time
+2.13.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>
 
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 798dc89..33872e2 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -22,7 +22,7 @@
 
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
-dependency bumped to 2.12.0.2. </li>
+dependency bumped to 2.13.0.0. </li>
 </ul>
 
 <h2> in 2.3.5.4 </h2>
diff --git a/src/caches/shibari.c b/src/caches/shibari.c
index 77334f6..b945fd4 100644
--- a/src/caches/shibari.c
+++ b/src/caches/shibari.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #include <s6-dns/s6dns.h>
 
diff --git a/src/clients/s6-dnsip.c b/src/clients/s6-dnsip.c
index 06b8400..9828443 100644
--- a/src/clients/s6-dnsip.c
+++ b/src/clients/s6-dnsip.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/ip46.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/buffer.h>
diff --git a/src/clients/s6-dnsip4-filter.c b/src/clients/s6-dnsip4-filter.c
index d403f35..4842734 100644
--- a/src/clients/s6-dnsip4-filter.c
+++ b/src/clients/s6-dnsip4-filter.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <skalibs/fmtscan.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <s6-dns/s6dns-constants.h>
 #include <s6-dns/s6dns-message.h>
diff --git a/src/clients/s6-dnsip4.c b/src/clients/s6-dnsip4.c
index 483bfbc..db32804 100644
--- a/src/clients/s6-dnsip4.c
+++ b/src/clients/s6-dnsip4.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
diff --git a/src/clients/s6-dnsip6-filter.c b/src/clients/s6-dnsip6-filter.c
index 09b8b20..d2855bc 100644
--- a/src/clients/s6-dnsip6-filter.c
+++ b/src/clients/s6-dnsip6-filter.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <skalibs/fmtscan.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <s6-dns/s6dns-constants.h>
 #include <s6-dns/s6dns-message.h>
diff --git a/src/clients/s6-dnsip6.c b/src/clients/s6-dnsip6.c
index 5942904..eb37a53 100644
--- a/src/clients/s6-dnsip6.c
+++ b/src/clients/s6-dnsip6.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
diff --git a/src/clients/s6-dnsmx.c b/src/clients/s6-dnsmx.c
index 37d6891..159a5c6 100644
--- a/src/clients/s6-dnsmx.c
+++ b/src/clients/s6-dnsmx.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
 #include <skalibs/genalloc.h>
diff --git a/src/clients/s6-dnsname-filter.c b/src/clients/s6-dnsname-filter.c
index 9ee7ee2..83d541f 100644
--- a/src/clients/s6-dnsname-filter.c
+++ b/src/clients/s6-dnsname-filter.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 
 #include <skalibs/posixishard.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/stralloc.h>
 
diff --git a/src/clients/s6-dnsname.c b/src/clients/s6-dnsname.c
index b49718d..c35751b 100644
--- a/src/clients/s6-dnsname.c
+++ b/src/clients/s6-dnsname.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/tai.h>
diff --git a/src/clients/s6-dnsns.c b/src/clients/s6-dnsns.c
index 8e803f3..88f5197 100644
--- a/src/clients/s6-dnsns.c
+++ b/src/clients/s6-dnsns.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
 #include <skalibs/genalloc.h>
diff --git a/src/clients/s6-dnsq.c b/src/clients/s6-dnsq.c
index d7d915e..c6d50cf 100644
--- a/src/clients/s6-dnsq.c
+++ b/src/clients/s6-dnsq.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/bitarray.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
 #include <skalibs/genwrite.h>
diff --git a/src/clients/s6-dnsqr.c b/src/clients/s6-dnsqr.c
index cb3fb97..290b06a 100644
--- a/src/clients/s6-dnsqr.c
+++ b/src/clients/s6-dnsqr.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
 #include <skalibs/genwrite.h>
diff --git a/src/clients/s6-dnsqualify.c b/src/clients/s6-dnsqualify.c
index 74d1c9b..38bf3ea 100644
--- a/src/clients/s6-dnsqualify.c
+++ b/src/clients/s6-dnsqualify.c
@@ -2,7 +2,7 @@
 
 #include <sys/types.h>
 #include <string.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <s6-dns/s6dns.h>
 
diff --git a/src/clients/s6-dnssoa.c b/src/clients/s6-dnssoa.c
index 426919a..4df42b4 100644
--- a/src/clients/s6-dnssoa.c
+++ b/src/clients/s6-dnssoa.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
 #include <skalibs/genalloc.h>
diff --git a/src/clients/s6-dnssrv.c b/src/clients/s6-dnssrv.c
index a3e0dc4..b60e3be 100644
--- a/src/clients/s6-dnssrv.c
+++ b/src/clients/s6-dnssrv.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
 #include <skalibs/genalloc.h>
diff --git a/src/clients/s6-dnstxt.c b/src/clients/s6-dnstxt.c
index c7c31cd..2564917 100644
--- a/src/clients/s6-dnstxt.c
+++ b/src/clients/s6-dnstxt.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/tai.h>
 #include <skalibs/stralloc.h>
diff --git a/src/clients/s6-randomip.c b/src/clients/s6-randomip.c
index 3ab98bb..6a43794 100644
--- a/src/clients/s6-randomip.c
+++ b/src/clients/s6-randomip.c
@@ -5,7 +5,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/buffer.h>
 #include <skalibs/fmtscan.h>
 #include <skalibs/random.h>
diff --git a/src/clients/s6dns_generic_filter_main.c b/src/clients/s6dns_generic_filter_main.c
index 32eaee6..3e1894d 100644
--- a/src/clients/s6dns_generic_filter_main.c
+++ b/src/clients/s6dns_generic_filter_main.c
@@ -6,7 +6,7 @@
 #include <skalibs/error.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/env.h>
 #include <skalibs/tai.h>
 #include <skalibs/iopause.h>
diff --git a/src/skadns/skadnsd.c b/src/skadns/skadnsd.c
index 8ccb61c..8714d2b 100644
--- a/src/skadns/skadnsd.c
+++ b/src/skadns/skadnsd.c
@@ -8,7 +8,7 @@
 
 #include <skalibs/types.h>
 #include <skalibs/error.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sig.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbunix.h>