summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-09-21 05:43:56 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-09-21 05:43:56 +0000
commit101b99d6a46d26cc0fc359a6d86647c05833add8 (patch)
tree290e2726c06651ac44865a5082525830bc1a134b
parent296cdd194fb36e4b080690f5f24228925722bf57 (diff)
downloads6-101b99d6a46d26cc0fc359a6d86647c05833add8.tar.xz
Remove tainnow.lib dependency
-rw-r--r--package/deps.mak54
-rw-r--r--src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs2
-rw-r--r--src/conn-tools/deps-exe/s6-ioconnect2
-rw-r--r--src/conn-tools/deps-exe/s6-sudoc2
-rw-r--r--src/conn-tools/deps-exe/s6-sudod2
-rw-r--r--src/daemontools-extras/deps-exe/s6-log2
-rw-r--r--src/daemontools-extras/deps-exe/s6-setlock2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-daemon2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-delete2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-getdump2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-list2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-retrieve2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-setdump2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-store2
-rw-r--r--src/fdholder/deps-exe/s6-fdholder-transferdump2
-rw-r--r--src/fdholder/deps-exe/s6-fdholderd2
-rwxr-xr-xsrc/libs6/deps-exe/s6-ftrigrd2
-rwxr-xr-xsrc/libs6/deps-exe/s6lockd2
-rw-r--r--src/pipe-tools/deps-exe/s6-ftrig-listen2
-rw-r--r--src/pipe-tools/deps-exe/s6-ftrig-listen12
-rw-r--r--src/pipe-tools/deps-exe/s6-ftrig-wait2
-rw-r--r--src/supervision/deps-exe/s6-notifyoncheck2
-rw-r--r--src/supervision/deps-exe/s6-permafailon2
-rw-r--r--src/supervision/deps-exe/s6-supervise2
-rw-r--r--src/supervision/deps-exe/s6-svlisten2
-rw-r--r--src/supervision/deps-exe/s6-svlisten12
-rw-r--r--src/supervision/deps-exe/s6-svscan2
-rw-r--r--src/supervision/deps-exe/s6-svwait2
28 files changed, 54 insertions, 54 deletions
diff --git a/package/deps.mak b/package/deps.mak
index 00423de..6278012 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -133,13 +133,13 @@ src/supervision/s6-svwait.o src/supervision/s6-svwait.lo: src/supervision/s6-svw
src/supervision/s6_svlisten_loop.o src/supervision/s6_svlisten_loop.lo: src/supervision/s6_svlisten_loop.c src/supervision/s6-svlisten.h src/include/s6/ftrigr.h src/include/s6/s6-supervise.h
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
-s6-accessrules-cdb-from-fs: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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
@@ -153,9 +153,9 @@ s6-ipcserverd: EXTRA_LIBS := ${SOCKET_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} ${TAINNOW_LIB}
+s6-sudoc: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
s6-sudoc: src/conn-tools/s6-sudoc.o -lskarnet
-s6-sudod: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-sudod: EXTRA_LIBS := ${SOCKET_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
@@ -165,9 +165,9 @@ s6-envuidgid: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
s6-envuidgid: src/daemontools-extras/s6-envuidgid.o ${LIBNSSS} -lskarnet
s6-fghack: EXTRA_LIBS :=
s6-fghack: src/daemontools-extras/s6-fghack.o -lskarnet
-s6-log: EXTRA_LIBS := ${TAINNOW_LIB}
+s6-log: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-log: src/daemontools-extras/s6-log.o -lskarnet
-s6-setlock: EXTRA_LIBS := ${TAINNOW_LIB} ${SPAWN_LIB}
+s6-setlock: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
s6-setlock: src/daemontools-extras/s6-setlock.o -lskarnet
s6-setsid: EXTRA_LIBS :=
s6-setsid: src/daemontools-extras/s6-setsid.o -lskarnet
@@ -181,23 +181,23 @@ s6-tai64nlocal: EXTRA_LIBS :=
s6-tai64nlocal: src/daemontools-extras/s6-tai64nlocal.o -lskarnet
ucspilogd: EXTRA_LIBS :=
ucspilogd: src/daemontools-extras/ucspilogd.o -lskarnet
-s6-fdholder-daemon: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB}
+s6-fdholderd: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB}
s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6} -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_supervise_lock.o src/libs6/s6_supervise_lock_mode.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_svc_lock_take.o src/libs6/s6_svc_lock_release.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/s6lock_acquire.o src/libs6/s6lock_check.o src/libs6/s6lock_end.o src/libs6/s6lock_release.o src/libs6/s6lock_start.o src/libs6/s6lock_startf.o src/libs6/s6lock_update.o src/libs6/s6lock_wait_and.o src/libs6/s6lock_wait_or.o src/libs6/s6lock_zero.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
@@ -206,29 +206,29 @@ libs6.a.xyzzy: src/libs6/ftrigr1_zero.lo src/libs6/ftrigr_check.lo src/libs6/ftr
endif
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_supervise_lock.lo src/libs6/s6_supervise_lock_mode.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_svc_lock_take.lo src/libs6/s6_svc_lock_release.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/s6lock_acquire.lo src/libs6/s6lock_check.lo src/libs6/s6lock_end.lo src/libs6/s6lock_release.lo src/libs6/s6lock_start.lo src/libs6/s6lock_startf.lo src/libs6/s6lock_update.lo src/libs6/s6lock_wait_and.lo src/libs6/s6lock_wait_or.lo src/libs6/s6lock_zero.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
-s6-ftrigrd: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+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} ${TAINNOW_LIB} ${SPAWN_LIB}
+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 -lskarnet
s6-cleanfifodir: EXTRA_LIBS :=
s6-cleanfifodir: src/pipe-tools/s6-cleanfifodir.o ${LIBS6} -lskarnet
-s6-ftrig-listen: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
+s6-ftrig-listen: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
s6-ftrig-listen: src/pipe-tools/s6-ftrig-listen.o ${LIBS6} -lexecline -lskarnet
-s6-ftrig-listen1: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
+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} ${TAINNOW_LIB} ${SPAWN_LIB}
+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} ${TAINNOW_LIB} ${SPAWN_LIB}
+s6-notifyoncheck: EXTRA_LIBS := ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB}
s6-notifyoncheck: src/supervision/s6-notifyoncheck.o ${LIBS6} -lskarnet
-s6-permafailon: EXTRA_LIBS := ${TAINNOW_LIB}
+s6-permafailon: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-permafailon: src/supervision/s6-permafailon.o ${LIBS6} -lskarnet
-s6-supervise: EXTRA_LIBS := ${TAINNOW_LIB}
+s6-supervise: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-supervise: src/supervision/s6-supervise.o ${LIBS6} -lskarnet
s6-svc: EXTRA_LIBS :=
s6-svc: src/supervision/s6-svc.o ${LIBS6} -lskarnet
@@ -236,17 +236,17 @@ 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-svlisten: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
+s6-svlisten: EXTRA_LIBS := ${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} -lexecline -lskarnet
-s6-svlisten1: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
+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-svscan: EXTRA_LIBS := ${TAINNOW_LIB} ${SPAWN_LIB}
+s6-svscan: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
s6-svscan: src/supervision/s6-svscan.o ${LIBS6} -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-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
+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
diff --git a/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs b/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs
index e027835..720fe7d 100644
--- a/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs
+++ b/src/conn-tools/deps-exe/s6-accessrules-cdb-from-fs
@@ -1,3 +1,3 @@
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/conn-tools/deps-exe/s6-ioconnect b/src/conn-tools/deps-exe/s6-ioconnect
index e027835..720fe7d 100644
--- a/src/conn-tools/deps-exe/s6-ioconnect
+++ b/src/conn-tools/deps-exe/s6-ioconnect
@@ -1,3 +1,3 @@
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/conn-tools/deps-exe/s6-sudoc b/src/conn-tools/deps-exe/s6-sudoc
index e027835..720fe7d 100644
--- a/src/conn-tools/deps-exe/s6-sudoc
+++ b/src/conn-tools/deps-exe/s6-sudoc
@@ -1,3 +1,3 @@
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/conn-tools/deps-exe/s6-sudod b/src/conn-tools/deps-exe/s6-sudod
index e027835..720fe7d 100644
--- a/src/conn-tools/deps-exe/s6-sudod
+++ b/src/conn-tools/deps-exe/s6-sudod
@@ -1,3 +1,3 @@
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/daemontools-extras/deps-exe/s6-log b/src/daemontools-extras/deps-exe/s6-log
index 1840bc1..a11a5f4 100644
--- a/src/daemontools-extras/deps-exe/s6-log
+++ b/src/daemontools-extras/deps-exe/s6-log
@@ -1,2 +1,2 @@
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/daemontools-extras/deps-exe/s6-setlock b/src/daemontools-extras/deps-exe/s6-setlock
index 7b74490..756dcc2 100644
--- a/src/daemontools-extras/deps-exe/s6-setlock
+++ b/src/daemontools-extras/deps-exe/s6-setlock
@@ -1,3 +1,3 @@
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-daemon b/src/fdholder/deps-exe/s6-fdholder-daemon
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-daemon
+++ b/src/fdholder/deps-exe/s6-fdholder-daemon
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-delete b/src/fdholder/deps-exe/s6-fdholder-delete
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-delete
+++ b/src/fdholder/deps-exe/s6-fdholder-delete
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-getdump b/src/fdholder/deps-exe/s6-fdholder-getdump
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-getdump
+++ b/src/fdholder/deps-exe/s6-fdholder-getdump
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-list b/src/fdholder/deps-exe/s6-fdholder-list
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-list
+++ b/src/fdholder/deps-exe/s6-fdholder-list
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-retrieve b/src/fdholder/deps-exe/s6-fdholder-retrieve
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-retrieve
+++ b/src/fdholder/deps-exe/s6-fdholder-retrieve
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-setdump b/src/fdholder/deps-exe/s6-fdholder-setdump
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-setdump
+++ b/src/fdholder/deps-exe/s6-fdholder-setdump
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-store b/src/fdholder/deps-exe/s6-fdholder-store
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-store
+++ b/src/fdholder/deps-exe/s6-fdholder-store
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholder-transferdump b/src/fdholder/deps-exe/s6-fdholder-transferdump
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholder-transferdump
+++ b/src/fdholder/deps-exe/s6-fdholder-transferdump
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/fdholder/deps-exe/s6-fdholderd b/src/fdholder/deps-exe/s6-fdholderd
index f3a3143..e678ba9 100644
--- a/src/fdholder/deps-exe/s6-fdholderd
+++ b/src/fdholder/deps-exe/s6-fdholderd
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/libs6/deps-exe/s6-ftrigrd b/src/libs6/deps-exe/s6-ftrigrd
index 4b86d93..e6238ab 100755
--- a/src/libs6/deps-exe/s6-ftrigrd
+++ b/src/libs6/deps-exe/s6-ftrigrd
@@ -2,4 +2,4 @@ ftrig1_free.o
ftrig1_make.o
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/libs6/deps-exe/s6lockd b/src/libs6/deps-exe/s6lockd
index 514c6a1..50e2fd6 100755
--- a/src/libs6/deps-exe/s6lockd
+++ b/src/libs6/deps-exe/s6lockd
@@ -1,4 +1,4 @@
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/pipe-tools/deps-exe/s6-ftrig-listen b/src/pipe-tools/deps-exe/s6-ftrig-listen
index 526bcb4..0a30526 100644
--- a/src/pipe-tools/deps-exe/s6-ftrig-listen
+++ b/src/pipe-tools/deps-exe/s6-ftrig-listen
@@ -2,5 +2,5 @@ ${LIBS6}
-lexecline
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/pipe-tools/deps-exe/s6-ftrig-listen1 b/src/pipe-tools/deps-exe/s6-ftrig-listen1
index 7a6675b..16eaae2 100644
--- a/src/pipe-tools/deps-exe/s6-ftrig-listen1
+++ b/src/pipe-tools/deps-exe/s6-ftrig-listen1
@@ -1,5 +1,5 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/pipe-tools/deps-exe/s6-ftrig-wait b/src/pipe-tools/deps-exe/s6-ftrig-wait
index 7a6675b..16eaae2 100644
--- a/src/pipe-tools/deps-exe/s6-ftrig-wait
+++ b/src/pipe-tools/deps-exe/s6-ftrig-wait
@@ -1,5 +1,5 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/supervision/deps-exe/s6-notifyoncheck b/src/supervision/deps-exe/s6-notifyoncheck
index 7a6675b..16eaae2 100644
--- a/src/supervision/deps-exe/s6-notifyoncheck
+++ b/src/supervision/deps-exe/s6-notifyoncheck
@@ -1,5 +1,5 @@
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/supervision/deps-exe/s6-permafailon b/src/supervision/deps-exe/s6-permafailon
index 077e863..b1e57e4 100644
--- a/src/supervision/deps-exe/s6-permafailon
+++ b/src/supervision/deps-exe/s6-permafailon
@@ -1,3 +1,3 @@
${LIBS6}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/supervision/deps-exe/s6-supervise b/src/supervision/deps-exe/s6-supervise
index 077e863..b1e57e4 100644
--- a/src/supervision/deps-exe/s6-supervise
+++ b/src/supervision/deps-exe/s6-supervise
@@ -1,3 +1,3 @@
${LIBS6}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
diff --git a/src/supervision/deps-exe/s6-svlisten b/src/supervision/deps-exe/s6-svlisten
index 6abe82c..fd153b3 100644
--- a/src/supervision/deps-exe/s6-svlisten
+++ b/src/supervision/deps-exe/s6-svlisten
@@ -4,5 +4,5 @@ ${LIBS6}
-lexecline
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/supervision/deps-exe/s6-svlisten1 b/src/supervision/deps-exe/s6-svlisten1
index 197b694..34cd163 100644
--- a/src/supervision/deps-exe/s6-svlisten1
+++ b/src/supervision/deps-exe/s6-svlisten1
@@ -3,5 +3,5 @@ s6_svlisten_loop.o
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/supervision/deps-exe/s6-svscan b/src/supervision/deps-exe/s6-svscan
index e4984c0..0b76878 100644
--- a/src/supervision/deps-exe/s6-svscan
+++ b/src/supervision/deps-exe/s6-svscan
@@ -1,4 +1,4 @@
${LIBS6}
-lskarnet
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}
diff --git a/src/supervision/deps-exe/s6-svwait b/src/supervision/deps-exe/s6-svwait
index ab449ac..cc72328 100644
--- a/src/supervision/deps-exe/s6-svwait
+++ b/src/supervision/deps-exe/s6-svwait
@@ -2,5 +2,5 @@ s6_svlisten_loop.o
${LIBS6}
-lskarnet
${SOCKET_LIB}
-${TAINNOW_LIB}
+${SYSCLOCK_LIB}
${SPAWN_LIB}