9 files changed, 13 insertions, 76 deletions
diff --git a/INSTALL b/INSTALL
index fd9f3d1..641c8f9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.1.0.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.3.1.0 or later: http://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.32 or later.
diff --git a/doc/index.html b/doc/index.html
index ca9721c..a899be8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -32,7 +32,9 @@
  <li> A Linux-based system with a standard C development environment </li>
  <li> GNU make, version 4.0 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.1.0.0 or later </li>
+2.3.1.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. </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -45,7 +47,7 @@
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6-linux-utils is <a href="s6-linux-utils-2.0.0.1.tar.gz">2.0.0.1</a>. </li>
+ <li> The current released version of s6-linux-utils is <a href="s6-linux-utils-2.0.1.0.tar.gz">2.0.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6-linux-utils git repository:
 <pre> git clone git://git.skarnet.org/s6-linux-utils </pre> </li>
 </ul>
@@ -79,7 +81,6 @@ the previous versions of s6-linux-utils and the current one. </li>
 <li><a href="s6-devd.html">The <tt>s6-devd</tt> program</a></li>
 <li><a href="s6-freeramdisk.html">The <tt>s6-freeramdisk</tt> program</a></li>
 <li><a href="s6-halt.html">The <tt>s6-halt</tt> program</a></li>
-<li><a href="s6-hiercopy.html">The <tt>s6-hiercopy</tt> program</a></li>
 <li><a href="s6-hostname.html">The <tt>s6-hostname</tt> program</a></li>
 <li><a href="s6-logwatch.html">The <tt>s6-logwatch</tt> program</a></li>
 <li><a href="s6-mount.html">The <tt>s6-mount</tt> program</a></li>
diff --git a/doc/s6-hiercopy.html b/doc/s6-hiercopy.html
deleted file mode 100644
index e8dd2ed..0000000
--- a/doc/s6-hiercopy.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta http-equiv="Content-Language" content="en" />
-    <title>s6-linux-utils: the s6-hiercopy program</title>
-    <meta name="Description" content="s6-linux-utils: the s6-hiercopy program" />
-    <meta name="Keywords" content="s6 linux administration root utilities hiercopy cp -a" />
-    <!-- <link rel="stylesheet" type="text/css" href="http://skarnet.org/default.css" /> -->
-  </head>
-<body>
-
-<p>
-<a href="index.html">s6-linux-utils</a><br />
-<a href="http://skarnet.org/software/">Software</a><br />
-<a href="http://skarnet.org/">skarnet.org</a>
-</p>
-
-<h1> The <tt>s6-hiercopy</tt> program </h1>
-
-<p>
-<tt>s6-hiercopy</tt> copies a directory structure recursively.
-</p>
-
-<h2> Interface </h2>
-
-<pre>
-     s6-hiercopy <em>source</em> <em>destination</em>
-</pre>
-
-<ul>
- <li> <tt>s6-hiercopy</tt> recursively copies <em>source</em> to
-<em>destination</em>, which is created if it doesn't exist.
-The permissions are preserved. The owner and group are preserved
-if the user is the superuser. </li>
- <li> It exits 0 on success and 111 on temporary failure. </li>
-</ul>
-
-<h2> Notes </h2>
-
-<p>
- Copying files and browsing through directories is one of Unix's
-weakest points, and <tt>s6-hiercopy</tt> is not meant to work around
-the problem; it's only a quick hack that I needed to boot my embedded
-platform. I originally planned to write the ultimate <tt>cp</tt> utility,
-portable and reliable and featureful and everything - while needing
-approximately a hundred times less resources than GNU <tt>cp</tt> does,
-of course. But I eventually dropped the idea: it's just impossible to
-design, much less write, such a utility.
-</p>
-
-<ul>
- <li> You can't make it portable because there's no universal standard.
-There is no portable way of creating device special files, for instance.
-So <tt>s6-hiercopy</tt> appears here instead of in
-<a href="http://skarnet.org/software/s6-portable-utils/">s6-portable-utils</a>:
-the platform where I needed that kind of tool is Linux. </li>
- <li> You can't make it reliable because Unix's set of filesystem
-management primitives is just too weak. It lacks a lot of atomic
-operations, and filesystem transactions. As a result, <tt>s6-hiercopy</tt>
-is a walking race condition and should <strong>absolutely not</strong>
-be considered instant when used in a multitasking environment.
-But then, <tt>cp -a</tt> shouldn't either. </li>
-</ul>
-
-</body>
-</html>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 8878eb9..b9dcfeb 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -17,6 +17,13 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.0.1.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.3.1.0 </li>
+ <li> s6-hiercopy removed. (Moved to s6-portable-utils.) </li>
+</ul>
+
 <h2> in 2.0.0.1 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index 50629e5..c85b123 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -33,8 +33,6 @@ s6-freeramdisk: private EXTRA_LIBS :=
 s6-freeramdisk: src/minutils/s6-freeramdisk.o -lskarnet
 s6-halt: private EXTRA_LIBS :=
 s6-halt: src/minutils/s6-halt.o -lskarnet
-s6-hiercopy: private EXTRA_LIBS :=
-s6-hiercopy: src/minutils/s6-hiercopy.o -lskarnet
 s6-hostname: private EXTRA_LIBS :=
 s6-hostname: src/minutils/s6-hostname.o -lskarnet
 s6-logwatch: private EXTRA_LIBS :=
diff --git a/package/info b/package/info
index 298650d..f55a688 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.0.0.1
+version=2.0.1.0
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/package/modes b/package/modes
index fddaa83..9a1c3b1 100644
--- a/package/modes
+++ b/package/modes
@@ -2,7 +2,6 @@ s6-chroot	0700
 s6-devd		0700
 s6-freeramdisk	0700
 s6-halt		0700
-s6-hiercopy	0755
 s6-hostname	0755
 s6-logwatch	0755
 s6-mount	0700
diff --git a/package/targets.mak b/package/targets.mak
index a1988cf..f03db13 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -3,7 +3,6 @@ s6-chroot \
 s6-devd \
 s6-freeramdisk \
 s6-halt \
-s6-hiercopy \
 s6-hostname \
 s6-logwatch \
 s6-mount \
diff --git a/src/minutils/deps-exe/s6-hiercopy b/src/minutils/deps-exe/s6-hiercopy
deleted file mode 100644
index e7187fe..0000000
--- a/src/minutils/deps-exe/s6-hiercopy
+++ /dev/null
@@ -1 +0,0 @@
--lskarnet