From 57abdf3eaa424deafda497a4a896328238353e18 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 6 Dec 2020 15:32:11 +0000 Subject: Prepare for 0.1.0.0, add --enable-libc-includes configure switch pwd.h, grp.h and shadow.h will not overwrite the libc headers by default anymore; you need to explicitly add the switch. --- INSTALL | 4 ++-- Makefile | 12 +++--------- NEWS | 5 ++++- configure | 12 ++++++++++-- doc/index.html | 8 ++++---- doc/libnsss/index.html | 25 ++++++++++++++++++++++--- doc/upgrade.html | 10 ++++++++-- package/info | 2 +- package/targets.mak | 4 ++++ src/include/grp.h | 13 ------------- src/include/nsss/grp.h | 19 +++++++++++++++++++ src/include/nsss/pwd.h | 13 +++++++++++++ src/include/nsss/shadow.h | 19 +++++++++++++++++++ src/include/pwd.h | 7 ------- src/include/shadow.h | 13 ------------- 15 files changed, 109 insertions(+), 57 deletions(-) diff --git a/INSTALL b/INSTALL index e57679e..4424944 100644 --- a/INSTALL +++ b/INSTALL @@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.9.2.1 or later: https://skarnet.org/software/skalibs/ - - To run the test suite and the nsssd-* programs: s6 version 2.9.1.0 or later: https://skarnet.org/software/s6/ + - skalibs version 2.10.0.0 or later: https://skarnet.org/software/skalibs/ + - To run the test suite and the nsssd-* programs: s6 version 2.10.0.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/Makefile b/Makefile index ce18023..68599cb 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ ALL_BINS := $(LIBEXEC_TARGETS) $(BIN_TARGETS) ALL_LIBS := $(SHARED_LIBS) $(STATIC_LIBS) $(INTERNAL_LIBS) ALL_INCLUDES := $(wildcard src/include/$(package)/*.h) -all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) src/include/pwd.h src/include/grp.h src/include/shadow.h +all: $(ALL_LIBS) $(ALL_BINS) $(ALL_INCLUDES) $(EXTRA_INCLUDES) clean: @exec rm -f $(ALL_LIBS) $(ALL_BINS) $(wildcard src/*/*.o src/*/*.lo) $(TEST_BINS) $(EXTRA_TARGETS) @@ -86,7 +86,7 @@ install-dynlib: $(SHARED_LIBS:lib%.so.xyzzy=$(DESTDIR)$(dynlibdir)/lib%.so) install-libexec: $(LIBEXEC_TARGETS:%=$(DESTDIR)$(libexecdir)/%) install-bin: $(BIN_TARGETS:%=$(DESTDIR)$(bindir)/%) install-lib: $(STATIC_LIBS:lib%.a.xyzzy=$(DESTDIR)$(libdir)/lib%.a) -install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) $(DESTDIR)$(includedir)/pwd.h $(DESTDIR)$(includedir)/grp.h $(DESTDIR)$(includedir)/shadow.h +install-include: $(ALL_INCLUDES:src/include/$(package)/%.h=$(DESTDIR)$(includedir)/$(package)/%.h) $(EXTRA_INCLUDES:src/include/%.h=$(DESTDIR)$(includedir)/%.h) install-data: $(ALL_DATA:src/etc/%=$(DESTDIR)$(datadir)/%) tests: $(TEST_BINS) @@ -134,13 +134,7 @@ $(DESTDIR)$(libdir)/lib%.a: lib%.a.xyzzy $(DESTDIR)$(includedir)/$(package)/%.h: src/include/$(package)/%.h exec $(INSTALL) -D -m 644 $< $@ -$(DESTDIR)$(includedir)/pwd.h: src/include/pwd.h - exec $(INSTALL) -D -m 644 $< $@ - -$(DESTDIR)$(includedir)/grp.h: src/include/grp.h - exec $(INSTALL) -D -m 644 $< $@ - -$(DESTDIR)$(includedir)/shadow.h: src/include/shadow.h +$(DESTDIR)$(includedir)/%.h: src/include/%.h exec $(INSTALL) -D -m 644 $< $@ %.o: %.c diff --git a/NEWS b/NEWS index 71084aa..5cac770 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,12 @@ Changelog for nsss. -In 0.0.2.3 +In 0.1.0.0 ---------- - Bugfixes. + - pwd.h, grp.h and shadow.h are not installed by default anymore. +You now need to explicitly give the --enable-libc-includes +configure option. In 0.0.2.2 diff --git a/configure b/configure index 24a4a52..365404c 100755 --- a/configure +++ b/configure @@ -47,6 +47,7 @@ Optional features: hardcode absolute BINDIR/foobar paths instead [disabled] --with-nsssd-socket=PATH assume the nsssd socket is at PATH [/run/service/nsssd/s] + --enable-libc-includes overwrite {pwd,grp,shadow}.h in includedir [disabled] EOF exit 0 @@ -161,6 +162,7 @@ vpaths='' vpathd='' build= nsssdpath=/run/service/nsssd/s +libcincludes=false for arg ; do case "$arg" in @@ -191,10 +193,12 @@ 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-libc-includes|--enable-libc-includes=yes) libcincludes=true ;; + --disable-libc-includes|--enable-libc-includes=no) libcincludes=false ;; + --with-nsssd-socket=*) nsssdpath=${arg#*=} ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; - --with-nsssd-socket=*) nsssdpath=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; *=*) ;; *) target=$arg ;; @@ -434,7 +438,11 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi - +if $libcincludes ; then + echo "DO_LIBC_INCLUDES := 1" +else + echo "DO_LIBC_INCLUDES :=" +fi exec 1>&3 3>&- echo " ... done." diff --git a/doc/index.html b/doc/index.html index 9c155a1..62b37bd 100644 --- a/doc/index.html +++ b/doc/index.html @@ -81,11 +81,11 @@ functions.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.9.2.1 or later. It's a build-time requirement. It's also a run-time +2.10.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.
  • s6 version -2.9.1.0 or later. It's a run-time requirement only, to run +2.10.0.0 or later. It's a run-time requirement only, to run the nsssd service (and can be done without if you have a suitable replacement for s6-ipcserver).
    • @@ -94,13 +94,13 @@ for s6-ipcserver).

    nsss is free software. It is available under the -ISC license. +ISC license.

    Download