summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2024-10-09 14:28:17 +0000
committerLaurent Bercot <ska@appnovation.com>2024-10-09 14:28:17 +0000
commit01774a9bfd9565b914196442425008f46fa87098 (patch)
treec5aa33f5044146a5a9167f11e3849b177a818cd6
parentbb5f31c4d294f26cd3d4d03bd540f0dd0526b810 (diff)
downloadutmps-main.tar.xz
version: 0.1.2.3HEADv0.1.2.3main
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--INSTALL2
-rw-r--r--doc/index.html2
-rw-r--r--doc/upgrade.html2
-rwxr-xr-xpatch-for-solaris2
-rwxr-xr-xtools/gen-deps.sh11
-rwxr-xr-xtools/install.sh11
6 files changed, 21 insertions, 9 deletions
diff --git a/INSTALL b/INSTALL
index 8b89795..c514a15 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/
- - 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 is only a run-time requirement, not a build-time one)
This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index 1aa8056..6622abd 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ running utmp functions are just clients to this daemon.
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 utmpd and wtmpd services (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>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 15fa995..11700ef 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 are installed in /usr/lib 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/gen-deps.sh b/tools/gen-deps.sh
index 27e5b3e..befe021 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -7,6 +7,8 @@ echo '# This file has been generated by tools/gen-deps.sh'
echo '#'
echo
+internal_libs=
+
for dir in src/include/${package} src/* ; do
for file in $(ls -1 $dir | grep -- \\.h$) ; do
{
@@ -70,8 +72,12 @@ for dir in $(ls -1 src | grep -v ^include) ; do
echo else
echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
echo endif
- echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
- echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+ if grep -E "^LIB_DEFS [+:]=" package/targets.mak | grep -qF "$file" ; then
+ echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
+ echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+ else
+ internal_libs="$internal_libs lib${file}.a.xyzzy"
+ fi
done
for file in $(ls -1 src/$dir/deps-exe) ; do
@@ -91,3 +97,4 @@ for dir in $(ls -1 src | grep -v ^include) ; do
echo "$file: src/$dir/$file.o$deps"
done
done
+echo "INTERNAL_LIBS :=$internal_libs"
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"