From 2bec8056d1b7c70ab5232f3f81595e3e93b53b59 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 5 Nov 2015 01:23:54 +0000
Subject:  - s6-ioconnect bugfix  - version: 2.2.3.1

---
 doc/index.html                | 2 +-
 doc/upgrade.html              | 6 ++++++
 package/info                  | 2 +-
 src/conn-tools/s6-ioconnect.c | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 21880b8..50f2558 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -100,7 +100,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.2.3.0.tar.gz">2.2.3.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.2.3.1.tar.gz">2.2.3.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
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 38fc0e7..df9701f 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.2.3.1 </h2>
+
+<ul>
+ <li> No functional changes </li>
+</ul>
+
 <h2> in 2.2.3.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 1d3b7fa..eb98e42 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.2.3.0
+version=2.2.3.1
 category=admin
 package_macro_name=S6
diff --git a/src/conn-tools/s6-ioconnect.c b/src/conn-tools/s6-ioconnect.c
index a0217bb..01966cf 100644
--- a/src/conn-tools/s6-ioconnect.c
+++ b/src/conn-tools/s6-ioconnect.c
@@ -104,7 +104,7 @@ int main (int argc, char const *const *argv)
   {
     for (j = 0 ; j < 2 ; j++)
       if (ndelay_on(a[i][j].fd) == -1) strerr_diefu1sys(111, "ndelay_on") ;
-    if (!iobuffer_init(&b[i], a[i][0].fd, a[i][1].fd) < 0) strerr_diefu1sys(111, "iobuffer_init") ;
+    if (!iobuffer_init(&b[i], a[i][0].fd, a[i][1].fd)) strerr_diefu1sys(111, "iobuffer_init") ;
   }
   if (sig_ignore(SIGPIPE) == -1) strerr_diefu1sys(111, "sig_ignore") ;
   tain_now_g() ;
-- 
cgit v1.2.3