From 478dd24279f833042a94590df0726d163b576af5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 5 Oct 2015 02:04:55 +0000
Subject:  - minor bugfix in s6-log (correct return when stat() fails)  -
 remove fucking -Bsymbolic  - add s6-setsid to stage 1 example  - prepare
 shutdown functionality for s6-svscan  - version: 2.2.1.1

---
 INSTALL                               | 4 ++--
 configure                             | 1 -
 doc/index.html                        | 8 +++++---
 doc/upgrade.html                      | 7 +++++++
 examples/ROOT/etc/s6-init/init-stage1 | 1 +
 package/info                          | 2 +-
 src/daemontools-extras/s6-log.c       | 2 +-
 src/supervision/s6-svscan.c           | 1 +
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index 96cbb33..3ad879c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.3.7.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.1.4.0 or later: http://skarnet.org/software/execline/
+  - skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/
+  - execline version 2.1.4.1 or later: http://skarnet.org/software/execline/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/configure b/configure
index b1590fa..3ddb7e5 100755
--- a/configure
+++ b/configure
@@ -304,7 +304,6 @@ fi
 
 if $shared ; then
   tryldflag LDFLAGS_AUTO -Wl,--hash-style=both
-  tryldflag LDFLAGS_SHARED -Wl,-Bsymbolic
 fi
 
 LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}"
diff --git a/doc/index.html b/doc/index.html
index b458c92..50018e7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,11 +84,11 @@ with s6</a> </li>
  <li> GNU make, version 4.0 or later. Please be aware that s6 will not build
 with an earlier version. </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.7.0 or later. It's a build-time requirement. It's also a run-time
+2.3.7.1 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>
  <li> <a href="http://skarnet.org/software/execline/">execline</a> version
-2.1.4.0 or later. It's a build-time and run-time requirement. </li>
+2.1.4.1 or later. It's a build-time and run-time requirement. </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -101,7 +101,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.2.1.0.tar.gz">2.2.1.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.2.1.1.tar.gz">2.2.1.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6 git repository:
 <pre> git clone git://git.skarnet.org/s6 </pre> </li>
  <li> There's also a
@@ -321,6 +321,8 @@ service manager for s6. </li>
 <ul>
  <li> <tt>s6</tt> is discussed on the
 <a href="http://skarnet.org/lists.html#supervision">supervision</a> mailing-list. </li>
+ <li> There is a <tt>#s6</tt> IRC channel on Freenode. Sometimes people are there
+and answer questions. </li>
 </ul>
 
 <h3> Similar work </h3>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d9d8cdd..a68b1a7 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.2.1.1 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.3.7.1. </li>
+ <li> execline dependency bumped to 2.1.4.1. </li>
+</ul>
+
 <h2> in 2.2.1.0 </h2>
 
 <ul>
diff --git a/examples/ROOT/etc/s6-init/init-stage1 b/examples/ROOT/etc/s6-init/init-stage1
index dd6eb70..a06b015 100755
--- a/examples/ROOT/etc/s6-init/init-stage1
+++ b/examples/ROOT/etc/s6-init/init-stage1
@@ -5,6 +5,7 @@
 # Edit it to suit your needs.
 
 # Make sure everything is sane and ignore input
+s6-setsid -qb
 cd /
 umask 022
 fdclose 0
diff --git a/package/info b/package/info
index ce5b5e9..3f4a486 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.2.1.0
+version=2.2.1.1
 category=admin
 package_macro_name=S6
diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index 6d323b7..4c761d0 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -287,7 +287,7 @@ static int finish (logdir_t *ldp, char const *name, char suffix)
   byte_copy(x, dirlen, ldp->dir) ;
   x[dirlen] = '/' ;
   byte_copy(x + dirlen + 1, namelen + 1, name) ;
-  if (stat(x, &st) < 0) return errno == ENOENT ;
+  if (stat(x, &st) < 0) return errno == ENOENT ? 0 : -1 ;
   if (st.st_nlink == 1)
   {
     char y[dirlen + 29] ;
diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c
index c66b18f..8153186 100644
--- a/src/supervision/s6-svscan.c
+++ b/src/supervision/s6-svscan.c
@@ -23,6 +23,7 @@
 
 #define USAGE "s6-svscan [ -c maxservices ] [ -t timeout ] [ dir ]"
 
+#define SHUTDOWN_PROG S6_SVSCAN_CTLDIR "/shutdown"
 #define FINISH_PROG S6_SVSCAN_CTLDIR "/finish"
 #define CRASH_PROG S6_SVSCAN_CTLDIR "/crash"
 
-- 
cgit v1.3.1