From c4f5028b95067d97ff53894e705186004e51a81a Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 10 Aug 2021 18:37:32 +0000
Subject:  Prepare for 0.0.1.2; adapt to skalibs-2.11.0.0

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/dnsfunneld.c | 2 +-
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index 36b46df..b604ae0 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.10.0.3 or later: https://skarnet.org/software/skalibs/
-  - s6-dns version 2.3.5.1 or later: https://skarnet.org/software/s6-dns/
+  - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/
+  - s6-dns version 2.3.5.2 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 814a24d..e819b01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for dnsfunnel.
 
+In 0.0.1.2
+----------
+
+ - Adaptation to skalibs-2.11.0.0
+
+
 In 0.0.1.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index b283e3e..d032861 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.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> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
-2.3.5.1 or later. It's a build-time requirement. It's also a run-time
+2.3.5.2 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.1.tar.gz">0.0.1.1</a>.
+<a href="dnsfunnel-0.0.1.2.tar.gz">0.0.1.2</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 025345e..a71ecbe 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.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> dependency bumped to
+2.11.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> dependency bumped to
+2.3.5.2. </li>
+</ul>
+
 <h2> in 0.0.1.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 7ebc055..ac50d7b 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=dnsfunnel
-version=0.0.1.1
+version=0.0.1.2
 category=web
 package_macro_name=DNSFUNNEL
diff --git a/src/dnsfunnel/dnsfunneld.c b/src/dnsfunnel/dnsfunneld.c
index 8c909a0..1eda1d3 100644
--- a/src/dnsfunnel/dnsfunneld.c
+++ b/src/dnsfunnel/dnsfunneld.c
@@ -229,7 +229,7 @@ int main (int argc, char const *const *argv)
     if (fd_move(0, fd) < 0)
       strerr_diefu1sys(111, "move file descriptors") ;
     if (ndelay_on(0) < 0) strerr_diefu1sys(111, "turn stdin non-blocking") ;
-    if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+    if (!sig_altignore(SIGPIPE)) strerr_diefu1sys(111, "ignore SIGPIPE") ;
     if (!random_init()) strerr_diefu1sys(111, "s6dns_init") ;
 
     if (root[0])
-- 
cgit 1.4.1