diff options
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | INSTALL | 12 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | doc/index.html | 6 | ||||
| -rw-r--r-- | doc/upgrade.html | 10 | ||||
| -rwxr-xr-x | examples/s6/utmpd/run | 2 | ||||
| -rwxr-xr-x | examples/s6/wtmpd/run | 3 | ||||
| -rw-r--r-- | package/info | 2 |
9 files changed, 30 insertions, 29 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2018-2023 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2018-2024 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/ - - s6 version 2.12.0.0 or later: https://skarnet.org/software/s6/ + - 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/ (this is only a run-time requirement, not a build-time one) This software will run on any operating system that implements @@ -22,13 +22,7 @@ POSIX.1-2008, available at: will work for most users. It will install the binaries in /bin and the static libraries in -/usr/lib/utmps. - - Please note that static libraries in /usr/lib/utmps *will not* -be found by a default linker invocation: you need -L/usr/lib/utmps. -Other skarnet.org software automatically handles that case if the -default configuration is used, but if you change the configuration, -remember to use the appropriate --with-lib configure option. +/usr/lib. You can strip the binaries and libraries of their extra symbols via "make strip" before the "make install" phase. It will shave a few bytes @@ -1,5 +1,11 @@ Changelog for utmps. +In 0.1.2.3 +---------- + + - Install static libraries in /usr/lib by default. + + In 0.1.2.2 ---------- @@ -21,7 +21,7 @@ Fine tuning of the installation directories: --dynlibdir=DIR shared library files [PREFIX/lib] --bindir=BINDIR user executables [EPREFIX/bin] --libexecdir=DIR package-scoped executables [EPREFIX/libexec] - --libdir=DIR static library files [PREFIX/lib/$package] + --libdir=DIR static library files [PREFIX/lib] --includedir=DIR C header files [PREFIX/include] If no --prefix option is given, by default libdir (but not dynlibdir) will be @@ -143,7 +143,7 @@ exec_prefix='$prefix' dynlibdir='$prefix/lib' libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' -libdir='$prefix/lib/$package' +libdir='$prefix/lib' includedir='$prefix/include' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false @@ -214,8 +214,8 @@ done # Add /usr in the default default case if test -z "$prefix" ; then - if test "$libdir" = '$prefix/lib/$package' ; then - libdir=/usr/lib/$package + if test "$libdir" = '$prefix/lib' ; then + libdir=/usr/lib fi if test "$includedir" = '$prefix/include' ; then includedir=/usr/include @@ -372,14 +372,6 @@ fi LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}" -if test -z "$vpaths" ; then - while read dep ; do - base=$(basename $dep) ; - vpaths="$vpaths /usr/lib/$base" - addlibspath="$addlibspath -L/usr/lib/$base" - done < package/deps-build -fi - if $allstatic ; then LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}" tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections diff --git a/doc/index.html b/doc/index.html index 2803f90..1aa8056 100644 --- a/doc/index.html +++ b/doc/index.html @@ -56,11 +56,11 @@ running utmp functions are just clients to this daemon. <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.14.0.0 or later. It's a build-time requirement. It's also a run-time +2.14.3.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/s6/">s6</a> version -2.12.0.0 or later. It's a <em>run-time</em> requirement only, to run +2.13.0.1 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> @@ -76,7 +76,7 @@ suitable replacement for <h3> Download </h3> <ul> - <li> The current released version of utmps is <a href="utmps-0.1.2.2.tar.gz">0.1.2.2</a>. </li> + <li> The current released version of utmps is <a href="utmps-0.1.2.3.tar.gz">0.1.2.3</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="//git.skarnet.org/cgi-bin/cgit.cgi/utmps/">utmps git repository</a>: diff --git a/doc/upgrade.html b/doc/upgrade.html index 87e7c50..15fa995 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,16 @@ <h1> What has changed in utmps </h1> +<h2> in 0.1.2.3 </h2> + +<ul> + <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> + <li> Static libraries are installed in /usr/lib by default. </li> +</ul> + <h2> in 0.1.2.2 </h2> <ul> diff --git a/examples/s6/utmpd/run b/examples/s6/utmpd/run index 21b0826..e996559 100755 --- a/examples/s6/utmpd/run +++ b/examples/s6/utmpd/run @@ -1,4 +1,4 @@ -#!/bin/execlineb -P +#!/bin/execlineb -S1 fdmove -c 2 1 foreground { mkdir -p -m 0755 /run/utmps } diff --git a/examples/s6/wtmpd/run b/examples/s6/wtmpd/run index d8aba76..0375955 100755 --- a/examples/s6/wtmpd/run +++ b/examples/s6/wtmpd/run @@ -1,7 +1,6 @@ -#!/bin/execlineb -P +#!/bin/execlineb -S1 fdmove -c 2 1 -unexport ? s6-setuidgid utmp cd /var/log # will only work after /var/log is mounted! fdmove 1 3 diff --git a/package/info b/package/info index 58136d8..f51a72f 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=utmps -version=0.1.2.2 +version=0.1.2.3 category=admin package_macro_name=UTMPS |