summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL10
-rw-r--r--NEWS6
-rw-r--r--doc/index.html12
-rw-r--r--doc/upgrade.html15
-rw-r--r--package/info2
-rw-r--r--src/init/s6-linux-init-maker.c2
-rw-r--r--src/init/s6-linux-init-telinit.c2
-rw-r--r--src/init/s6-linux-init.c2
-rw-r--r--src/misc/s6-linux-init-echo.c2
-rw-r--r--src/misc/s6-linux-init-logouthookd.c2
-rw-r--r--src/misc/s6-linux-init-umountall.c2
-rw-r--r--src/shutdown/hpr_confirm_hostname.c2
-rw-r--r--src/shutdown/hpr_wallv.c2
-rw-r--r--src/shutdown/s6-linux-init-hpr.c2
-rw-r--r--src/shutdown/s6-linux-init-shutdown.c3
-rw-r--r--src/shutdown/s6-linux-init-shutdownd.c2
16 files changed, 45 insertions, 23 deletions
diff --git a/INSTALL b/INSTALL
index 3e8f8b0..02b019a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,11 +6,11 @@ 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/
- - Optional: nsss version 0.2.0.1 or later: https://skarnet.org/software/nsss/
- - Optional: utmps version 0.1.2.0 or later: https://skarnet.org/software/utmps/
- - execline version 2.9.0.0 or later: https://skarnet.org/software/execline/
- - s6 version 2.11.1.1 or later: https://skarnet.org/software/s6/
+ - skalibs version 2.13.0.0 or later: https://skarnet.org/software/skalibs/
+ - Optional: nsss version 0.2.0.2 or later: https://skarnet.org/software/nsss/
+ - Optional: utmps version 0.1.2.1 or later: https://skarnet.org/software/utmps/
+ - 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/
This software is Linux-specific. It will run on a Linux kernel,
version 2.6.32 or later. However, it should not be too hard to port to
diff --git a/NEWS b/NEWS
index 3f1061d..a322c73 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
Changelog for s6-linux-init.
+In 1.0.8.1
+----------
+
+ - Adaptation to skalibs-2.13.0.0.
+
+
In 1.0.8.0
----------
diff --git a/doc/index.html b/doc/index.html
index 59a5d79..8f21376 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -73,16 +73,16 @@ kernel command line </li>
<li> A Linux-based 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.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 (for <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>)
as well as a boot-time requirement (i.e. a run-time requirement for the
programs used when you boot a system created with
<a href="s6-linux-init-maker.html">s6-linux-init-maker</a>) if you link
against the shared version of the skalibs library. </li>
<li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.0.0 or later. It is a build-time and boot-time requirement. </li>
+2.9.0.2 or later. It is a build-time and boot-time requirement. </li>
<li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.11.1.1 or later. It is a build-time and boot-time requirement. </li>
+2.11.2.0 or later. It is a build-time and boot-time requirement. </li>
</ul>
<p>
@@ -93,10 +93,10 @@ against the shared version of the skalibs library. </li>
<li> If you're using <a href="https://www.musl-libc.org/">musl</a> and
want nsswitch-like functionality:
<a href="//skarnet.org/software/nsss/">nsss</a> version
-0.2.0.1 or later (build-time and boot-time) </li>
+0.2.0.2 or later (build-time and boot-time) </li>
<li> If you want secure utmp functionality:
<a href="//skarnet.org/software/utmps/">utmps</a> version
-0.1.2.0 or later (build-time and boot-time) </li>
+0.1.2.1 or later (build-time and boot-time) </li>
</ul>
<h3> Licensing </h3>
@@ -110,7 +110,7 @@ want nsswitch-like functionality:
<ul>
<li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.8.0.tar.gz">1.0.8.0</a>. </li>
+<a href="s6-linux-init-1.0.8.1.tar.gz">1.0.8.1</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init
git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index ca5b373..04004ec 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,21 @@
<h1> What has changed in s6-linux-init </h1>
+<h2> in 1.0.8.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.0.0. </li>
+ <li> <a href="//skarnet.org/software/nsss/">nsss</a>
+optional dependency bumped to 0.2.0.2. </li>
+ <li> <a href="//skarnet.org/software/utmps/">utmps</a>
+optional dependency bumped to 0.1.2.1. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+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>
+</ul>
+
<h2> in 1.0.8.0 </h2>
<ul>
diff --git a/package/info b/package/info
index eedab62..5d72cd6 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-linux-init
-version=1.0.8.0
+version=1.0.8.1
category=admin
package_macro_name=S6_LINUX_INIT
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 840695f..6f01d1e 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -11,7 +11,7 @@
#include <skalibs/bytestr.h>
#include <skalibs/allreadwrite.h>
#include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/env.h>
#include <skalibs/stralloc.h>
#include <skalibs/djbunix.h>
diff --git a/src/init/s6-linux-init-telinit.c b/src/init/s6-linux-init-telinit.c
index ef99e5f..1ad3f44 100644
--- a/src/init/s6-linux-init-telinit.c
+++ b/src/init/s6-linux-init-telinit.c
@@ -5,7 +5,7 @@
#include <skalibs/types.h>
#include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/djbunix.h>
#include <skalibs/exec.h>
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index d9585d6..699b89f 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -17,7 +17,7 @@
#include <skalibs/types.h>
#include <skalibs/allreadwrite.h>
#include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/stralloc.h>
#include <skalibs/sig.h>
#include <skalibs/env.h>
diff --git a/src/misc/s6-linux-init-echo.c b/src/misc/s6-linux-init-echo.c
index a59eae7..54fabc6 100644
--- a/src/misc/s6-linux-init-echo.c
+++ b/src/misc/s6-linux-init-echo.c
@@ -2,7 +2,7 @@
#include <skalibs/sgetopt.h>
#include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#define USAGE "s6-linux-init-echo [ -n ] [ -s sep ] args..."
diff --git a/src/misc/s6-linux-init-logouthookd.c b/src/misc/s6-linux-init-logouthookd.c
index cc542ba..1dfecee 100644
--- a/src/misc/s6-linux-init-logouthookd.c
+++ b/src/misc/s6-linux-init-logouthookd.c
@@ -16,7 +16,7 @@
#include <utmpx.h>
#include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#ifndef UT_NAMESIZE
#define UT_NAMESIZE 32
diff --git a/src/misc/s6-linux-init-umountall.c b/src/misc/s6-linux-init-umountall.c
index 42fae15..d4320ad 100644
--- a/src/misc/s6-linux-init-umountall.c
+++ b/src/misc/s6-linux-init-umountall.c
@@ -6,7 +6,7 @@
#include <mntent.h>
#include <sys/mount.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/stralloc.h>
#include <skalibs/skamisc.h>
diff --git a/src/shutdown/hpr_confirm_hostname.c b/src/shutdown/hpr_confirm_hostname.c
index 040c2f6..3cb1d29 100644
--- a/src/shutdown/hpr_confirm_hostname.c
+++ b/src/shutdown/hpr_confirm_hostname.c
@@ -9,7 +9,7 @@
#include <skalibs/allreadwrite.h>
#include <skalibs/bytestr.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include "hpr.h"
diff --git a/src/shutdown/hpr_wallv.c b/src/shutdown/hpr_wallv.c
index 50523c5..083fa7f 100644
--- a/src/shutdown/hpr_wallv.c
+++ b/src/shutdown/hpr_wallv.c
@@ -5,7 +5,7 @@
#include <utmpx.h>
#include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/djbunix.h>
#include <skalibs/posixishard.h>
diff --git a/src/shutdown/s6-linux-init-hpr.c b/src/shutdown/s6-linux-init-hpr.c
index 7f3d457..d4fc6e8 100644
--- a/src/shutdown/s6-linux-init-hpr.c
+++ b/src/shutdown/s6-linux-init-hpr.c
@@ -8,7 +8,7 @@
#include <utmpx.h>
#include <sys/reboot.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/sgetopt.h>
#include <skalibs/sig.h>
#include <skalibs/tai.h>
diff --git a/src/shutdown/s6-linux-init-shutdown.c b/src/shutdown/s6-linux-init-shutdown.c
index 011abef..bc30f0c 100644
--- a/src/shutdown/s6-linux-init-shutdown.c
+++ b/src/shutdown/s6-linux-init-shutdown.c
@@ -14,7 +14,7 @@
#include <skalibs/uint64.h>
#include <skalibs/types.h>
#include <skalibs/allreadwrite.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/sgetopt.h>
#include <skalibs/sig.h>
#include <skalibs/tai.h>
@@ -181,6 +181,7 @@ static inline void access_control (void)
fmt[uint32_fmt(fmt, AC_BUFSIZE - 1)] = 0 ;
strerr_dief4x(1, AC_FILE, " is too big: it needs to be ", fmt, " bytes or less") ;
}
+ errno = EPIPE ;
if (allread(fd, buf, st.st_size) < st.st_size)
strerr_diefu2sys(111, "read ", AC_FILE) ;
fd_close(fd) ;
diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c
index ed02721..9b019e5 100644
--- a/src/shutdown/s6-linux-init-shutdownd.c
+++ b/src/shutdown/s6-linux-init-shutdownd.c
@@ -16,7 +16,7 @@
#include <skalibs/allreadwrite.h>
#include <skalibs/bytestr.h>
#include <skalibs/buffer.h>
-#include <skalibs/strerr2.h>
+#include <skalibs/strerr.h>
#include <skalibs/sgetopt.h>
#include <skalibs/sig.h>
#include <skalibs/tai.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 17:28:06 +0000