From 137a5f7975c452cbe1b607dbd1ffdf5727d61f30 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 12 Aug 2016 13:07:19 +0000
Subject:  Add spawn_lib support

---
 INSTALL                         |  6 +++---
 configure                       |  4 ++--
 doc/index.html                  |  8 ++++----
 doc/upgrade.html                | 11 +++++++++++
 package/deps.mak                |  4 ++--
 package/info                    |  2 +-
 src/s6-rc/deps-exe/s6-rc        |  1 +
 src/s6-rc/deps-exe/s6-rc-update |  1 +
 8 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/INSTALL b/INSTALL
index 67131db..2335357 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.3.10.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.1.5.0 or later: http://skarnet.org/software/execline/
-  - s6 version 2.3.0.0 or later: http://skarnet.org/software/s6/
+  - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/
+  - execline version 2.2.0.0 or later: http://skarnet.org/software/execline/
+  - s6 version 2.4.0.0 or later: http://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/configure b/configure
index da5007d..ea52cf9 100755
--- a/configure
+++ b/configure
@@ -295,7 +295,7 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
   exit 1
 fi
 
-rt_lib=$(cat $sysdeps/rt.lib)
+spawn_lib=$(cat $sysdeps/spawn.lib)
 socket_lib=$(cat $sysdeps/socket.lib)
 sysclock_lib=$(cat $sysdeps/sysclock.lib)
 tainnow_lib=$(cat $sysdeps/tainnow.lib)
@@ -371,7 +371,7 @@ sproot := $sproot
 version := $version
 home := $home
 exthome := $exthome
-RT_LIB := ${rt_lib}
+SPAWN_LIB := ${spawn_lib}
 SOCKET_LIB := ${socket_lib}
 SYSCLOCK_LIB := ${sysclock_lib}
 TAINNOW_LIB := ${tainnow_lib}
diff --git a/doc/index.html b/doc/index.html
index 59d8cb6..8974f2b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,11 +48,11 @@ scripts are also run in a controlled environment.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.10.0 or later </li>
+2.4.0.0 or later </li>
  <li> <a href="http://skarnet.org/software/execline/">execline</a> version
-2.1.5.0 or later </li>
+2.2.0.0 or later </li>
  <li> <a href="http://skarnet.org/software/s6/">s6</a> version
-2.3.0.0 or later </li>
+2.4.0.0 or later </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -66,7 +66,7 @@ scripts are also run in a controlled environment.
 
 <ul>
  <li> The current released version of s6-rc is
-<a href="s6-rc-0.0.3.0.tar.gz">0.0.3.0</a>. </li>
+<a href="s6-rc-0.1.0.0.tar.gz">0.1.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/">s6-rc
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 4f1bb4d..b134a14 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,17 @@
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.1.0.0 </h2>
+
+<ul>
+ <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.4.10.0. </li>
+ <li> <a href="http://skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.2.0.0. </li>
+ <li> <a href="http://skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.4.0.0. </li>
+</ul>
+
 <h2> in 0.0.3.0 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index 22fc20b..3e3938a 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -34,7 +34,7 @@ src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config
 libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o src/libs6rc/s6rc_servicedir_unsupervise.o
 libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet
 libs6rc.so.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo src/libs6rc/s6rc_servicedir_unsupervise.lo
-s6-rc: EXTRA_LIBS := ${TAINNOW_LIB}
+s6-rc: EXTRA_LIBS := ${TAINNOW_LIB} ${SPAWN_LIB}
 s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -lskarnet
 s6-rc-bundle: EXTRA_LIBS :=
 s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC} -lexecline -lskarnet
@@ -50,5 +50,5 @@ s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
 s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet
 s6-rc-oneshot-run: EXTRA_LIBS :=
 s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -lskarnet
-s6-rc-update: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-rc-update: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
 s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} -ls6 -lexecline -lskarnet
diff --git a/package/info b/package/info
index 43c7119..5ad973e 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.0.3.0
+version=0.1.0.0
 category=admin
 package_macro_name=S6RC
diff --git a/src/s6-rc/deps-exe/s6-rc b/src/s6-rc/deps-exe/s6-rc
index f95b7ab..0850117 100644
--- a/src/s6-rc/deps-exe/s6-rc
+++ b/src/s6-rc/deps-exe/s6-rc
@@ -1,3 +1,4 @@
 ${LIBS6RC}
 -lskarnet
 ${TAINNOW_LIB}
+${SPAWN_LIB}
diff --git a/src/s6-rc/deps-exe/s6-rc-update b/src/s6-rc/deps-exe/s6-rc-update
index bebbac1..8cc7a1e 100644
--- a/src/s6-rc/deps-exe/s6-rc-update
+++ b/src/s6-rc/deps-exe/s6-rc-update
@@ -4,3 +4,4 @@ ${LIBS6RC}
 -lskarnet
 ${TAINNOW_LIB}
 ${SOCKET_LIB}
+${SPAWN_LIB}
-- 
cgit v1.2.3