From 3e34202f32ab10017d55aedb2665cf55fb5af5c0 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 1 Aug 2018 21:12:35 +0000 Subject: Add nsss support, prepare for 2.4.0.3 --- COPYING | 2 +- INSTALL | 2 +- NEWS | 6 ++++++ configure | 11 +++++++++++ doc/index.html | 4 ++-- doc/upgrade.html | 7 +++++++ package/deps.mak | 4 ++-- package/info | 2 +- src/minutils/deps-exe/s6-ps | 2 ++ 9 files changed, 33 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index cc344f1..1629e84 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2017 Laurent Bercot +Copyright (c) 2011-2018 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 2d8d091..6a6a081 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.6.0.2 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.7.0.0 or later: http://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 db36a8b..8ba2725 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for s6-linux-utils. +In 2.4.0.3 +---------- + + - nsss support. + + In 2.4.0.2 ---------- diff --git a/configure b/configure index de87b55..68d89d2 100755 --- a/configure +++ b/configure @@ -44,6 +44,7 @@ Optional features: --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths do not rely on PATH to access this package's binaries, hardcode absolute BINDIR/foobar paths instead [disabled] + --enable-nsss use the nsss library for user information [disabled] EOF exit 0 @@ -146,6 +147,7 @@ static=true allpic=detect slashpackage=false abspath=false +usensss=false sproot= home= exthome= @@ -187,6 +189,8 @@ for arg ; do --disable-slashpackage) sproot= ; slashpackage=false ;; --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;; --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;; + --enable-nsss|--enable-nsss=yes) usensss=true ;; + --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; @@ -427,6 +431,13 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi +if $usensss ; then + echo "LIBNSSS := -lnsss" + echo "MAYBEPTHREAD_LIB := -lpthread" +else + echo "LIBNSSS :=" + echo "MAYBEPTHREAD_LIB :=" +fi exec 1>&3 3>&- echo " ... done." diff --git a/doc/index.html b/doc/index.html index 150bb22..638b55e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -34,7 +34,7 @@ The Linux kernel must be 3.5 or later.
  • GNU make, version 3.81 or later
  • skalibs version -2.6.0.2 or later. It's a build-time requirement. It's also a run-time +2.7.0.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.
    • @@ -50,7 +50,7 @@ library.
    • The current released version of s6-linux-utils is -2.4.0.2.
      • +2.4.0.3.
    • Alternatively, you can checkout a copy of the s6-linux-utils git repository: diff --git a/doc/upgrade.html b/doc/upgrade.html index 7899dac..76eac8e 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,13 @@

      What has changed in s6-linux-utils

      +

      in 2.4.0.3

      + +
        +
      • skalibs dependency bumped to 2.7.0.0.
        • +
      • Optional nsss support added.
        • +
      +

      in 2.4.0.2

        diff --git a/package/deps.mak b/package/deps.mak index 74e1ff2..a9773ae 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -40,8 +40,8 @@ s6-mount: EXTRA_LIBS := s6-mount: src/minutils/s6-mount.o -lskarnet s6-pivotchroot: EXTRA_LIBS := s6-pivotchroot: src/minutils/s6-pivotchroot.o -lskarnet -s6-ps: EXTRA_LIBS := -s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o -lskarnet +s6-ps: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} +s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o ${LIBNSSS} -lskarnet s6-swapoff: EXTRA_LIBS := s6-swapoff: src/minutils/s6-swapoff.o -lskarnet s6-swapon: EXTRA_LIBS := diff --git a/package/info b/package/info index 58b78f4..b9ca69d 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-linux-utils -version=2.4.0.2 +version=2.4.0.3 category=admin package_macro_name=S6_LINUX_UTILS diff --git a/src/minutils/deps-exe/s6-ps b/src/minutils/deps-exe/s6-ps index f03a58b..1f0adc5 100644 --- a/src/minutils/deps-exe/s6-ps +++ b/src/minutils/deps-exe/s6-ps @@ -5,4 +5,6 @@ s6ps_pwcache.o s6ps_grcache.o s6ps_ttycache.o s6ps_wchan.o +${LIBNSSS} -lskarnet +${MAYBEPTHREAD_LIB} -- cgit 1.4.1