From 4ffd64a13210191b179a98102bf6168471719e98 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 29 Nov 2022 11:39:15 +0000
Subject:  Prepare for 0.0.1.5

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                             | 4 ++--
 NEWS                                | 6 ++++++
 doc/index.html                      | 6 +++---
 doc/upgrade.html                    | 9 +++++++++
 package/info                        | 2 +-
 src/dnsfunnel/dnsfunnel-translate.c | 2 +-
 src/dnsfunnel/dnsfunneld.c          | 2 +-
 src/dnsfunnel/dnsfunneld_answer.c   | 2 +-
 src/dnsfunnel/dnsfunneld_process.c  | 2 +-
 9 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 23180df..5d8c196 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/
-  - s6-dns version 2.3.5.4 or later: https://skarnet.org/software/s6-dns/
+  - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
+  - s6-dns version 2.3.5.5 or later: https://skarnet.org/software/s6-dns/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index 472c399..e3386e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for dnsfunnel.
 
+In 0.0.1.5
+----------
+
+ - Adaptation to skalibs-2.13.0.0.
+
+
 In 0.0.1.4
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 4848c0f..1aa919c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -45,11 +45,11 @@ TCP DNS transport. It was originally written to be used in the
  <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.0 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>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
-2.3.5.4 or later. It's a build-time requirement. It's also a run-time
+2.3.5.5 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the s6dns
 library. </li>
 </ul>
@@ -65,7 +65,7 @@ library. </li>
 
 <ul>
  <li> The current released version of dnsfunnel is
-<a href="dnsfunnel-0.0.1.4.tar.gz">0.0.1.4</a>.
+<a href="dnsfunnel-0.0.1.5.tar.gz">0.0.1.5</a>.
 (dnsfunnel is in beta development at the moment. Use at your own
 risk.) </li>
  <li> Alternatively, you can checkout a copy of the
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a8c6887..f724a06 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in dnsfunnel </h1>
 
+<h2> in 0.0.1.5 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> dependency bumped to
+2.13.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> dependency bumped to
+2.3.5.5. </li>
+</ul>
+
 <h2> in 0.0.1.4 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 12acf66..620b237 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=dnsfunnel
-version=0.0.1.4
+version=0.0.1.5
 category=web
 package_macro_name=DNSFUNNEL
diff --git a/src/dnsfunnel/dnsfunnel-translate.c b/src/dnsfunnel/dnsfunnel-translate.c
index 08438dc..0876a15 100644
--- a/src/dnsfunnel/dnsfunnel-translate.c
+++ b/src/dnsfunnel/dnsfunnel-translate.c
@@ -6,7 +6,7 @@
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
 #include <skalibs/fmtscan.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/ip46.h>
 
diff --git a/src/dnsfunnel/dnsfunneld.c b/src/dnsfunnel/dnsfunneld.c
index 0f8182a..2ff340f 100644
--- a/src/dnsfunnel/dnsfunneld.c
+++ b/src/dnsfunnel/dnsfunneld.c
@@ -21,7 +21,7 @@
 #include <skalibs/allreadwrite.h>
 #include <skalibs/error.h>
 #include <skalibs/bitarray.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/sig.h>
diff --git a/src/dnsfunnel/dnsfunneld_answer.c b/src/dnsfunnel/dnsfunneld_answer.c
index 7793074..4266089 100644
--- a/src/dnsfunnel/dnsfunneld_answer.c
+++ b/src/dnsfunnel/dnsfunneld_answer.c
@@ -7,7 +7,7 @@
 #include <skalibs/uint16.h>
 #include <skalibs/uint32.h>
 #include <skalibs/error.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/socket.h>
 
diff --git a/src/dnsfunnel/dnsfunneld_process.c b/src/dnsfunnel/dnsfunneld_process.c
index 13600dd..5f28a37 100644
--- a/src/dnsfunnel/dnsfunneld_process.c
+++ b/src/dnsfunnel/dnsfunneld_process.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 
 #include <skalibs/uint16.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/gensetdyn.h>
 
 #include <s6-dns/s6dns-constants.h>
-- 
cgit 1.4.1