summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-11-27 12:56:38 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-11-27 12:56:38 +0000
commit50c4f63b8bc902fb581bd6171b2b51952a225b73 (patch)
tree0577bb0e8fc3807a0da356f7d658a055ac36529d
parent73afe31703da94ff099b3615db532f912ed85d86 (diff)
downloads6-rc-50c4f63b8bc902fb581bd6171b2b51952a225b73.tar.xz
Update dependencies, get ready for master merge
-rw-r--r--.gitignore4
-rw-r--r--INSTALL6
-rw-r--r--doc/index.html6
-rw-r--r--doc/upgrade.html6
4 files changed, 13 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 43c0f2b..9713499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
*.lo
/config.mak
/src/include/s6-rc/config.h
-/libs6rc.a.xyzzy
-/libs6rc.so.xyzzy
+/*.a.xyzzy
+/*.so.xyzzy
/s6-rc-compile
/s6-rc-dryrun
/s6-rc-db
diff --git a/INSTALL b/INSTALL
index f6f7f2a..7087420 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.6.1.0 or later: http://skarnet.org/software/skalibs/
- - execline version 2.3.0.3 or later: http://skarnet.org/software/execline/
- - s6 version 2.6.1.1 or later: http://skarnet.org/software/s6/
+ - skalibs version 2.6.2.0 or later: http://skarnet.org/software/skalibs/
+ - execline version 2.3.0.4 or later: http://skarnet.org/software/execline/
+ - s6 version 2.6.2.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/doc/index.html b/doc/index.html
index 5f1b401..fbb14ca 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="//skarnet.org/software/skalibs/">skalibs</a> version
-2.6.1.0 or later </li>
+2.6.2.0 or later </li>
<li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.3.0.3 or later </li>
+2.3.0.4 or later </li>
<li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.6.1.1 or later </li>
+2.6.2.0 or later </li>
</ul>
<h3> Licensing </h3>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 444b763..dda40c4 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -34,7 +34,11 @@ minor and bugfix version changes.
<ul>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
-dependency bumped to 2.6.1.0. </li>
+dependency bumped to 2.6.2.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.3.0.4. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.6.2.0. </li>
<li> <a href="s6-rc-compile.html">s6-rc-compile</a> now
accepts multiple lines in a <tt>consumer-for</tt> file: a
longrun can now have multiple producers, which means that