From 2766be60c5a7d5b3be7513b609d2ae3f2d0c0883 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 29 Nov 2022 12:59:58 +0000
Subject:  Prepare for 2.6.0.1

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                       | 2 +-
 NEWS                          | 6 ++++++
 doc/index.html                | 4 ++--
 doc/upgrade.html              | 7 +++++++
 package/info                  | 2 +-
 src/minutils/rngseed.c        | 2 +-
 src/minutils/s6-chroot.c      | 2 +-
 src/minutils/s6-freeramdisk.c | 2 +-
 src/minutils/s6-hostname.c    | 2 +-
 src/minutils/s6-logwatch.c    | 2 +-
 src/minutils/s6-mount.c       | 2 +-
 src/minutils/s6-pivotchroot.c | 2 +-
 src/minutils/s6-ps.c          | 2 +-
 src/minutils/s6-swapoff.c     | 2 +-
 src/minutils/s6-swapon.c      | 2 +-
 src/minutils/s6-umount.c      | 2 +-
 src/minutils/s6ps_pfield.c    | 2 +-
 17 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/INSTALL b/INSTALL
index 59a3c82..daebb64 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 3.5 or later.
diff --git a/NEWS b/NEWS
index 1885d6c..388fca8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-utils.
 
+In 2.6.0.1
+----------
+
+ - Adaptation to skalibs-2.13.0.0.
+
+
 In 2.6.0.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index d8077c2..d614bcb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -47,7 +47,7 @@ on the wrong page. I apologize for the confusion.
 The Linux kernel must be 3.5 or later. </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.12.0.0 or later. It's a build-time requirement. It's also a run-time
+2.13.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>
 </ul>
@@ -63,7 +63,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.6.0.0.tar.gz">2.6.0.0</a>. </li>
+<a href="s6-linux-utils-2.6.0.1.tar.gz">2.6.0.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index bc39329..542ba53 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.6.0.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.0.0. </li>
+</ul>
+
 <h2> in 2.6.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index b6f6275..8a577f8 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.6.0.0
+version=2.6.0.1
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c
index f00c4fc..bc16bbb 100644
--- a/src/minutils/rngseed.c
+++ b/src/minutils/rngseed.c
@@ -18,7 +18,7 @@
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/error.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/tai.h>
diff --git a/src/minutils/s6-chroot.c b/src/minutils/s6-chroot.c
index 036c20f..ae1fb7b 100644
--- a/src/minutils/s6-chroot.c
+++ b/src/minutils/s6-chroot.c
@@ -3,7 +3,7 @@
 #include <skalibs/nonposix.h>
 #include <unistd.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "s6-chroot dir prog..."
diff --git a/src/minutils/s6-freeramdisk.c b/src/minutils/s6-freeramdisk.c
index 3b24656..adfb07c 100644
--- a/src/minutils/s6-freeramdisk.c
+++ b/src/minutils/s6-freeramdisk.c
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-freeramdisk ramdisk_device"
 
diff --git a/src/minutils/s6-hostname.c b/src/minutils/s6-hostname.c
index 9d71cbe..d673e81 100644
--- a/src/minutils/s6-hostname.c
+++ b/src/minutils/s6-hostname.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 
diff --git a/src/minutils/s6-logwatch.c b/src/minutils/s6-logwatch.c
index a8675e1..e815f81 100644
--- a/src/minutils/s6-logwatch.c
+++ b/src/minutils/s6-logwatch.c
@@ -10,7 +10,7 @@
 #include <skalibs/types.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/error.h>
 #include <skalibs/buffer.h>
 #include <skalibs/sig.h>
diff --git a/src/minutils/s6-mount.c b/src/minutils/s6-mount.c
index 4dd9ed5..06064e4 100644
--- a/src/minutils/s6-mount.c
+++ b/src/minutils/s6-mount.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include "mount-constants.h"
diff --git a/src/minutils/s6-pivotchroot.c b/src/minutils/s6-pivotchroot.c
index 42a248b..b35a00b 100644
--- a/src/minutils/s6-pivotchroot.c
+++ b/src/minutils/s6-pivotchroot.c
@@ -3,7 +3,7 @@
 #include <skalibs/nonposix.h>
 #include <unistd.h>
 
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/exec.h>
 
 #define USAGE "s6-pivotchroot old-place-for-new-root new-place-for-old-root prog..."
diff --git a/src/minutils/s6-ps.c b/src/minutils/s6-ps.c
index 39d7211..3363f24 100644
--- a/src/minutils/s6-ps.c
+++ b/src/minutils/s6-ps.c
@@ -18,7 +18,7 @@
 #include <skalibs/buffer.h>
 #include <skalibs/diuint.h>
 #include <skalibs/tai.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/direntry.h>
diff --git a/src/minutils/s6-swapoff.c b/src/minutils/s6-swapoff.c
index b6ba40b..00df142 100644
--- a/src/minutils/s6-swapoff.c
+++ b/src/minutils/s6-swapoff.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
diff --git a/src/minutils/s6-swapon.c b/src/minutils/s6-swapon.c
index 9a1b208..41aabef 100644
--- a/src/minutils/s6-swapon.c
+++ b/src/minutils/s6-swapon.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <mntent.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 
 #define USAGE "s6-swapon device <or> s6-swapon -a"
 
diff --git a/src/minutils/s6-umount.c b/src/minutils/s6-umount.c
index eee2910..3ac1091 100644
--- a/src/minutils/s6-umount.c
+++ b/src/minutils/s6-umount.c
@@ -4,7 +4,7 @@
 #include <sys/mount.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/skamisc.h>
diff --git a/src/minutils/s6ps_pfield.c b/src/minutils/s6ps_pfield.c
index f527d25..0280186 100644
--- a/src/minutils/s6ps_pfield.c
+++ b/src/minutils/s6ps_pfield.c
@@ -7,7 +7,7 @@
 #include <sys/sysinfo.h>
 #include <skalibs/uint64.h>
 #include <skalibs/types.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbtime.h>
 #include <skalibs/stralloc.h>
-- 
cgit v1.3.1