From 7934949532ac6bec4f810f74c806d2620ce37ff0 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 7 Jul 2023 14:24:38 +0000
Subject:  Prepare for 0.1.6.3 ; use open2() safe wrapper

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

diff --git a/INSTALL b/INSTALL
index 892409d..b71761b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ 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/
   - optional: nsss version 0.2.0.3 or later: https://skarnet.org/software/nsss/
-  - optional: execline version 2.9.2.0 or later: https://skarnet.org/software/execline/
+  - optional: execline version 2.9.4.0 or later: https://skarnet.org/software/execline/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.10 or later.
diff --git a/NEWS b/NEWS
index a51ccb6..37e974f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,15 @@
 Changelog for mdevd.
 
+In 0.1.6.3
+----------
+
+ - Bugfixes.
+
+
 In 0.1.6.2
 ----------
 
- - Build system upgrade
+ - Build system upgrade.
 
 
 In 0.1.6.1
diff --git a/doc/index.html b/doc/index.html
index 698bd83..37a7457 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -99,7 +99,7 @@ and does not pull in any unnecessary code. </li>
 The Linux kernel must be 2.6.10 or later. </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> Optionally: <a href="//skarnet.org/software/execline/">nsss</a>
@@ -108,7 +108,7 @@ you use the <tt>--enable-nsss</tt> option to configure; but you would
 only do that if you're replacing nsswitch on your whole system, and most
 people are not. </li>
  <li> Optionally: <a href="//skarnet.org/software/execline/">execline</a>
-version 2.9.2.0 or later. It's a only a run-time requirement, and only
+version 2.9.4.0 or later. It's a only a run-time requirement, and only
 if your <tt>mdev.conf</tt> file contains <tt>+</tt>, <tt>-</tt> or
 <tt>&amp;</tt> command directives. </li>
 </ul>
@@ -124,7 +124,7 @@ if your <tt>mdev.conf</tt> file contains <tt>+</tt>, <tt>-</tt> or
 
 <ul>
  <li> The current released version of mdevd is
-<a href="mdevd-0.1.6.2.tar.gz">0.1.6.2</a>. </li>
+<a href="mdevd-0.1.6.3.tar.gz">0.1.6.3</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/mdevd/">mdevd
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 7fadce1..4e41f57 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in mdevd </h1>
 
+<h2> in 0.1.6.3 </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>
+optional dependency bumped to 2.9.4.0. </li>
+</ul>
+
 <h2> in 0.1.6.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index c5993ba..e10ddbd 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=mdevd
-version=0.1.6.2
+version=0.1.6.3
 category=admin
 package_macro_name=MDEVD
diff --git a/src/mdevd/mdevd-coldplug.c b/src/mdevd/mdevd-coldplug.c
index 886a747..6edf3fc 100644
--- a/src/mdevd/mdevd-coldplug.c
+++ b/src/mdevd/mdevd-coldplug.c
@@ -61,7 +61,7 @@ static int scan_subdir (int fdat, char const *pathat, char const *list)
 static int scan_dir (char const *path, int add_devices)
 {
   DIR *dir ;
-  int fdpath = open(path, O_RDONLY | O_DIRECTORY) ;
+  int fdpath = open2(path, O_RDONLY | O_DIRECTORY) ;
   if (fdpath < 0) return 0 ;
   dir = fdopendir(fdpath) ;
   if (!dir) strerr_diefu2sys(111, "fdopendir ", path) ;
-- 
cgit v1.3.1