diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | doc/upgrade.html | 1 | ||||
| -rw-r--r-- | package/deps.mak | 4 | ||||
| -rwxr-xr-x | src/minidentd/deps-exe/minidentd | 2 |
5 files changed, 17 insertions, 2 deletions
@@ -4,6 +4,7 @@ In 2.3.0.3 ---------- - Compatibility with skalibs-2.7.0.0. + - Optional nsss support added. In 2.3.0.2 @@ -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] SSL support: --enable-ssl=libressl|bearssl build SSL tools, w/ libtls or bearssl implementation [disabled] @@ -150,6 +151,7 @@ static=true allpic=detect slashpackage=false abspath=false +usensss=false sproot= home= exthome= @@ -192,6 +194,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-ssl=libressl) ssl=tls ;; --enable-ssl=bearssl) ssl=bearssl ;; --disable-ssl|--enable-ssl=none) ssl= ;; @@ -437,6 +441,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 if test -n $ssl ; then echo "SSL_IMPL := $ssl" else diff --git a/doc/upgrade.html b/doc/upgrade.html index d32b68e..2206c0c 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -21,6 +21,7 @@ <h2> in 2.3.0.3 </h2> <ul> + <li> Optional <a href="//skarnet.org/software/nsss/">nsss</a> support added. </li> <li> LibreSSL dependency bumped to 2.7.4. </li> <li> skalibs dependency bumped to 2.7.0.0. </li> <li> execline dependency bumped to 2.5.0.1. </li> diff --git a/package/deps.mak b/package/deps.mak index fb26f3c..132ba9d 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -120,8 +120,8 @@ libs6net.a.xyzzy: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_re endif libs6net.so.xyzzy: EXTRA_LIBS := -lskarnet libs6net.so.xyzzy: src/libs6net/s6net_ident_client.lo src/libs6net/s6net_ident_reply_get.lo src/libs6net/s6net_ident_reply_parse.lo src/libs6net/s6net_ident_error.lo -minidentd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} -minidentd: src/minidentd/minidentd.o src/minidentd/mgetuid.o -lskarnet +minidentd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} ${SOCKET_LIB} ${TAINNOW_LIB} +minidentd: src/minidentd/minidentd.o src/minidentd/mgetuid.o ${LIBNSSS} -lskarnet ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) libsbearssl.a.xyzzy: src/sbearssl/sbearssl_append.o src/sbearssl/sbearssl_prep_spawn_drop.o src/sbearssl/sbearssl_cert_from.o src/sbearssl/sbearssl_cert_readbigpem.o src/sbearssl/sbearssl_cert_readfile.o src/sbearssl/sbearssl_cert_to.o src/sbearssl/sbearssl_ec_issuer_keytype.o src/sbearssl/sbearssl_ec_pkey_from.o src/sbearssl/sbearssl_ec_pkey_to.o src/sbearssl/sbearssl_ec_skey_from.o src/sbearssl/sbearssl_ec_skey_to.o src/sbearssl/sbearssl_error_str.o src/sbearssl/sbearssl_isder.o src/sbearssl/sbearssl_pem_decode_from_buffer.o src/sbearssl/sbearssl_pem_decode_from_string.o src/sbearssl/sbearssl_pem_push.o src/sbearssl/sbearssl_pkey_from.o src/sbearssl/sbearssl_pkey_to.o src/sbearssl/sbearssl_rsa_pkey_from.o src/sbearssl/sbearssl_rsa_pkey_to.o src/sbearssl/sbearssl_rsa_skey_from.o src/sbearssl/sbearssl_rsa_skey_to.o src/sbearssl/sbearssl_run.o src/sbearssl/sbearssl_skey_from.o src/sbearssl/sbearssl_skey_readfile.o src/sbearssl/sbearssl_skey_to.o src/sbearssl/sbearssl_ta_cert.o src/sbearssl/sbearssl_ta_certs.o src/sbearssl/sbearssl_ta_from.o src/sbearssl/sbearssl_ta_readdir.o src/sbearssl/sbearssl_ta_readfile.o src/sbearssl/sbearssl_ta_to.o src/sbearssl/sbearssl_x500_name_len.o src/sbearssl/sbearssl_x500_from_ta.o src/sbearssl/sbearssl_x509_minimal_set_tai.o src/sbearssl/sbearssl_s6tlsc.o src/sbearssl/sbearssl_s6tlsd.o else diff --git a/src/minidentd/deps-exe/minidentd b/src/minidentd/deps-exe/minidentd index 37c2de8..0b35a21 100755 --- a/src/minidentd/deps-exe/minidentd +++ b/src/minidentd/deps-exe/minidentd @@ -1,4 +1,6 @@ mgetuid.o +${LIBNSSS} -lskarnet +${MAYBEPTHREAD_LIB} ${SOCKET_LIB} ${TAINNOW_LIB} |