From ef503140d2ce2138b414822e53e3686ba4b21162 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 21 Jul 2018 11:29:25 +0000 Subject: Adapt to skalibs-2.7.0.0, prepare for 2.3.0.3 --- COPYING | 2 +- INSTALL | 10 +++++----- NEWS | 6 ++++++ doc/index.html | 12 ++++++------ doc/upgrade.html | 10 ++++++++++ package/info | 2 +- src/minidentd/minidentd.c | 1 + src/sbearssl/sbearssl_ta_readdir.c | 18 +++++++----------- 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 +Copyright (c) 2011-2018 Laurent Bercot 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.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs 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.
  • execline version -2.3.0.2 or later. It's a build-time and run-time requirement.
    • +2.5.0.0 or later. It's a build-time and run-time requirement.
  • s6 version -2.6.1.0 or later. It's a build-time and run-time requirement.
    • +2.7.2.0 or later. It's a build-time and run-time requirement.
  • s6-dns 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.
  • If you want to build the secure communication tools:
      -
    • Either LibreSSL version 2.4.5 +
    • Either LibreSSL version 2.7.4 or later
    • Or BearSSL version 0.5 or later. This is a beta version.
      • @@ -76,7 +76,7 @@ run-time requirement if you link against its shared version.
      • The current released version of s6-networking is -2.3.0.2.
        • +2.3.0.3.
      • Alternatively, you can checkout a copy of the s6-networking git repository: 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 @@

        What has changed in s6-networking

        +

        in 2.3.0.3

        + +
          +
        • LibreSSL dependency bumped to 2.7.4.
          • +
        • skalibs dependency bumped to 2.7.0.0.
          • +
        • execline dependency bumped to 2.5.0.0.
          • +
        • s6 dependency bumped to 2.7.2.0.
          • +
        • s6-dns dependency bumped to 2.3.0.1.
          • +
        +

        in 2.3.0.2

          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 #include #include +#include #include #include #include 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 ; } -- cgit v1.3.1