From 861bed98658c79a55bcfea8e7f9e706c4d610c8a Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 6 Jan 2015 00:40:11 +0000
Subject:  - bugfix in s6-ftrigrd and s6lockd, need to align with
 skalibs-2.1.0.0  - version increased to 2.0.0.1

---
 INSTALL                   | 2 +-
 doc/index.html            | 4 ++--
 doc/upgrade.html          | 6 ++++++
 package/info              | 2 +-
 src/libs6/deps-lib/s6     | 0
 src/libs6/ftrigr_start.c  | 2 +-
 src/libs6/ftrigr_startf.c | 2 +-
 src/libs6/s6-ftrigrd.c    | 4 ++--
 src/libs6/s6lock_start.c  | 2 +-
 src/libs6/s6lockd.c       | 4 ++--
 10 files changed, 17 insertions(+), 11 deletions(-)
 mode change 100755 => 100644 src/libs6/deps-lib/s6

diff --git a/INSTALL b/INSTALL
index 17c672b..eb61192 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.0.0.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.1.0.0 or later: http://skarnet.org/software/skalibs/
   - execline version 2.0.0.0 or later: http://skarnet.org/software/execline/
 
  This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index 6aab8e8..54e8925 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -52,7 +52,7 @@ supervision that might help you understand the basics.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 4.0 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.0.0.0 or later </li>
+2.1.0.0 or later </li>
  <li> <a href="http://skarnet.org/software/execline/">execline</a> version
 2.0.0.0 or later </li>
 </ul>
@@ -67,7 +67,7 @@ supervision that might help you understand the basics.
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.0.0.0.tar.gz">2.0.0.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.0.0.1.tar.gz">2.0.0.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>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 4d296f2..789d425 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -17,6 +17,12 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.0.0.1 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.1.0.0. </li>
+</ul>
+
 <h2> in 2.0.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 0686726..6211698 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.0.0.0
+version=2.0.0.1
 category=admin
 package_macro_name=S6
diff --git a/src/libs6/deps-lib/s6 b/src/libs6/deps-lib/s6
old mode 100755
new mode 100644
diff --git a/src/libs6/ftrigr_start.c b/src/libs6/ftrigr_start.c
index baf9ce5..4cf9e72 100644
--- a/src/libs6/ftrigr_start.c
+++ b/src/libs6/ftrigr_start.c
@@ -6,5 +6,5 @@
 
 int ftrigr_start (ftrigr_t *a, char const *path, tain_t const *deadline, tain_t *stamp)
 {
-  return skaclient_start_b(&a->connection, &a->buffers, path, FTRIGR_BANNER1, FTRIGR_BANNER1_LEN, FTRIGR_BANNER2, FTRIGR_BANNER2_LEN, deadline, stamp) ;
+  return skaclient_start_b(&a->connection, &a->buffers, path, 0, FTRIGR_BANNER1, FTRIGR_BANNER1_LEN, FTRIGR_BANNER2, FTRIGR_BANNER2_LEN, deadline, stamp) ;
 }
diff --git a/src/libs6/ftrigr_startf.c b/src/libs6/ftrigr_startf.c
index ee89634..47c310d 100644
--- a/src/libs6/ftrigr_startf.c
+++ b/src/libs6/ftrigr_startf.c
@@ -4,7 +4,7 @@
 #include <skalibs/skaclient.h>
 #include <s6/ftrigr.h>
 
-int ftrigr_startf (ftrigr_ref a, tain_t const *deadline, tain_t *stamp)
+int ftrigr_startf (ftrigr_t *a, tain_t const *deadline, tain_t *stamp)
 {
   static char const *const cargv[2] = { FTRIGRD_PROG, 0 } ;
   static char const *const cenvp[1] = { 0 } ;
diff --git a/src/libs6/s6-ftrigrd.c b/src/libs6/s6-ftrigrd.c
index f9b3201..7a32662 100644
--- a/src/libs6/s6-ftrigrd.c
+++ b/src/libs6/s6-ftrigrd.c
@@ -233,13 +233,13 @@ int main (void)
 
    /* client is reading */
     if (x[1].revents & IOPAUSE_WRITE)
-      if ((unixmessage_sender_flush(unixmessage_sender_1) < 0) && !error_isagain(errno))
+      if (!unixmessage_sender_flush(unixmessage_sender_1) && !error_isagain(errno))
       {
         cleanup() ;
         strerr_diefu1sys(111, "flush stdout") ;
       }
     if (x[2].revents & IOPAUSE_WRITE)
-      if ((!unixmessage_sender_flush(unixmessage_sender_x) < 0) && !error_isagain(errno))
+      if (!unixmessage_sender_flush(unixmessage_sender_x) && !error_isagain(errno))
       {
         cleanup() ;
         strerr_diefu1sys(111, "flush asyncout") ;
diff --git a/src/libs6/s6lock_start.c b/src/libs6/s6lock_start.c
index e7993d9..3f60b6f 100644
--- a/src/libs6/s6lock_start.c
+++ b/src/libs6/s6lock_start.c
@@ -8,5 +8,5 @@
 
 int s6lock_start (s6lock_t *a, char const *path, tain_t const *deadline, tain_t *stamp)
 {
-  return skaclient_start_b(&a->connection, &a->buffers, path, S6LOCK_BANNER1, S6LOCK_BANNER1_LEN, S6LOCK_BANNER2, S6LOCK_BANNER2_LEN, deadline, stamp) ;
+  return skaclient_start_b(&a->connection, &a->buffers, path, 0, S6LOCK_BANNER1, S6LOCK_BANNER1_LEN, S6LOCK_BANNER2, S6LOCK_BANNER2_LEN, deadline, stamp) ;
 }
diff --git a/src/libs6/s6lockd.c b/src/libs6/s6lockd.c
index ef088f9..22378e3 100644
--- a/src/libs6/s6lockd.c
+++ b/src/libs6/s6lockd.c
@@ -257,13 +257,13 @@ int main (int argc, char const *const *argv)
 
    /* client is reading */
     if (x[1].revents & IOPAUSE_WRITE)
-      if ((unixmessage_sender_flush(unixmessage_sender_1) < 0) && !error_isagain(errno))
+      if (!unixmessage_sender_flush(unixmessage_sender_1) && !error_isagain(errno))
       {
         cleanup() ;
         strerr_diefu1sys(111, "flush stdout") ;
       }
     if (x[2].revents & IOPAUSE_WRITE)
-      if ((unixmessage_sender_flush(unixmessage_sender_x) < 0) && !error_isagain(errno))
+      if (!unixmessage_sender_flush(unixmessage_sender_x) && !error_isagain(errno))
       {
         cleanup() ;
         strerr_diefu1sys(111, "flush asyncout") ;
-- 
cgit v1.2.3