From ed14312d330dbd7afb668d0238eaca64f057b267 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 6 Jul 2023 13:00:46 +0000
Subject:  Prepare for 0.5.4.2; use open3() safe wrapper

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                 |  6 +++---
 NEWS                    |  6 ++++++
 doc/index.html          |  8 ++++----
 doc/upgrade.html        | 11 +++++++++++
 package/info            |  2 +-
 src/libs6rc/s6rc_lock.c |  4 ++--
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 0e59450..c21792c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.1.0 or later: https://skarnet.org/software/skalibs/
-  - execline version 2.9.2.1 or later: https://skarnet.org/software/execline/
-  - s6 version 2.11.3.0 or later: https://skarnet.org/software/s6/
+  - skalibs version 2.13.2.0 or later: https://skarnet.org/software/skalibs/
+  - execline version 2.9.4.0 or later: https://skarnet.org/software/execline/
+  - s6 version 2.11.4.0 or later: https://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 3b5f3bc..d541e57 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-rc.
 
+In 0.5.4.2
+----------
+
+ - Bugfixes.
+
+
 In 0.5.4.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 67d72b1..4f9fb24 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,12 +48,12 @@ 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.13.1.0 or later. It's a build-time requirement. It's also a run-time
+2.13.2.0 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="//skarnet.org/software/execline/">execline</a> version
-2.9.2.1 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.9.4.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.11.3.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.11.4.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -67,7 +67,7 @@ requirement if you link against the shared version of the skalibs library. </li>
 
 <ul>
  <li> The current released version of s6-rc is
-<a href="s6-rc-0.5.4.1.tar.gz">0.5.4.1</a>. </li>
+<a href="s6-rc-0.5.4.2.tar.gz">0.5.4.2</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 0872086..8b6fb42 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,17 @@ minor and bugfix version changes.
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.5.4.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.2.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.9.4.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.11.4.0. </li>
+</ul>
+
 <h2> in 0.5.4.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 0c7e8e7..9a9e245 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.5.4.1
+version=0.5.4.2
 category=admin
 package_macro_name=S6RC
diff --git a/src/libs6rc/s6rc_lock.c b/src/libs6rc/s6rc_lock.c
index 95e5d70..5bfb587 100644
--- a/src/libs6rc/s6rc_lock.c
+++ b/src/libs6rc/s6rc_lock.c
@@ -24,7 +24,7 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int
     char lfn[llen + 6] ;
     memcpy(lfn, live, llen) ;
     memcpy(lfn + llen, "/lock", 6) ;
-    lfd = open(lfn, modefor(lwhat), 0644) ;
+    lfd = open3(lfn, modefor(lwhat), 0644) ;
     if (lfd < 0) return 0 ;
     r = fd_lock(lfd, lwhat > 1, !blocking) ;
     if (!r) errno = EBUSY ;
@@ -38,7 +38,7 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int
     char cfn[clen + 6] ;
     memcpy(cfn, compiled, clen) ;
     memcpy(cfn + clen, "/lock", 6) ;
-    cfd = open(cfn, modefor(cwhat), 0644) ;
+    cfd = open3(cfn, modefor(cwhat), 0644) ;
     if (cfd < 0) goto lerr ;
     r = fd_lock(cfd, cwhat > 1, !blocking) ;
     if (!r) errno = EBUSY ;
-- 
cgit v1.2.3