From 1626bf78dd47a42ce37e984025a434a666fc5bbf Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 15 Jun 2018 13:26:11 +0000
Subject:  Add support for max-death-tally and down-signal, prepare for 0.4.1.0

---
 INSTALL                                |  4 ++--
 NEWS                                   |  7 +++++++
 doc/index.html                         |  6 +++---
 doc/upgrade.html                       | 14 ++++++++++++--
 package/info                           |  2 +-
 src/libs6rc/s6rc_servicedir_internal.c |  4 +++-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index d1a3fd1..23cd8a6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,8 +7,8 @@ Build Instructions
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
   - skalibs version 2.6.4.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.3.0.4 or later: http://skarnet.org/software/execline/
-  - s6 version 2.7.1.0 or later: http://skarnet.org/software/s6/
+  - execline version 2.5.0.0 or later: http://skarnet.org/software/execline/
+  - s6 version 2.7.2.0 or later: http://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index 1185762..23c13d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for s6-rc.
 
+In 0.4.1.0
+----------
+
+ - Support for max-death-tally and down-signal files in a
+longrun definition directory
+
+
 In 0.4.0.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 58dc3e6..8fd943c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -50,9 +50,9 @@ scripts are also run in a controlled environment.
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
 2.6.4.0 or later </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.3.0.4 or later </li>
+2.5.0.0 or later </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.7.1.0 or later </li>
+2.7.2.0 or later </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -66,7 +66,7 @@ scripts are also run in a controlled environment.
 
 <ul>
  <li> The current released version of s6-rc is
-<a href="s6-rc-0.4.0.1.tar.gz">0.4.0.1</a>. </li>
+<a href="s6-rc-0.4.1.0.tar.gz">0.4.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/">s6-rc
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 6119949..92fd2fa 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,18 @@ minor and bugfix version changes.
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.4.1.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.5.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.7.2.0. </li>
+ <li> The <tt>max-death-tally</tt> and <tt>down-signal</tt>
+files, used by recent versions of s6, are now supported by s6-rc in a
+longrun definition directory. </li>
+</ul>
+
 <h2> in 0.4.0.1 </h2>
 
 <ul>
@@ -42,8 +54,6 @@ dependency bumped to 2.7.1.0. </li>
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.6.3.0. </li>
- <li> <a href="//skarnet.org/software/execline/">execline</a>
-dependency bumped to 2.3.0.4. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a>
 dependency bumped to 2.6.2.0. </li>
  <li> <a href="s6-rc-compile.html">s6-rc-compile</a> now
diff --git a/package/info b/package/info
index 4673726..009ffbb 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.4.0.1
+version=0.4.1.0
 category=admin
 package_macro_name=S6RC
diff --git a/src/libs6rc/s6rc_servicedir_internal.c b/src/libs6rc/s6rc_servicedir_internal.c
index 1162093..b70061f 100644
--- a/src/libs6rc/s6rc_servicedir_internal.c
+++ b/src/libs6rc/s6rc_servicedir_internal.c
@@ -18,13 +18,15 @@ static s6rc_servicedir_desc_t const svdir_file_list[] =
   { .name = "notification-fd", .type = FILETYPE_UINT, .options = 0 },
   { .name = "timeout-kill", .type = FILETYPE_UINT, .options = 0 },
   { .name = "timeout-finish", .type = FILETYPE_UINT, .options = 0 },
+  { .name = "max-death-tally", .type = FILETYPE_UINT, .options = 0 },
+  { .name = "down-signal", .type = FILETYPE_NORMAL, .options = 0 },
   { .name = "data", .type = FILETYPE_DIR, .options = 0 },
   { .name = "env", .type = FILETYPE_DIR, .options = 0 },
   { .name = 0, .options = 0 }
 } ;
 
 s6rc_servicedir_desc_t const *s6rc_servicedir_file_list = svdir_file_list ;
-size_t const s6rc_servicedir_file_maxlen = 15 ;
+size_t const s6rc_servicedir_file_maxlen = 16 ;
 
 int s6rc_servicedir_copy_one (char const *src, char const *dst, s6rc_servicedir_desc_t const *p)
 {
-- 
cgit v1.2.3