13 files changed, 60 insertions, 28 deletions
diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..e193af8
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,7 @@
+    --shebangdir=*) shebangisdefault=false ; shebangdir=${arg#*=} ;;
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
+    --enable-pedantic-posix|--enable-pedantic-posix=yes) pposix=true ;;
+    --disable-pedantic-posix|--enable-pedantic-posix=no) pposix=false ;;
+    --enable-multicall|--enable-multicall=yes) multicall=true ;;
+    --disable-multicall|--enable-multicall=no) multicall=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..705c52c
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -0,0 +1 @@
+shebangdir
diff --git a/package/configure-snippets/configure_extra_checks b/package/configure-snippets/configure_extra_checks
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_extra_checks
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_generate_configh b/package/configure-snippets/configure_generate_configh
new file mode 100644
index 0000000..8111aff
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1 @@
+echo "#define RNGSEED_DIR \"$seeddir\""
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..3590ea5
--- /dev/null
+++ b/package/configure-snippets/configure_generate_make
@@ -0,0 +1,12 @@
+if $usensss ; then
+  echo "LIBNSSS := -lnsss"
+  echo "MAYBEPTHREAD_LIB := -lpthread"
+else
+  echo "LIBNSSS :="
+  echo "MAYBEPTHREAD_LIB :="
+fi
+if $multicall ; then
+  echo "MULTICALL := 1"
+else
+  echo "MULTICALL :="
+fi
diff --git a/package/configure-snippets/configure_help_dependencies b/package/configure-snippets/configure_help_dependencies
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_dependencies
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_install b/package/configure-snippets/configure_help_install
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_help_install
@@ -0,0 +1 @@
+
diff --git a/package/configure-snippets/configure_help_options b/package/configure-snippets/configure_help_options
new file mode 100644
index 0000000..f09a33a
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,4 @@
+  --enable-nsss                 use the nsss library for user information [disabled]
+  --with-seed-dir=DIR           make DIR the default rngseed directory [/var/lib/rngseed]
+  --enable-multicall            build a multicall binary [disabled]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..4fe271b
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,3 @@
+usensss=false
+multicall=false
+seeddir=/var/lib/rngseed
diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -0,0 +1 @@
+
diff --git a/package/deps-build b/package/deps-build
index eb4384b..fb4d1da 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,2 +1,2 @@
-/package/prog/skalibs
-/package/admin/nsss $usensss
+true		true	/package/prog/skalibs	2.14.4.0	libskarnet
+$usensss	false	/package/admin/nsss	0.2.1.0		libnsss
diff --git a/package/deps.mak b/package/deps.mak
index fb16475..7ce090c 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -25,30 +25,30 @@ src/s6-linux-utils/s6-umount.o src/s6-linux-utils/s6-umount.lo: src/s6-linux-uti
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
 libs6ps.a.xyzzy: src/libs6ps/s6ps_cache.o src/libs6ps/s6ps_grcache.o src/libs6ps/s6ps_otree.o src/libs6ps/s6ps_pfield.o src/libs6ps/s6ps_pwcache.o src/libs6ps/s6ps_statparse.o src/libs6ps/s6ps_ttycache.o src/libs6ps/s6ps_wchan.o
 else
-libs6ps.a.xyzzy: src/libs6ps/s6ps_cache.lo src/libs6ps/s6ps_grcache.lo src/libs6ps/s6ps_otree.lo src/libs6ps/s6ps_pfield.lo src/libs6ps/s6ps_pwcache.lo src/libs6ps/s6ps_statparse.lo src/libs6ps/s6ps_ttycache.lo src/libs6ps/s6ps_wchan.lo
+libs6ps.a.xyzzy:src/libs6ps/s6ps_cache.lo src/libs6ps/s6ps_grcache.lo src/libs6ps/s6ps_otree.lo src/libs6ps/s6ps_pfield.lo src/libs6ps/s6ps_pwcache.lo src/libs6ps/s6ps_statparse.lo src/libs6ps/s6ps_ttycache.lo src/libs6ps/s6ps_wchan.lo
 endif
-s6-linux-utils: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${MAYBEPTHREAD_LIB}
-s6-linux-utils: src/multicall/s6-linux-utils.o libs6ps.a.xyzzy ${LIBNSSS}
-rngseed: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-rngseed: src/s6-linux-utils/rngseed.o
-s6-chroot: EXTRA_LIBS := -lskarnet
-s6-chroot: src/s6-linux-utils/s6-chroot.o
-s6-freeramdisk: EXTRA_LIBS := -lskarnet
-s6-freeramdisk: src/s6-linux-utils/s6-freeramdisk.o
-s6-hostname: EXTRA_LIBS := -lskarnet
-s6-hostname: src/s6-linux-utils/s6-hostname.o
-s6-logwatch: EXTRA_LIBS := -lskarnet
-s6-logwatch: src/s6-linux-utils/s6-logwatch.o
-s6-mount: EXTRA_LIBS := -lskarnet
-s6-mount: src/s6-linux-utils/s6-mount.o
-s6-pivotchroot: EXTRA_LIBS := -lskarnet
-s6-pivotchroot: src/s6-linux-utils/s6-pivotchroot.o
-s6-ps: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
-s6-ps: src/s6-linux-utils/s6-ps.o libs6ps.a.xyzzy ${LIBNSSS}
-s6-swapoff: EXTRA_LIBS := -lskarnet
-s6-swapoff: src/s6-linux-utils/s6-swapoff.o
-s6-swapon: EXTRA_LIBS := -lskarnet
-s6-swapon: src/s6-linux-utils/s6-swapon.o
-s6-umount: EXTRA_LIBS := -lskarnet
-s6-umount: src/s6-linux-utils/s6-umount.o
+s6-linux-utils: EXTRA_LIBS := ${SYSCLOCK_LIB} ${MAYBEPTHREAD_LIB}
+s6-linux-utils: src/multicall/s6-linux-utils.o libs6ps.a.xyzzy ${LIBNSSS} -lskarnet
+rngseed: EXTRA_LIBS := ${SYSCLOCK_LIB}
+rngseed: src/s6-linux-utils/rngseed.o -lskarnet
+s6-chroot: EXTRA_LIBS :=
+s6-chroot: src/s6-linux-utils/s6-chroot.o -lskarnet
+s6-freeramdisk: EXTRA_LIBS :=
+s6-freeramdisk: src/s6-linux-utils/s6-freeramdisk.o -lskarnet
+s6-hostname: EXTRA_LIBS :=
+s6-hostname: src/s6-linux-utils/s6-hostname.o -lskarnet
+s6-logwatch: EXTRA_LIBS :=
+s6-logwatch: src/s6-linux-utils/s6-logwatch.o -lskarnet
+s6-mount: EXTRA_LIBS :=
+s6-mount: src/s6-linux-utils/s6-mount.o -lskarnet
+s6-pivotchroot: EXTRA_LIBS :=
+s6-pivotchroot: src/s6-linux-utils/s6-pivotchroot.o -lskarnet
+s6-ps: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+s6-ps: src/s6-linux-utils/s6-ps.o libs6ps.a.xyzzy ${LIBNSSS} -lskarnet
+s6-swapoff: EXTRA_LIBS :=
+s6-swapoff: src/s6-linux-utils/s6-swapoff.o -lskarnet
+s6-swapon: EXTRA_LIBS :=
+s6-swapon: src/s6-linux-utils/s6-swapon.o -lskarnet
+s6-umount: EXTRA_LIBS :=
+s6-umount: src/s6-linux-utils/s6-umount.o -lskarnet
 INTERNAL_LIBS := libs6ps.a.xyzzy
diff --git a/package/info b/package/info
index f627ab4..1264695 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.6.2.2
+version=2.6.3.0
 category=admin
 package_macro_name=S6_LINUX_UTILS