From aa2d2e9674d2fd2307d3d5070cec0cfc048d173c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 9 Oct 2024 14:28:13 +0000
Subject:  version: 0.2.0.5

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL           |  2 +-
 doc/index.html    |  2 +-
 doc/upgrade.html  |  2 +-
 patch-for-solaris |  2 +-
 tools/install.sh  | 11 ++++++++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2c0147d..2d857ce 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,7 +8,7 @@ Build Instructions
   - GNU make version 3.81 or later
   - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/
   - To run the test suite and the nsssd-* programs:
-      s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/
+      s6 version 2.13.1.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/doc/index.html b/doc/index.html
index 94c80b8..0ed9995 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -85,7 +85,7 @@ functions.
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.13.0.1 or later. It's a <em>run-time</em> requirement only, to run
+2.13.1.0 or later. It's a <em>run-time</em> requirement only, to run
 the nsssd service (and can be done without if you have a suitable replacement
 for <a href="//skarnet.org/software/s6/s6-ipcserver.html">s6-ipcserver</a>). </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index a00c0b5..a299f6d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -24,7 +24,7 @@
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.14.3.0. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> run-time
-dependency bumped to 2.13.0.1. </li>
+dependency bumped to 2.13.1.0. </li>
  <li> Static libraries now install in <tt>/usr/lib</tt> by default. </li>
 </ul>
 
diff --git a/patch-for-solaris b/patch-for-solaris
index 2d1296b..ccb17f7 100755
--- a/patch-for-solaris
+++ b/patch-for-solaris
@@ -1,4 +1,4 @@
-#!/usr/xpg4/bin/sh
+#!/usr/xpg4/bin/sh -e
 
 patchit () {
   echo '#!/usr/xpg4/bin/sh' > $1.tmp
diff --git a/tools/install.sh b/tools/install.sh
index 89f9428..e96dd7b 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,19 +1,21 @@
 #!/bin/sh
 
 usage() {
-  echo "usage: $0 [-D] [-l] [-m mode] src dst" 1>&2
+  echo "usage: $0 [ -D ] [ -l ] [ -m mode ] [ -O owner:group ] src dst" 1>&2
   exit 1
 }
 
 mkdirp=false
 symlink=false
 mode=0755
+og=
 
-while getopts Dlm: name ; do
+while getopts Dlm:O: name ; do
   case "$name" in
     D) mkdirp=true ;;
     l) symlink=true ;;
     m) mode=$OPTARG ;;
+    O) og=$OPTARG ;;
     ?) usage ;;
   esac
 done
@@ -46,7 +48,10 @@ if $symlink ; then
   ln -s "$src" "$tmp"
 else
   cat < "$1" > "$tmp"
-  chmod "$mode" "$tmp"
+  if test -n "$og" ; then
+    chown -- "$og" "$tmp"
+  fi
+  chmod -- "$mode" "$tmp"
 fi
 
 mv -f "$tmp" "$dst"
-- 
cgit v1.3.1