Adapt to skalibs-2.7.0.0, prepare for 2.3.0.3

8 files changed, 37 insertions, 24 deletions

diff --git a/COPYING b/COPYING
index cc344f1..1629e84 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2018 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 c301344..1532b47 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,12 +6,12 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.6.0.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.3.0.2 or later: http://skarnet.org/software/execline/
-  - s6 version 2.6.1.0 or later: http://skarnet.org/software/s6/
-  - s6-dns version 2.2.0.1 or later: http://skarnet.org/software/s6-dns/
+  - skalibs version 2.7.0.0 or later: http://skarnet.org/software/skalibs/
+  - execline version 2.5.0.0 or later: http://skarnet.org/software/execline/
+  - s6 version 2.7.2.0 or later: http://skarnet.org/software/s6/
+  - s6-dns version 2.3.0.1 or later: http://skarnet.org/software/s6-dns/
   - Depending on whether you build the SSL tools,
-        libressl version 2.4.5 or later: http://libressl.org/
+        libressl version 2.7.4 or later: http://libressl.org/
      or bearssl version 0.5 or later: http://bearssl.org/
     (BearSSL support is experimental for now, I encourage you to use it
     but be aware it's bleeding-edge and APIs may change.)
diff --git a/NEWS b/NEWS
index 519b6f6..8b78408 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-networking.
 
+In 2.3.0.3
+----------
+
+ - Compatibility with skalibs-2.7.0.0.
+
+
 In 2.3.0.2
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index ed0fbad..c5b8150 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -44,20 +44,20 @@ compiled with IPv6 support, s6-networking is IPv6-ready.
  <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.6.0.0 or later. It's a build-time requirement. It's also a run-time
+2.7.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/execline/">execline</a> version
-2.3.0.2 or later. It's a build-time and run-time requirement. </li>
+2.5.0.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.6.1.0 or later. It's a build-time and run-time requirement. </li>
+2.7.2.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
-2.2.0.1 or later. It's a build-time requirement. It's also a run-time
+2.3.0.1 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the s6-dns
 libraries. </li>
  <li> If you want to build the secure communication tools:
   <ul>
-   <li> Either <a href="http://libressl.org/">LibreSSL</a> version 2.4.5
+   <li> Either <a href="http://libressl.org/">LibreSSL</a> version 2.7.4
 or later </li>
    <li> Or <a href="http://bearssl.org/">BearSSL</a> version 0.5
 or later. <strong>This is a beta version.</strong> </li>
@@ -76,7 +76,7 @@ run-time requirement if you link against its shared version. </li>
 
 <ul>
  <li> The current released version of s6-networking is
-<a href="s6-networking-2.3.0.2.tar.gz">2.3.0.2</a>. </li>
+<a href="s6-networking-2.3.0.3.tar.gz">2.3.0.3</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-networking/">s6-networking
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 2023470..cf3516e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,16 @@
 
 <h1> What has changed in s6-networking </h1>
 
+<h2> in 2.3.0.3 </h2>
+
+<ul>
+ <li> LibreSSL dependency bumped to 2.7.4. </li>
+ <li> skalibs dependency bumped to 2.7.0.0. </li>
+ <li> execline dependency bumped to 2.5.0.0. </li>
+ <li> s6 dependency bumped to 2.7.2.0. </li>
+ <li> s6-dns dependency bumped to 2.3.0.1. </li>
+</ul>
+
 <h2> in 2.3.0.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 14e206b..a533732 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-networking
-version=2.3.0.2
+version=2.3.0.3
 category=net
 package_macro_name=S6_NETWORKING
diff --git a/src/minidentd/minidentd.c b/src/minidentd/minidentd.c
index 6d0f6a0..67ce7eb 100644
--- a/src/minidentd/minidentd.c
+++ b/src/minidentd/minidentd.c
@@ -12,6 +12,7 @@
 #include <skalibs/buffer.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/stralloc.h>
+#include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/tai.h>
diff --git a/src/sbearssl/sbearssl_ta_readdir.c b/src/sbearssl/sbearssl_ta_readdir.c
index 829d7a6..4093bcf 100644
--- a/src/sbearssl/sbearssl_ta_readdir.c
+++ b/src/sbearssl/sbearssl_ta_readdir.c
@@ -48,16 +48,12 @@ int sbearssl_ta_readdir (char const *dirfn, genalloc *taga, stralloc *tasa)
   return 0 ;
 
  fail:
-  {
-    int e = errno ;
-    dir_close(dir) ;
-    genalloc_free(sbearssl_cert, &certga) ;
-    stralloc_free(&certsa) ;
-    if (tagawasnull) genalloc_free(sbearssl_ta, taga) ;
-    else genalloc_setlen(sbearssl_ta, taga, tagabase) ;
-    if (tasawasnull) stralloc_free(tasa) ;
-    else tasa->len = tasabase ;
-    errno = e ;
-  }
+  dir_close(dir) ;
+  genalloc_free(sbearssl_cert, &certga) ;
+  stralloc_free(&certsa) ;
+  if (tagawasnull) genalloc_free(sbearssl_ta, taga) ;
+  else genalloc_setlen(sbearssl_ta, taga, tagabase) ;
+  if (tasawasnull) stralloc_free(tasa) ;
+  else tasa->len = tasabase ;
   return -1 ;
 }