From 50fd913e8d69daa7c61a38b124e706b5e479b875 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 7 Jul 2023 14:13:03 +0000
Subject:  Prepare for 2.6.1.3, use safe wrappers

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                             | 2 +-
 NEWS                                | 6 ++++++
 doc/index.html                      | 2 +-
 doc/upgrade.html                    | 7 +++++++
 package/info                        | 2 +-
 src/s6-linux-utils/s6-freeramdisk.c | 3 ++-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index 6475133..8a09c5e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.1.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.13.2.0 or later: https://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 3.5 or later.
diff --git a/NEWS b/NEWS
index f8ddee9..7761b50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-utils.
 
+In 2.6.1.3
+----------
+
+ - Bugfixes.
+
+
 In 2.6.1.2
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 707cae7..3c59b96 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -63,7 +63,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.6.1.2.tar.gz">2.6.1.2</a>. </li>
+<a href="s6-linux-utils-2.6.1.3.tar.gz">2.6.1.3</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index dca5a54..62c0aa6 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.6.1.3 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.2.0. </li>
+</ul>
+
 <h2> in 2.6.1.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 96588e1..6d82570 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.6.1.2
+version=2.6.1.3
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/s6-linux-utils/s6-freeramdisk.c b/src/s6-linux-utils/s6-freeramdisk.c
index b965527..65a46a4 100644
--- a/src/s6-linux-utils/s6-freeramdisk.c
+++ b/src/s6-linux-utils/s6-freeramdisk.c
@@ -7,6 +7,7 @@
 #include <sys/ioctl.h>
 
 #include <skalibs/strerr.h>
+#include <skalibs/djbunix.h>
 
 #define USAGE "s6-freeramdisk ramdisk_device"
 
@@ -15,7 +16,7 @@ int main (int argc, char const *const *argv)
   int fd ;
   PROG = "s6-freeramdisk" ;
   if (argc < 2) strerr_dieusage(100, USAGE) ;
-  fd = open(argv[1], O_RDWR) ;
+  fd = open2(argv[1], O_RDWR) ;
   if (fd < 0) strerr_diefu3sys(111, "open ", argv[1], " in read-write mode") ;
   if (ioctl(fd, BLKFLSBUF) < 0) strerr_diefu2sys(111, "ioctl ", argv[1]) ;
   return 0 ;
-- 
cgit 1.4.1