From 8add2dbec0842d5b051b4dba5536fba9d82ce6bc Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 9 Apr 2022 15:19:23 +0000
Subject:  Prepare for 2.5.1.8; adapt to skalibs-2.12.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 COPYING                           | 2 +-
 INSTALL                           | 2 +-
 NEWS                              | 6 ++++++
 doc/index.html                    | 4 ++--
 doc/upgrade.html                  | 7 +++++++
 package/info                      | 2 +-
 src/minutils/s6-fillurandompool.c | 6 +-----
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/COPYING b/COPYING
index 9e95f25..0dfd4b1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2021 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2022 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 2580603..59a3c82 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.11.1.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.12.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 b4cc2af..d418b3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-utils.
 
+In 2.5.1.8
+----------
+
+ - Adaptation to skalibs-2.12.0.0.
+
+
 In 2.5.1.7
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 422797f..733a1c7 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.11.1.0 or later. It's a build-time requirement. It's also a run-time
+2.12.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.5.1.7.tar.gz">2.5.1.7</a>. </li>
+<a href="s6-linux-utils-2.5.1.8.tar.gz">2.5.1.8</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 5a68052..e8e658e 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.5.1.8 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.12.0.0. </li>
+</ul>
+
 <h2> in 2.5.1.7 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index afa53b7..bcfa0a7 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.5.1.7
+version=2.5.1.8
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/s6-fillurandompool.c b/src/minutils/s6-fillurandompool.c
index 6421659..c96437c 100644
--- a/src/minutils/s6-fillurandompool.c
+++ b/src/minutils/s6-fillurandompool.c
@@ -1,14 +1,10 @@
 /* ISC license. */
 
-#include <skalibs/strerr2.h>
 #include <skalibs/random.h>
 
 int main (void)
 {
   char c ;
-  PROG = "s6-fillurandompool" ;
-  if (!random_init())
-    strerr_diefu1sys(111, "initialize random generator") ;
-  random_string(&c, 1) ;
+  random_buf(&c, 1) ;
   return 0 ;
 }
-- 
cgit 1.4.1