From 4d47d83042e0844da2fcfff9bd73de60124e7902 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 3 Nov 2020 23:10:56 +0000
Subject:  Prepare for 1.0.5.0

---
 INSTALL          |  4 ++--
 NEWS             |  7 +++++++
 doc/index.html   |  6 +++---
 doc/upgrade.html | 13 +++++++++++++
 package/info     |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5cfe1fa..f65e0a8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.9.2.1 or later: https://skarnet.org/software/skalibs/
-  - execline version 2.6.1.0 or later: https://skarnet.org/software/execline/
+  - skalibs version 2.9.3.0 or later: https://skarnet.org/software/skalibs/
+  - execline version 2.6.1.1 or later: https://skarnet.org/software/execline/
   - s6 version 2.9.2.0 or later: https://skarnet.org/software/s6/
   - Optional: nsss version 0.0.2.2 or later: https://skarnet.org/software/nsss/
   - Optional: utmps version 0.0.3.2 or later: https://skarnet.org/software/utmps/
diff --git a/NEWS b/NEWS
index b4e6161..90aeab9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for s6-linux-init.
 
+In 1.0.5.0
+----------
+
+ - New -i option to s6-l-i-shutdown and s6-l-i-hpr, that requires
+manual confirmation before shutting down a machine.
+
+
 In 1.0.4.2
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 6418a49..74c23a9 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -72,14 +72,14 @@ 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.9.2.1 or later. It's a build-time requirement. It's also a run-time
+2.9.3.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.6.1.0 or later. It is a build-time and boot-time requirement. </li>
+2.6.1.1 or later. It is a build-time and boot-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
 2.9.2.0 or later. It is a build-time and boot-time requirement. </li>
 </ul>
@@ -115,7 +115,7 @@ all the other packages against the <em>static</em> version of libskarnet.
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.4.2.tar.gz">1.0.4.2</a>. </li>
+<a href="s6-linux-init-1.0.5.0.tar.gz">1.0.5.0</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 e4a0734..397ed86 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,19 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.0.5.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.9.3.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.6.1.1. </li>
+ <li> New <tt>-i</tt> option to
+<a href="s6-linux-init-hpr.html">s6-linux-init-hpr</a> and
+<a href="s6-linux-init-shutdown.html">s6-linux-init-shutdown</a> that
+requires manual confirmation before shutting down. </li>
+</ul>
+
 <h2> in 1.0.4.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 18c329a..ccfd089 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=1.0.4.2
+version=1.0.5.0
 category=admin
 package_macro_name=S6_LINUX_INIT
-- 
cgit v1.2.3