From bf0eec8f611dc7e8f0ec32dc725d2f72215a8dbb Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 1 Mar 2018 12:56:21 +0000
Subject:  Add openb_read workaround, prepare for 0.4.0.1

---
 INSTALL                  | 2 +-
 NEWS                     | 6 ++++++
 doc/index.html           | 4 ++--
 doc/upgrade.html         | 6 ++++++
 package/info             | 2 +-
 src/s6-rc/s6-rc-update.c | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index e20192c..e99e859 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.6.2.0 or later: http://skarnet.org/software/skalibs/
+  - 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.6.3.0 or later: http://skarnet.org/software/s6/
 
diff --git a/NEWS b/NEWS
index 0c24901..1185762 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-rc.
 
+In 0.4.0.1
+----------
+
+ - Improved portability to (guess what) OpenBSD
+
+
 In 0.4.0.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 9ce7128..cd22f68 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,7 +48,7 @@ scripts are also run in a controlled environment.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.6.3.0 or later </li>
+2.6.4.0 or later </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
 2.3.0.4 or later </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
@@ -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.0.tar.gz">0.4.0.0</a>. </li>
+<a href="s6-rc-0.4.0.1.tar.gz">0.4.0.1</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 b013db9..c3574bf 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,12 @@ minor and bugfix version changes.
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.4.0.1 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
 <h2> in 0.4.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 3c354d8..4673726 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.4.0.0
+version=0.4.0.1
 category=admin
 package_macro_name=S6RC
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index 2c7ba9d..942db3c 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -115,7 +115,7 @@ static inline void parse_line (stralloc *sa, char const *s, size_t slen, unsigne
 
 static inline void parse_conversion_file (char const *convfile, stralloc *sa, unsigned int *newnames, unsigned char *oldstate, cdb_t *oldc, s6rc_db_t const *olddb)
 {
-  int fd = open_readb(convfile) ;
+  int fd = openb_read(convfile) ;
   char buf[4096] ;
   buffer b = BUFFER_INIT(&buffer_read, fd, buf, 4096) ;
   size_t base = satmp.len ;
-- 
cgit v1.2.3