diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-11-29 13:19:02 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-11-29 13:19:02 +0000 |
| commit | 418a9deb23eca6fed25cc9feea476646a88a5184 (patch) | |
| tree | c6d7b012fc58395b9b8dfc060fed48bb038e155c | |
| parent | 219ac5bb023ec98d8069a3e5764f14a556d67c0d (diff) | |
| download | s6-networking-418a9deb23eca6fed25cc9feea476646a88a5184.tar.xz | |
Prepare for 2.5.1.2
Signed-off-by: Laurent Bercot <ska@appnovation.com>
39 files changed, 41 insertions, 40 deletions
@@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.12.0.2 or later: https://skarnet.org/software/skalibs/ - - Optional (but recommended): execline version 2.9.0.1 or later: https://skarnet.org/software/execline/ + - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/ + - Optional (but recommended): execline version 2.9.0.2 or later: https://skarnet.org/software/execline/ - s6 version 2.11.2.0 or later: https://skarnet.org/software/s6/ - s6-dns version 2.3.5.5 or later: https://skarnet.org/software/s6-dns/ - Depending on whether you build the SSL tools, @@ -4,6 +4,7 @@ In 2.5.1.2 ---------- - Bugfixes. + - Adaptation to skalibs-2.13.0.0. In 2.5.1.1 diff --git a/doc/upgrade.html b/doc/upgrade.html index 4d9db5d..4a4ce52 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -22,9 +22,9 @@ <ul> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> -dependency bumped to 2.12.0.2 </li> +dependency bumped to 2.13.0.0 </li> <li> <a href="//skarnet.org/software/execline/">execline</a> -optional dependency bumped to 2.9.0.1 </li> +optional dependency bumped to 2.9.0.2 </li> <li> <a href="//skarnet.org/software/s6/">s6</a> dependency bumped to 2.11.2.0 </li> <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> diff --git a/src/clock/s6-clockadd.c b/src/clock/s6-clockadd.c index b8a976f..477e611 100644 --- a/src/clock/s6-clockadd.c +++ b/src/clock/s6-clockadd.c @@ -5,7 +5,7 @@ #include <skalibs/sgetopt.h> #include <skalibs/types.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #define USAGE "s6-clockadd [ -f ] [ -e errmax ]" diff --git a/src/clock/s6-clockview.c b/src/clock/s6-clockview.c index e0ae08b..1482411 100644 --- a/src/clock/s6-clockview.c +++ b/src/clock/s6-clockview.c @@ -4,7 +4,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/djbtime.h> diff --git a/src/clock/s6-sntpclock.c b/src/clock/s6-sntpclock.c index bc4edfc..f577eb8 100644 --- a/src/clock/s6-sntpclock.c +++ b/src/clock/s6-sntpclock.c @@ -10,7 +10,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/djbtime.h> #include <skalibs/iopause.h> diff --git a/src/clock/s6-taiclock.c b/src/clock/s6-taiclock.c index 6701f9e..0fdcab7 100644 --- a/src/clock/s6-taiclock.c +++ b/src/clock/s6-taiclock.c @@ -9,7 +9,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/allreadwrite.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/djbtime.h> #include <skalibs/iopause.h> diff --git a/src/clock/s6-taiclockd.c b/src/clock/s6-taiclockd.c index 7b2a725..9a000cc 100644 --- a/src/clock/s6-taiclockd.c +++ b/src/clock/s6-taiclockd.c @@ -4,7 +4,7 @@ #include <stdint.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/socket.h> #include <skalibs/tai.h> diff --git a/src/conn-tools/s6-getservbyname.c b/src/conn-tools/s6-getservbyname.c index 0c60320..300a478 100644 --- a/src/conn-tools/s6-getservbyname.c +++ b/src/conn-tools/s6-getservbyname.c @@ -4,7 +4,7 @@ #include <netdb.h> #include <skalibs/types.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #define USAGE "s6-getservbyname service proto" diff --git a/src/conn-tools/s6-ident-client.c b/src/conn-tools/s6-ident-client.c index 8cb9ce1..4b74c14 100644 --- a/src/conn-tools/s6-ident-client.c +++ b/src/conn-tools/s6-ident-client.c @@ -4,7 +4,7 @@ #include <errno.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/buffer.h> #include <skalibs/tai.h> #include <skalibs/djbunix.h> diff --git a/src/conn-tools/s6-tcpclient.c b/src/conn-tools/s6-tcpclient.c index d567d54..ec31cf9 100644 --- a/src/conn-tools/s6-tcpclient.c +++ b/src/conn-tools/s6-tcpclient.c @@ -7,7 +7,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/fmtscan.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> #include <skalibs/tai.h> diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c index 6d4e044..5491ea0 100644 --- a/src/conn-tools/s6-tcpserver-access.c +++ b/src/conn-tools/s6-tcpserver-access.c @@ -8,7 +8,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/sgetopt.h> #include <skalibs/buffer.h> #include <skalibs/stralloc.h> diff --git a/src/conn-tools/s6-tcpserver.c b/src/conn-tools/s6-tcpserver.c index 077b5ad..435fe0d 100644 --- a/src/conn-tools/s6-tcpserver.c +++ b/src/conn-tools/s6-tcpserver.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/ip46.h> #include <skalibs/exec.h> diff --git a/src/conn-tools/s6-tcpserver4-socketbinder.c b/src/conn-tools/s6-tcpserver4-socketbinder.c index 69c5262..aadb3d9 100644 --- a/src/conn-tools/s6-tcpserver4-socketbinder.c +++ b/src/conn-tools/s6-tcpserver4-socketbinder.c @@ -9,7 +9,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/fmtscan.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/socket.h> #include <skalibs/exec.h> diff --git a/src/conn-tools/s6-tcpserver4.c b/src/conn-tools/s6-tcpserver4.c index 734435c..eb828a4 100644 --- a/src/conn-tools/s6-tcpserver4.c +++ b/src/conn-tools/s6-tcpserver4.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/conn-tools/s6-tcpserver4d.c b/src/conn-tools/s6-tcpserver4d.c index e8dbb3a..4c1edf2 100644 --- a/src/conn-tools/s6-tcpserver4d.c +++ b/src/conn-tools/s6-tcpserver4d.c @@ -13,7 +13,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/fmtscan.h> #include <skalibs/diuint32.h> #include <skalibs/env.h> diff --git a/src/conn-tools/s6-tcpserver6-socketbinder.c b/src/conn-tools/s6-tcpserver6-socketbinder.c index 6ce2c50..b1c7dba 100644 --- a/src/conn-tools/s6-tcpserver6-socketbinder.c +++ b/src/conn-tools/s6-tcpserver6-socketbinder.c @@ -9,7 +9,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> #include <skalibs/fmtscan.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/socket.h> #include <skalibs/exec.h> diff --git a/src/conn-tools/s6-tcpserver6.c b/src/conn-tools/s6-tcpserver6.c index b186ee5..491d7e0 100644 --- a/src/conn-tools/s6-tcpserver6.c +++ b/src/conn-tools/s6-tcpserver6.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/conn-tools/s6-tcpserver6d.c b/src/conn-tools/s6-tcpserver6d.c index 455b41c..b345d72 100644 --- a/src/conn-tools/s6-tcpserver6d.c +++ b/src/conn-tools/s6-tcpserver6d.c @@ -13,7 +13,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/fmtscan.h> #include <skalibs/env.h> #include <skalibs/djbunix.h> diff --git a/src/sbearssl/sbearssl_client_init_and_run.c b/src/sbearssl/sbearssl_client_init_and_run.c index ab9d12d..18ce86c 100644 --- a/src/sbearssl/sbearssl_client_init_and_run.c +++ b/src/sbearssl/sbearssl_client_init_and_run.c @@ -5,7 +5,7 @@ #include <bearssl.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> #include <skalibs/random.h> diff --git a/src/sbearssl/sbearssl_drop.c b/src/sbearssl/sbearssl_drop.c index 31e5f49..e331b89 100644 --- a/src/sbearssl/sbearssl_drop.c +++ b/src/sbearssl/sbearssl_drop.c @@ -3,7 +3,7 @@ #include <unistd.h> #include <stdlib.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/types.h> #include "sbearssl-internal.h" diff --git a/src/sbearssl/sbearssl_get_keycert.c b/src/sbearssl/sbearssl_get_keycert.c index 96e826c..b0cccab 100644 --- a/src/sbearssl/sbearssl_get_keycert.c +++ b/src/sbearssl/sbearssl_get_keycert.c @@ -2,7 +2,7 @@ #include <stdlib.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> diff --git a/src/sbearssl/sbearssl_get_tas.c b/src/sbearssl/sbearssl_get_tas.c index aa8f63b..71248d6 100644 --- a/src/sbearssl/sbearssl_get_tas.c +++ b/src/sbearssl/sbearssl_get_tas.c @@ -2,7 +2,7 @@ #include <stdlib.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c index cff1daa..a6204d4 100644 --- a/src/sbearssl/sbearssl_run.c +++ b/src/sbearssl/sbearssl_run.c @@ -7,7 +7,7 @@ #include <skalibs/allreadwrite.h> #include <skalibs/error.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c index 41d4d9e..d7817f0 100644 --- a/src/sbearssl/sbearssl_server_init_and_run.c +++ b/src/sbearssl/sbearssl_server_init_and_run.c @@ -7,7 +7,7 @@ #include <skalibs/posixplz.h> #include <skalibs/bytestr.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> #include <skalibs/random.h> diff --git a/src/stls/stls_client_init_and_handshake.c b/src/stls/stls_client_init_and_handshake.c index c8fc587..b65c833 100644 --- a/src/stls/stls_client_init_and_handshake.c +++ b/src/stls/stls_client_init_and_handshake.c @@ -4,7 +4,7 @@ #include <tls.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6-networking/stls.h> #include "stls-internal.h" diff --git a/src/stls/stls_drop.c b/src/stls/stls_drop.c index 7fc1bc5..c9855f0 100644 --- a/src/stls/stls_drop.c +++ b/src/stls/stls_drop.c @@ -3,7 +3,7 @@ #include <unistd.h> #include <stdlib.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/types.h> #include "stls-internal.h" diff --git a/src/stls/stls_handshake.c b/src/stls/stls_handshake.c index 5e965b1..77467e1 100644 --- a/src/stls/stls_handshake.c +++ b/src/stls/stls_handshake.c @@ -6,7 +6,7 @@ #include <tls.h> #include <skalibs/alarm.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include "stls-internal.h" diff --git a/src/stls/stls_run.c b/src/stls/stls_run.c index 559ebe9..960260b 100644 --- a/src/stls/stls_run.c +++ b/src/stls/stls_run.c @@ -8,7 +8,7 @@ #include <skalibs/error.h> #include <skalibs/buffer.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/iopause.h> #include <skalibs/djbunix.h> diff --git a/src/stls/stls_server_init_and_handshake.c b/src/stls/stls_server_init_and_handshake.c index 6830801..8098036 100644 --- a/src/stls/stls_server_init_and_handshake.c +++ b/src/stls/stls_server_init_and_handshake.c @@ -6,7 +6,7 @@ #include <skalibs/posixplz.h> #include <skalibs/bytestr.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <s6-networking/stls.h> #include "stls-internal.h" diff --git a/src/tls/s6-tlsc-io.c b/src/tls/s6-tlsc-io.c index 98e80e9..ebd1d9a 100644 --- a/src/tls/s6-tlsc-io.c +++ b/src/tls/s6-tlsc-io.c @@ -6,7 +6,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/sig.h> #include <skalibs/djbunix.h> diff --git a/src/tls/s6-tlsc.c b/src/tls/s6-tlsc.c index 97e0d79..2cca21c 100644 --- a/src/tls/s6-tlsc.c +++ b/src/tls/s6-tlsc.c @@ -7,7 +7,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/env.h> #include <skalibs/djbunix.h> diff --git a/src/tls/s6-tlsclient.c b/src/tls/s6-tlsclient.c index aadddfb..987e713 100644 --- a/src/tls/s6-tlsclient.c +++ b/src/tls/s6-tlsclient.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/ip46.h> #include <skalibs/exec.h> diff --git a/src/tls/s6-tlsd-io.c b/src/tls/s6-tlsd-io.c index d013606..d58a259 100644 --- a/src/tls/s6-tlsd-io.c +++ b/src/tls/s6-tlsd-io.c @@ -6,7 +6,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/tai.h> #include <skalibs/sig.h> #include <skalibs/djbunix.h> diff --git a/src/tls/s6-tlsd.c b/src/tls/s6-tlsd.c index b32bedd..49c38c1 100644 --- a/src/tls/s6-tlsd.c +++ b/src/tls/s6-tlsd.c @@ -6,7 +6,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/env.h> #include <skalibs/djbunix.h> diff --git a/src/tls/s6-tlsserver.c b/src/tls/s6-tlsserver.c index 2ee8a5c..e5215f4 100644 --- a/src/tls/s6-tlsserver.c +++ b/src/tls/s6-tlsserver.c @@ -5,7 +5,7 @@ #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/exec.h> #include <s6/config.h> diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c index 877ffa6..521bb4d 100644 --- a/src/tls/s6-ucspitlsc.c +++ b/src/tls/s6-ucspitlsc.c @@ -7,7 +7,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/socket.h> diff --git a/src/tls/s6-ucspitlsd.c b/src/tls/s6-ucspitlsd.c index 9318f31..37ec435 100644 --- a/src/tls/s6-ucspitlsd.c +++ b/src/tls/s6-ucspitlsd.c @@ -6,7 +6,7 @@ #include <skalibs/gccattributes.h> #include <skalibs/types.h> #include <skalibs/sgetopt.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include <skalibs/socket.h> diff --git a/src/tls/s6tls_sync_and_exec_app.c b/src/tls/s6tls_sync_and_exec_app.c index 4126ad6..dc16e9d 100644 --- a/src/tls/s6tls_sync_and_exec_app.c +++ b/src/tls/s6tls_sync_and_exec_app.c @@ -2,7 +2,7 @@ #include <unistd.h> -#include <skalibs/strerr2.h> +#include <skalibs/strerr.h> #include <skalibs/djbunix.h> #include "s6tls-internal.h" |