Prepare for 0.0.1.4; adapt to skalibs-2.12.0.0

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

7 files changed, 22 insertions, 9 deletions

diff --git a/COPYING b/COPYING
index f262571..85e80fb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2021 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2020-2022 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 40e4185..23180df 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.11.1.0 or later: https://skarnet.org/software/skalibs/
-  - s6-dns version 2.3.5.3 or later: https://skarnet.org/software/s6-dns/
+  - 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/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index f430bd0..472c399 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for dnsfunnel.
 
+In 0.0.1.4
+----------
+
+ - Adaptation to skalibs-2.12.0.0.
+
+
 In 0.0.1.3
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index e829672..4848c0f 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.11.1.0 or later. It's a build-time requirement. It's also a run-time
+2.12.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.3 or later. It's a build-time requirement. It's also a run-time
+2.3.5.4 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.3.tar.gz">0.0.1.3</a>.
+<a href="dnsfunnel-0.0.1.4.tar.gz">0.0.1.4</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 79eddb3..a8c6887 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.4 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> dependency bumped to
+2.12.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> dependency bumped to
+2.3.5.4. </li>
+</ul>
+
 <h2> in 0.0.1.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index bec398f..12acf66 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=dnsfunnel
-version=0.0.1.3
+version=0.0.1.4
 category=web
 package_macro_name=DNSFUNNEL
diff --git a/src/dnsfunnel/dnsfunneld.c b/src/dnsfunnel/dnsfunneld.c
index 1eda1d3..0f8182a 100644
--- a/src/dnsfunnel/dnsfunneld.c
+++ b/src/dnsfunnel/dnsfunneld.c
@@ -31,7 +31,6 @@
 #include <skalibs/iopause.h>
 #include <skalibs/selfpipe.h>
 #include <skalibs/gensetdyn.h>
-#include <skalibs/random.h>
 
 #include <s6-dns/s6dns.h>
 
@@ -230,7 +229,6 @@ int main (int argc, char const *const *argv)
       strerr_diefu1sys(111, "move file descriptors") ;
     if (ndelay_on(0) < 0) strerr_diefu1sys(111, "turn stdin non-blocking") ;
     if (!sig_altignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
-    if (!random_init()) strerr_diefu1sys(111, "s6dns_init") ;
 
     if (root[0])
     {