From f59b79de8c8f49ffd5133b2a37e11a52edc2bdbd Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 23 Dec 2019 14:04:45 +0000
Subject:  Prepare for 2.9.1.0

---
 INSTALL          |  3 ++-
 NEWS             |  9 +++++++++
 doc/index.html   |  2 +-
 doc/upgrade.html | 12 ++++++++++++
 package/info     |  2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 0f79728..e6725b8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
   - skalibs version 2.9.1.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.5.3.0 or later: http://skarnet.org/software/execline/
+  - Optional: execline version 2.5.3.0 or later: http://skarnet.org/software/execline/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
@@ -39,6 +39,7 @@ off them.
 
  You can customize paths via flags given to configure.
  See ./configure --help for a list of all available configure options.
+ The execline dependency can be removed with --disable-execline.
 
 
 * Environment variables
diff --git a/NEWS b/NEWS
index 7b1d933..10e4176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 Changelog for s6.
 
+In 2.9.1.0
+----------
+
+ - Bugfixes.
+ - execline support is now optional. Some functionality is not available
+when execline support is disabled.
+ - New '?' directive to s6-log, to spawn a processor with /bin/sh.
+
+
 In 2.9.0.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 341a936..5bbc481 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -103,7 +103,7 @@ certain binaries that spawn scripts interpreted with
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.9.0.1.tar.gz">2.9.0.1</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.9.1.0.tar.gz">2.9.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index ecbccec..d3ce8ef 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,18 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.9.1.0 </h2>
+
+<ul>
+ <li> The <a href="//skarnet.org/software/execline/">execline</a>
+dependency is now optional, and can be disabled via the <tt>--disable-execline</tt>
+option to configure. Functionality that depends on execline in s6 binaries is
+disabled when execline support is disabled. </li>
+ <li> A new '?' directive has been added to <a href="s6-log.html">s6-log</a>,
+it declares a processor command line that is spawned with the <tt>/bin/sh</tt>
+interpreter. </li>
+</ul>
+
 <h2> in 2.9.0.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 1dc87cb..89d6b16 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.9.0.1
+version=2.9.1.0
 category=admin
 package_macro_name=S6
-- 
cgit v1.3.1