pkg-config support, templated configure, etc.

Signed-off-by: Laurent Bercot <ska@appnovation.com>

13 files changed, 174 insertions, 141 deletions

diff --git a/package/configure-snippets/configure_case_lines b/package/configure-snippets/configure_case_lines
new file mode 100644
index 0000000..edd57ae
--- /dev/null
+++ b/package/configure-snippets/configure_case_lines
@@ -0,0 +1,4 @@
+    --enable-nsss|--enable-nsss=yes) usensss=true ;;
+    --disable-nsss|--enable-nsss=no) usensss=false ;;
+    --enable-execline|--enable-execline=yes) useexecline=true ;;
+    --disable-execline|--enable-execline=no) useexecline=false ;;
diff --git a/package/configure-snippets/configure_expand_dirs b/package/configure-snippets/configure_expand_dirs
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/package/configure-snippets/configure_expand_dirs
@@ -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..3c4a1e8
--- /dev/null
+++ b/package/configure-snippets/configure_generate_configh
@@ -0,0 +1,4 @@
+echo "#undef ${package_macro_name}_USE_EXECLINE"
+if $useexecline ; then
+  echo "#define ${package_macro_name}_USE_EXECLINE"
+fi
diff --git a/package/configure-snippets/configure_generate_make b/package/configure-snippets/configure_generate_make
new file mode 100644
index 0000000..b0d2474
--- /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 $useexecline ; then
+  echo "EXECLINE_LIB := -lexecline"
+else
+  echo "EXECLINE_LIB :="
+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..96e9e51
--- /dev/null
+++ b/package/configure-snippets/configure_help_options
@@ -0,0 +1,3 @@
+  --enable-nsss                 use the nsss library for user information [disabled]
+  --disable-execline            don't use the execline library [enabled]
+
diff --git a/package/configure-snippets/configure_init_vars b/package/configure-snippets/configure_init_vars
new file mode 100644
index 0000000..68c268b
--- /dev/null
+++ b/package/configure-snippets/configure_init_vars
@@ -0,0 +1,2 @@
+usensss=false
+useexecline=true
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 f276e1b..a4d140d 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,3 +1,3 @@
-/package/prog/skalibs
-/package/admin/nsss $usensss
-/package/admin/execline $useexecline
+true		true		/package/prog/skalibs	2.14.4.0	libskarnet
+$usensss	false		/package/admin/nsss	0.2.1.0		libnsss
+$useexecline	$useexecline	/package/admin/execline	2.9.7.0		libexecline
diff --git a/package/deps.mak b/package/deps.mak
index 1dd783c..231027b 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -144,150 +144,152 @@ src/supervision/s6_svlisten_loop.o src/supervision/s6_svlisten_loop.lo: src/supe
 src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_signal_handler.lo: src/supervision/s6_svlisten_signal_handler.c src/supervision/s6-svlisten.h
 src/usertree/s6-usertree-maker.o src/usertree/s6-usertree-maker.lo: src/usertree/s6-usertree-maker.c src/include/s6/auto.h src/include/s6/config.h
 
-s6-accessrules-cdb-from-fs: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-accessrules-cdb-from-fs: src/conn-tools/s6-accessrules-cdb-from-fs.o
-s6-accessrules-fs-from-cdb: EXTRA_LIBS := -lskarnet
-s6-accessrules-fs-from-cdb: src/conn-tools/s6-accessrules-fs-from-cdb.o
-s6-connlimit: EXTRA_LIBS := -lskarnet
-s6-connlimit: src/conn-tools/s6-connlimit.o
-s6-ioconnect: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-ioconnect: src/conn-tools/s6-ioconnect.o
-s6-ipcclient: EXTRA_LIBS := -lskarnet ${SOCKET_LIB}
-s6-ipcclient: src/conn-tools/s6-ipcclient.o
-s6-ipcserver: EXTRA_LIBS := -lskarnet
-s6-ipcserver: src/conn-tools/s6-ipcserver.o
-s6-ipcserver-access: EXTRA_LIBS := -lskarnet ${SOCKET_LIB}
-s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o ${LIBS6}
-s6-ipcserver-socketbinder: EXTRA_LIBS := -lskarnet ${SOCKET_LIB}
-s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o
-s6-ipcserverd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-ipcserverd: src/conn-tools/s6-ipcserverd.o
-s6-sudo: EXTRA_LIBS := -lskarnet
-s6-sudo: src/conn-tools/s6-sudo.o
-s6-sudoc: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-sudoc: src/conn-tools/s6-sudoc.o
-s6-sudod: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SPAWN_LIB} ${SYSCLOCK_LIB}
-s6-sudod: src/conn-tools/s6-sudod.o
-s6-applyuidgid: EXTRA_LIBS := -lskarnet
-s6-applyuidgid: src/daemontools-extras/s6-applyuidgid.o
-s6-envdir: EXTRA_LIBS := -lskarnet
-s6-envdir: src/daemontools-extras/s6-envdir.o
-s6-envuidgid: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
-s6-envuidgid: src/daemontools-extras/s6-envuidgid.o ${LIBNSSS}
-s6-fghack: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
-s6-fghack: src/daemontools-extras/s6-fghack.o
-s6-log: EXTRA_LIBS := -lskarnet ${SPAWN_LIB} ${SYSCLOCK_LIB}
-s6-log: src/daemontools-extras/s6-log.o
-s6-setlock: EXTRA_LIBS := -lskarnet ${TIMER_LIB}
-s6-setlock: src/daemontools-extras/s6-setlock.o
-s6-setsid: EXTRA_LIBS := -lskarnet
-s6-setsid: src/daemontools-extras/s6-setsid.o
-s6-setuidgid: EXTRA_LIBS := -lskarnet
-s6-setuidgid: src/daemontools-extras/s6-setuidgid.o
-s6-socklog: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-socklog: src/daemontools-extras/s6-socklog.o src/daemontools-extras/lolsyslog.o
-s6-softlimit: EXTRA_LIBS := -lskarnet
-s6-softlimit: src/daemontools-extras/s6-softlimit.o
-s6-tai64n: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-tai64n: src/daemontools-extras/s6-tai64n.o
-s6-tai64nlocal: EXTRA_LIBS := -lskarnet
-s6-tai64nlocal: src/daemontools-extras/s6-tai64nlocal.o
-ucspilogd: EXTRA_LIBS := -lskarnet
-ucspilogd: src/daemontools-extras/ucspilogd.o src/daemontools-extras/lolsyslog.o
-s6-fdholder-daemon: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-daemon: src/fdholder/s6-fdholder-daemon.o ${LIBS6}
-s6-fdholder-delete: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-delete: src/fdholder/s6-fdholder-delete.o ${LIBS6}
-s6-fdholder-getdump: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-getdump: src/fdholder/s6-fdholder-getdump.o ${LIBS6}
-s6-fdholder-list: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-list: src/fdholder/s6-fdholder-list.o ${LIBS6}
-s6-fdholder-retrieve: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-retrieve: src/fdholder/s6-fdholder-retrieve.o ${LIBS6}
-s6-fdholder-setdump: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-setdump: src/fdholder/s6-fdholder-setdump.o ${LIBS6}
-s6-fdholder-store: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-store: src/fdholder/s6-fdholder-store.o ${LIBS6}
-s6-fdholder-transferdump: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholder-transferdump: src/fdholder/s6-fdholder-transferdump.o ${LIBS6}
-s6-fdholderd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6}
-s6-instance-control: EXTRA_LIBS := -lskarnet
-s6-instance-control: src/instance/s6-instance-control.o
-s6-instance-create: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-instance-create: src/instance/s6-instance-create.o ${LIBS6}
-s6-instance-delete: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-instance-delete: src/instance/s6-instance-delete.o ${LIBS6}
-s6-instance-list: EXTRA_LIBS := -lskarnet
-s6-instance-list: src/instance/s6-instance-list.o ${LIBS6}
-s6-instance-maker: EXTRA_LIBS := -lskarnet
-s6-instance-maker: src/instance/s6-instance-maker.o libs6auto.a.xyzzy
-s6-instance-status: EXTRA_LIBS := -lskarnet
-s6-instance-status: src/instance/s6-instance-status.o
+s6-accessrules-cdb-from-fs: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-accessrules-cdb-from-fs: src/conn-tools/s6-accessrules-cdb-from-fs.o -lskarnet
+s6-accessrules-fs-from-cdb: EXTRA_LIBS :=
+s6-accessrules-fs-from-cdb: src/conn-tools/s6-accessrules-fs-from-cdb.o -lskarnet
+s6-connlimit: EXTRA_LIBS :=
+s6-connlimit: src/conn-tools/s6-connlimit.o -lskarnet
+s6-ioconnect: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-ioconnect: src/conn-tools/s6-ioconnect.o -lskarnet
+s6-ipcclient: EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcclient: src/conn-tools/s6-ipcclient.o -lskarnet
+s6-ipcserver: EXTRA_LIBS :=
+s6-ipcserver: src/conn-tools/s6-ipcserver.o -lskarnet
+s6-ipcserver-access: EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcserver-access: src/conn-tools/s6-ipcserver-access.o ${LIBS6} -lskarnet
+s6-ipcserver-socketbinder: EXTRA_LIBS := ${SOCKET_LIB}
+s6-ipcserver-socketbinder: src/conn-tools/s6-ipcserver-socketbinder.o -lskarnet
+s6-ipcserverd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-ipcserverd: src/conn-tools/s6-ipcserverd.o -lskarnet
+s6-sudo: EXTRA_LIBS :=
+s6-sudo: src/conn-tools/s6-sudo.o -lskarnet
+s6-sudoc: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-sudoc: src/conn-tools/s6-sudoc.o -lskarnet
+s6-sudod: EXTRA_LIBS := ${SOCKET_LIB} ${SPAWN_LIB} ${SYSCLOCK_LIB}
+s6-sudod: src/conn-tools/s6-sudod.o -lskarnet
+s6-applyuidgid: EXTRA_LIBS :=
+s6-applyuidgid: src/daemontools-extras/s6-applyuidgid.o -lskarnet
+s6-envdir: EXTRA_LIBS :=
+s6-envdir: src/daemontools-extras/s6-envdir.o -lskarnet
+s6-envuidgid: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+s6-envuidgid: src/daemontools-extras/s6-envuidgid.o ${LIBNSSS} -lskarnet
+s6-fghack: EXTRA_LIBS := ${SPAWN_LIB}
+s6-fghack: src/daemontools-extras/s6-fghack.o -lskarnet
+s6-log: EXTRA_LIBS := ${SPAWN_LIB} ${SYSCLOCK_LIB}
+s6-log: src/daemontools-extras/s6-log.o -lskarnet
+s6-setlock: EXTRA_LIBS := ${TIMER_LIB}
+s6-setlock: src/daemontools-extras/s6-setlock.o -lskarnet
+s6-setsid: EXTRA_LIBS :=
+s6-setsid: src/daemontools-extras/s6-setsid.o -lskarnet
+s6-setuidgid: EXTRA_LIBS :=
+s6-setuidgid: src/daemontools-extras/s6-setuidgid.o -lskarnet
+s6-socklog: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-socklog: src/daemontools-extras/s6-socklog.o src/daemontools-extras/lolsyslog.o -lskarnet
+s6-softlimit: EXTRA_LIBS :=
+s6-softlimit: src/daemontools-extras/s6-softlimit.o -lskarnet
+s6-tai64n: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-tai64n: src/daemontools-extras/s6-tai64n.o -lskarnet
+s6-tai64nlocal: EXTRA_LIBS :=
+s6-tai64nlocal: src/daemontools-extras/s6-tai64nlocal.o -lskarnet
+ucspilogd: EXTRA_LIBS :=
+ucspilogd: src/daemontools-extras/ucspilogd.o src/daemontools-extras/lolsyslog.o -lskarnet
+s6-fdholder-daemon: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-daemon: src/fdholder/s6-fdholder-daemon.o ${LIBS6} -lskarnet
+s6-fdholder-delete: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-delete: src/fdholder/s6-fdholder-delete.o ${LIBS6} -lskarnet
+s6-fdholder-getdump: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-getdump: src/fdholder/s6-fdholder-getdump.o ${LIBS6} -lskarnet
+s6-fdholder-list: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-list: src/fdholder/s6-fdholder-list.o ${LIBS6} -lskarnet
+s6-fdholder-retrieve: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-retrieve: src/fdholder/s6-fdholder-retrieve.o ${LIBS6} -lskarnet
+s6-fdholder-setdump: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-setdump: src/fdholder/s6-fdholder-setdump.o ${LIBS6} -lskarnet
+s6-fdholder-store: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-store: src/fdholder/s6-fdholder-store.o ${LIBS6} -lskarnet
+s6-fdholder-transferdump: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholder-transferdump: src/fdholder/s6-fdholder-transferdump.o ${LIBS6} -lskarnet
+s6-fdholderd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6} -lskarnet
+s6-instance-control: EXTRA_LIBS :=
+s6-instance-control: src/instance/s6-instance-control.o -lskarnet
+s6-instance-create: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-instance-create: src/instance/s6-instance-create.o ${LIBS6} -lskarnet
+s6-instance-delete: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-instance-delete: src/instance/s6-instance-delete.o ${LIBS6} -lskarnet
+s6-instance-list: EXTRA_LIBS :=
+s6-instance-list: src/instance/s6-instance-list.o ${LIBS6} -lskarnet
+s6-instance-maker: EXTRA_LIBS :=
+s6-instance-maker: src/instance/s6-instance-maker.o libs6auto.a.xyzzy -lskarnet
+s6-instance-status: EXTRA_LIBS :=
+s6-instance-status: src/instance/s6-instance-status.o -lskarnet
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
 libs6.a.xyzzy: src/libs6/ftrigr1_zero.o src/libs6/ftrigr_check.o src/libs6/ftrigr_checksa.o src/libs6/ftrigr_ack.o src/libs6/ftrigr_end.o src/libs6/ftrigr_start.o src/libs6/ftrigr_startf.o src/libs6/ftrigr_subscribe.o src/libs6/ftrigr_unsubscribe.o src/libs6/ftrigr_update.o src/libs6/ftrigr_updateb.o src/libs6/ftrigr_wait_and.o src/libs6/ftrigr_wait_or.o src/libs6/ftrigr_zero.o src/libs6/ftrigw_clean.o src/libs6/ftrigw_fifodir_make.o src/libs6/ftrigw_notify.o src/libs6/ftrigw_notifyb.o src/libs6/ftrigw_notifyb_nosig.o src/libs6/s6_accessrules_backend_cdb.o src/libs6/s6_accessrules_backend_fs.o src/libs6/s6_accessrules_keycheck_ip4.o src/libs6/s6_accessrules_keycheck_ip6.o src/libs6/s6_accessrules_keycheck_reversedns.o src/libs6/s6_accessrules_keycheck_uidgid.o src/libs6/s6_accessrules_params_free.o src/libs6/s6_accessrules_uidgid_cdb.o src/libs6/s6_accessrules_uidgid_fs.o src/libs6/s6_compat_el_semicolon.o src/libs6/s6_dtally_pack.o src/libs6/s6_dtally_unpack.o src/libs6/s6_dtally_read.o src/libs6/s6_dtally_write.o src/libs6/s6_instance_chdirservice.o src/libs6/s6_servicedir_file_list.o src/libs6/s6_servicedir_instances_recreate_offline.o src/libs6/s6_servicedir_instances_recreate_offline_tmp.o src/libs6/s6_svc_ok.o src/libs6/s6_svc_write.o src/libs6/s6_svc_writectl.o src/libs6/s6_svstatus_pack.o src/libs6/s6_svstatus_read.o src/libs6/s6_svstatus_unpack.o src/libs6/s6_svstatus_write.o src/libs6/s6_fdholder_delete.o src/libs6/s6_fdholder_delete_async.o src/libs6/s6_fdholder_end.o src/libs6/s6_fdholder_getdump.o src/libs6/s6_fdholder_list.o src/libs6/s6_fdholder_list_async.o src/libs6/s6_fdholder_list_cb.o src/libs6/s6_fdholder_retrieve.o src/libs6/s6_fdholder_retrieve_async.o src/libs6/s6_fdholder_retrieve_cb.o src/libs6/s6_fdholder_setdump.o src/libs6/s6_fdholder_start.o src/libs6/s6_fdholder_store.o src/libs6/s6_fdholder_store_async.o src/libs6/s6_supervise_link.o src/libs6/s6_supervise_link_names.o src/libs6/s6_supervise_unlink.o src/libs6/s6_supervise_unlink_names.o
 else
-libs6.a.xyzzy: src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftrigr_checksa.lo src/libs6/ftrigr_ack.lo src/libs6/ftrigr_end.lo src/libs6/ftrigr_start.lo src/libs6/ftrigr_startf.lo src/libs6/ftrigr_subscribe.lo src/libs6/ftrigr_unsubscribe.lo src/libs6/ftrigr_update.lo src/libs6/ftrigr_updateb.lo src/libs6/ftrigr_wait_and.lo src/libs6/ftrigr_wait_or.lo src/libs6/ftrigr_zero.lo src/libs6/ftrigw_clean.lo src/libs6/ftrigw_fifodir_make.lo src/libs6/ftrigw_notify.lo src/libs6/ftrigw_notifyb.lo src/libs6/ftrigw_notifyb_nosig.lo src/libs6/s6_accessrules_backend_cdb.lo src/libs6/s6_accessrules_backend_fs.lo src/libs6/s6_accessrules_keycheck_ip4.lo src/libs6/s6_accessrules_keycheck_ip6.lo src/libs6/s6_accessrules_keycheck_reversedns.lo src/libs6/s6_accessrules_keycheck_uidgid.lo src/libs6/s6_accessrules_params_free.lo src/libs6/s6_accessrules_uidgid_cdb.lo src/libs6/s6_accessrules_uidgid_fs.lo src/libs6/s6_compat_el_semicolon.lo src/libs6/s6_dtally_pack.lo src/libs6/s6_dtally_unpack.lo src/libs6/s6_dtally_read.lo src/libs6/s6_dtally_write.lo src/libs6/s6_instance_chdirservice.lo src/libs6/s6_servicedir_file_list.lo src/libs6/s6_servicedir_instances_recreate_offline.lo src/libs6/s6_servicedir_instances_recreate_offline_tmp.lo src/libs6/s6_svc_ok.lo src/libs6/s6_svc_write.lo src/libs6/s6_svc_writectl.lo src/libs6/s6_svstatus_pack.lo src/libs6/s6_svstatus_read.lo src/libs6/s6_svstatus_unpack.lo src/libs6/s6_svstatus_write.lo src/libs6/s6_fdholder_delete.lo src/libs6/s6_fdholder_delete_async.lo src/libs6/s6_fdholder_end.lo src/libs6/s6_fdholder_getdump.lo src/libs6/s6_fdholder_list.lo src/libs6/s6_fdholder_list_async.lo src/libs6/s6_fdholder_list_cb.lo src/libs6/s6_fdholder_retrieve.lo src/libs6/s6_fdholder_retrieve_async.lo src/libs6/s6_fdholder_retrieve_cb.lo src/libs6/s6_fdholder_setdump.lo src/libs6/s6_fdholder_start.lo src/libs6/s6_fdholder_store.lo src/libs6/s6_fdholder_store_async.lo src/libs6/s6_supervise_link.lo src/libs6/s6_supervise_link_names.lo src/libs6/s6_supervise_unlink.lo src/libs6/s6_supervise_unlink_names.lo
+libs6.a.xyzzy:src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftrigr_checksa.lo src/libs6/ftrigr_ack.lo src/libs6/ftrigr_end.lo src/libs6/ftrigr_start.lo src/libs6/ftrigr_startf.lo src/libs6/ftrigr_subscribe.lo src/libs6/ftrigr_unsubscribe.lo src/libs6/ftrigr_update.lo src/libs6/ftrigr_updateb.lo src/libs6/ftrigr_wait_and.lo src/libs6/ftrigr_wait_or.lo src/libs6/ftrigr_zero.lo src/libs6/ftrigw_clean.lo src/libs6/ftrigw_fifodir_make.lo src/libs6/ftrigw_notify.lo src/libs6/ftrigw_notifyb.lo src/libs6/ftrigw_notifyb_nosig.lo src/libs6/s6_accessrules_backend_cdb.lo src/libs6/s6_accessrules_backend_fs.lo src/libs6/s6_accessrules_keycheck_ip4.lo src/libs6/s6_accessrules_keycheck_ip6.lo src/libs6/s6_accessrules_keycheck_reversedns.lo src/libs6/s6_accessrules_keycheck_uidgid.lo src/libs6/s6_accessrules_params_free.lo src/libs6/s6_accessrules_uidgid_cdb.lo src/libs6/s6_accessrules_uidgid_fs.lo src/libs6/s6_compat_el_semicolon.lo src/libs6/s6_dtally_pack.lo src/libs6/s6_dtally_unpack.lo src/libs6/s6_dtally_read.lo src/libs6/s6_dtally_write.lo src/libs6/s6_instance_chdirservice.lo src/libs6/s6_servicedir_file_list.lo src/libs6/s6_servicedir_instances_recreate_offline.lo src/libs6/s6_servicedir_instances_recreate_offline_tmp.lo src/libs6/s6_svc_ok.lo src/libs6/s6_svc_write.lo src/libs6/s6_svc_writectl.lo src/libs6/s6_svstatus_pack.lo src/libs6/s6_svstatus_read.lo src/libs6/s6_svstatus_unpack.lo src/libs6/s6_svstatus_write.lo src/libs6/s6_fdholder_delete.lo src/libs6/s6_fdholder_delete_async.lo src/libs6/s6_fdholder_end.lo src/libs6/s6_fdholder_getdump.lo src/libs6/s6_fdholder_list.lo src/libs6/s6_fdholder_list_async.lo src/libs6/s6_fdholder_list_cb.lo src/libs6/s6_fdholder_retrieve.lo src/libs6/s6_fdholder_retrieve_async.lo src/libs6/s6_fdholder_retrieve_cb.lo src/libs6/s6_fdholder_setdump.lo src/libs6/s6_fdholder_start.lo src/libs6/s6_fdholder_store.lo src/libs6/s6_fdholder_store_async.lo src/libs6/s6_supervise_link.lo src/libs6/s6_supervise_link_names.lo src/libs6/s6_supervise_unlink.lo src/libs6/s6_supervise_unlink_names.lo
 endif
+libs6.pc: EXTRA_LIBS := -lskarnet
 libs6.so.xyzzy: EXTRA_LIBS := -lskarnet
-libs6.so.xyzzy: src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftrigr_checksa.lo src/libs6/ftrigr_ack.lo src/libs6/ftrigr_end.lo src/libs6/ftrigr_start.lo src/libs6/ftrigr_startf.lo src/libs6/ftrigr_subscribe.lo src/libs6/ftrigr_unsubscribe.lo src/libs6/ftrigr_update.lo src/libs6/ftrigr_updateb.lo src/libs6/ftrigr_wait_and.lo src/libs6/ftrigr_wait_or.lo src/libs6/ftrigr_zero.lo src/libs6/ftrigw_clean.lo src/libs6/ftrigw_fifodir_make.lo src/libs6/ftrigw_notify.lo src/libs6/ftrigw_notifyb.lo src/libs6/ftrigw_notifyb_nosig.lo src/libs6/s6_accessrules_backend_cdb.lo src/libs6/s6_accessrules_backend_fs.lo src/libs6/s6_accessrules_keycheck_ip4.lo src/libs6/s6_accessrules_keycheck_ip6.lo src/libs6/s6_accessrules_keycheck_reversedns.lo src/libs6/s6_accessrules_keycheck_uidgid.lo src/libs6/s6_accessrules_params_free.lo src/libs6/s6_accessrules_uidgid_cdb.lo src/libs6/s6_accessrules_uidgid_fs.lo src/libs6/s6_compat_el_semicolon.lo src/libs6/s6_dtally_pack.lo src/libs6/s6_dtally_unpack.lo src/libs6/s6_dtally_read.lo src/libs6/s6_dtally_write.lo src/libs6/s6_instance_chdirservice.lo src/libs6/s6_servicedir_file_list.lo src/libs6/s6_servicedir_instances_recreate_offline.lo src/libs6/s6_servicedir_instances_recreate_offline_tmp.lo src/libs6/s6_svc_ok.lo src/libs6/s6_svc_write.lo src/libs6/s6_svc_writectl.lo src/libs6/s6_svstatus_pack.lo src/libs6/s6_svstatus_read.lo src/libs6/s6_svstatus_unpack.lo src/libs6/s6_svstatus_write.lo src/libs6/s6_fdholder_delete.lo src/libs6/s6_fdholder_delete_async.lo src/libs6/s6_fdholder_end.lo src/libs6/s6_fdholder_getdump.lo src/libs6/s6_fdholder_list.lo src/libs6/s6_fdholder_list_async.lo src/libs6/s6_fdholder_list_cb.lo src/libs6/s6_fdholder_retrieve.lo src/libs6/s6_fdholder_retrieve_async.lo src/libs6/s6_fdholder_retrieve_cb.lo src/libs6/s6_fdholder_setdump.lo src/libs6/s6_fdholder_start.lo src/libs6/s6_fdholder_store.lo src/libs6/s6_fdholder_store_async.lo src/libs6/s6_supervise_link.lo src/libs6/s6_supervise_link_names.lo src/libs6/s6_supervise_unlink.lo src/libs6/s6_supervise_unlink_names.lo
+libs6.so.xyzzy:src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftrigr_checksa.lo src/libs6/ftrigr_ack.lo src/libs6/ftrigr_end.lo src/libs6/ftrigr_start.lo src/libs6/ftrigr_startf.lo src/libs6/ftrigr_subscribe.lo src/libs6/ftrigr_unsubscribe.lo src/libs6/ftrigr_update.lo src/libs6/ftrigr_updateb.lo src/libs6/ftrigr_wait_and.lo src/libs6/ftrigr_wait_or.lo src/libs6/ftrigr_zero.lo src/libs6/ftrigw_clean.lo src/libs6/ftrigw_fifodir_make.lo src/libs6/ftrigw_notify.lo src/libs6/ftrigw_notifyb.lo src/libs6/ftrigw_notifyb_nosig.lo src/libs6/s6_accessrules_backend_cdb.lo src/libs6/s6_accessrules_backend_fs.lo src/libs6/s6_accessrules_keycheck_ip4.lo src/libs6/s6_accessrules_keycheck_ip6.lo src/libs6/s6_accessrules_keycheck_reversedns.lo src/libs6/s6_accessrules_keycheck_uidgid.lo src/libs6/s6_accessrules_params_free.lo src/libs6/s6_accessrules_uidgid_cdb.lo src/libs6/s6_accessrules_uidgid_fs.lo src/libs6/s6_compat_el_semicolon.lo src/libs6/s6_dtally_pack.lo src/libs6/s6_dtally_unpack.lo src/libs6/s6_dtally_read.lo src/libs6/s6_dtally_write.lo src/libs6/s6_instance_chdirservice.lo src/libs6/s6_servicedir_file_list.lo src/libs6/s6_servicedir_instances_recreate_offline.lo src/libs6/s6_servicedir_instances_recreate_offline_tmp.lo src/libs6/s6_svc_ok.lo src/libs6/s6_svc_write.lo src/libs6/s6_svc_writectl.lo src/libs6/s6_svstatus_pack.lo src/libs6/s6_svstatus_read.lo src/libs6/s6_svstatus_unpack.lo src/libs6/s6_svstatus_write.lo src/libs6/s6_fdholder_delete.lo src/libs6/s6_fdholder_delete_async.lo src/libs6/s6_fdholder_end.lo src/libs6/s6_fdholder_getdump.lo src/libs6/s6_fdholder_list.lo src/libs6/s6_fdholder_list_async.lo src/libs6/s6_fdholder_list_cb.lo src/libs6/s6_fdholder_retrieve.lo src/libs6/s6_fdholder_retrieve_async.lo src/libs6/s6_fdholder_retrieve_cb.lo src/libs6/s6_fdholder_setdump.lo src/libs6/s6_fdholder_start.lo src/libs6/s6_fdholder_store.lo src/libs6/s6_fdholder_store_async.lo src/libs6/s6_supervise_link.lo src/libs6/s6_supervise_link_names.lo src/libs6/s6_supervise_unlink.lo src/libs6/s6_supervise_unlink_names.lo
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
 libs6auto.a.xyzzy: src/libs6/s6_auto_write_logger.o src/libs6/s6_auto_write_logger_tmp.o src/libs6/s6_auto_write_logrun.o src/libs6/s6_auto_write_logrun_tmp.o src/libs6/s6_auto_write_service.o
 else
-libs6auto.a.xyzzy: src/libs6/s6_auto_write_logger.lo src/libs6/s6_auto_write_logger_tmp.lo src/libs6/s6_auto_write_logrun.lo src/libs6/s6_auto_write_logrun_tmp.lo src/libs6/s6_auto_write_service.lo
+libs6auto.a.xyzzy:src/libs6/s6_auto_write_logger.lo src/libs6/s6_auto_write_logger_tmp.lo src/libs6/s6_auto_write_logrun.lo src/libs6/s6_auto_write_logrun_tmp.lo src/libs6/s6_auto_write_service.lo
 endif
-libs6auto.so.xyzzy: EXTRA_LIBS :=
-libs6auto.so.xyzzy: src/libs6/s6_auto_write_logger.lo src/libs6/s6_auto_write_logger_tmp.lo src/libs6/s6_auto_write_logrun.lo src/libs6/s6_auto_write_logrun_tmp.lo src/libs6/s6_auto_write_service.lo
-s6-ftrigrd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB}
-s6-ftrigrd: src/libs6/s6-ftrigrd.o src/libs6/ftrig1_free.o src/libs6/ftrig1_make.o
-s6lockd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6lockd: src/libs6/s6lockd.o
-s6lockd-helper: EXTRA_LIBS := -lskarnet
-s6lockd-helper: src/libs6/s6lockd-helper.o libs6lockd.a.xyzzy
-s6-cleanfifodir: EXTRA_LIBS := -lskarnet
-s6-cleanfifodir: src/pipe-tools/s6-cleanfifodir.o ${LIBS6}
-s6-ftrig-listen: EXTRA_LIBS := ${EXECLINE_LIB} -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-ftrig-listen: src/pipe-tools/s6-ftrig-listen.o ${LIBS6}
-s6-ftrig-listen1: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-ftrig-listen1: src/pipe-tools/s6-ftrig-listen1.o ${LIBS6}
-s6-ftrig-notify: EXTRA_LIBS := -lskarnet
-s6-ftrig-notify: src/pipe-tools/s6-ftrig-notify.o ${LIBS6}
-s6-ftrig-wait: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-ftrig-wait: src/pipe-tools/s6-ftrig-wait.o ${LIBS6}
-s6-mkfifodir: EXTRA_LIBS := -lskarnet
-s6-mkfifodir: src/pipe-tools/s6-mkfifodir.o ${LIBS6}
-s6-notifyoncheck: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-notifyoncheck: src/supervision/s6-notifyoncheck.o ${LIBS6}
-s6-permafailon: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-permafailon: src/supervision/s6-permafailon.o ${LIBS6}
-s6-supervise: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-supervise: src/supervision/s6-supervise.o libs6.a.xyzzy
-s6-svc: EXTRA_LIBS := -lskarnet
-s6-svc: src/supervision/s6-svc.o ${LIBS6}
-s6-svdt: EXTRA_LIBS := -lskarnet
-s6-svdt: src/supervision/s6-svdt.o ${LIBS6}
-s6-svdt-clear: EXTRA_LIBS := -lskarnet
-s6-svdt-clear: src/supervision/s6-svdt-clear.o ${LIBS6}
-s6-svlink: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svlink: src/supervision/s6-svlink.o ${LIBS6}
-s6-svlisten: EXTRA_LIBS := ${EXECLINE_LIB} -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svlisten: src/supervision/s6-svlisten.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6}
-s6-svlisten1: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svlisten1: src/supervision/s6-svlisten1.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6}
-s6-svok: EXTRA_LIBS := -lskarnet
-s6-svok: src/supervision/s6-svok.o ${LIBS6}
-s6-svperms: EXTRA_LIBS := -lskarnet
-s6-svperms: src/supervision/s6-svperms.o ${LIBNSSS}
-s6-svscan: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svscan: src/supervision/s6-svscan.o
-s6-svscanctl: EXTRA_LIBS := -lskarnet
-s6-svscanctl: src/supervision/s6-svscanctl.o ${LIBS6}
-s6-svstat: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB}
-s6-svstat: src/supervision/s6-svstat.o ${LIBS6}
-s6-svunlink: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svunlink: src/supervision/s6-svunlink.o ${LIBS6}
-s6-svwait: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
-s6-svwait: src/supervision/s6-svwait.o src/supervision/s6_svlisten_loop.o ${LIBS6}
-s6-usertree-maker: EXTRA_LIBS := -lskarnet
-s6-usertree-maker: src/usertree/s6-usertree-maker.o libs6auto.a.xyzzy
+libs6auto.pc: EXTRA_LIBS := -lexecline -lskarnet
+libs6auto.so.xyzzy: EXTRA_LIBS := -lexecline -lskarnet
+libs6auto.so.xyzzy:src/libs6/s6_auto_write_logger.lo src/libs6/s6_auto_write_logger_tmp.lo src/libs6/s6_auto_write_logrun.lo src/libs6/s6_auto_write_logrun_tmp.lo src/libs6/s6_auto_write_service.lo
+s6-ftrigrd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
+s6-ftrigrd: src/libs6/s6-ftrigrd.o src/libs6/ftrig1_free.o src/libs6/ftrig1_make.o -lskarnet
+s6lockd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6lockd: src/libs6/s6lockd.o -lskarnet
+s6lockd-helper: EXTRA_LIBS :=
+s6lockd-helper: src/libs6/s6lockd-helper.o libs6lockd.a.xyzzy -lskarnet
+s6-cleanfifodir: EXTRA_LIBS :=
+s6-cleanfifodir: src/pipe-tools/s6-cleanfifodir.o ${LIBS6} -lskarnet
+s6-ftrig-listen: EXTRA_LIBS := ${EXECLINE_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-ftrig-listen: src/pipe-tools/s6-ftrig-listen.o ${LIBS6} -lskarnet
+s6-ftrig-listen1: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-ftrig-listen1: src/pipe-tools/s6-ftrig-listen1.o ${LIBS6} -lskarnet
+s6-ftrig-notify: EXTRA_LIBS :=
+s6-ftrig-notify: src/pipe-tools/s6-ftrig-notify.o ${LIBS6} -lskarnet
+s6-ftrig-wait: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-ftrig-wait: src/pipe-tools/s6-ftrig-wait.o ${LIBS6} -lskarnet
+s6-mkfifodir: EXTRA_LIBS :=
+s6-mkfifodir: src/pipe-tools/s6-mkfifodir.o ${LIBS6} -lskarnet
+s6-notifyoncheck: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-notifyoncheck: src/supervision/s6-notifyoncheck.o ${LIBS6} -lskarnet
+s6-permafailon: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-permafailon: src/supervision/s6-permafailon.o ${LIBS6} -lskarnet
+s6-supervise: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-supervise: src/supervision/s6-supervise.o libs6.a.xyzzy -lskarnet
+s6-svc: EXTRA_LIBS :=
+s6-svc: src/supervision/s6-svc.o ${LIBS6} -lskarnet
+s6-svdt: EXTRA_LIBS :=
+s6-svdt: src/supervision/s6-svdt.o ${LIBS6} -lskarnet
+s6-svdt-clear: EXTRA_LIBS :=
+s6-svdt-clear: src/supervision/s6-svdt-clear.o ${LIBS6} -lskarnet
+s6-svlink: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svlink: src/supervision/s6-svlink.o ${LIBS6} -lskarnet
+s6-svlisten: EXTRA_LIBS := ${EXECLINE_LIB} ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svlisten: src/supervision/s6-svlisten.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
+s6-svlisten1: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svlisten1: src/supervision/s6-svlisten1.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
+s6-svok: EXTRA_LIBS :=
+s6-svok: src/supervision/s6-svok.o ${LIBS6} -lskarnet
+s6-svperms: EXTRA_LIBS :=
+s6-svperms: src/supervision/s6-svperms.o ${LIBNSSS} -lskarnet
+s6-svscan: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svscan: src/supervision/s6-svscan.o -lskarnet
+s6-svscanctl: EXTRA_LIBS :=
+s6-svscanctl: src/supervision/s6-svscanctl.o ${LIBS6} -lskarnet
+s6-svstat: EXTRA_LIBS := ${SYSCLOCK_LIB}
+s6-svstat: src/supervision/s6-svstat.o ${LIBS6} -lskarnet
+s6-svunlink: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svunlink: src/supervision/s6-svunlink.o ${LIBS6} -lskarnet
+s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
+s6-svwait: src/supervision/s6-svwait.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
+s6-usertree-maker: EXTRA_LIBS :=
+s6-usertree-maker: src/usertree/s6-usertree-maker.o libs6auto.a.xyzzy -lskarnet
 INTERNAL_LIBS :=
diff --git a/package/info b/package/info
index c5f8159..7a41e47 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.13.1.1
+version=2.13.2.0
 category=admin
 package_macro_name=S6
diff --git a/package/targets.mak b/package/targets.mak
index d4e0376..dbe0b68 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -63,8 +63,10 @@ s6-instance-status \
 s6-instance-list
 
 LIB_DEFS := S6=s6
+S6_DESCRIPTION :=
 
 ifneq ($(EXECLINE_LIB),)
 LIB_DEFS += S6AUTO=s6auto
+S6AUTO_DESCRIPTION := The s6auto library (C helpers to create service directories)
 BIN_TARGETS += s6-usertree-maker s6-instance-maker
 endif