From bc81629c44b0083efa18ef11b653890a3c283645 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 26 Oct 2017 14:03:33 +0000
Subject:  Deprecate s6-uevent-*, prepare for 2.4.0.2

---
 INSTALL                           |  2 +-
 NEWS                              |  9 +++++++++
 doc/index.html                    | 10 ++++++----
 doc/s6-uevent-listener.html       | 16 ++++++++++++----
 doc/s6-uevent-spawner.html        |  9 ++++++++-
 doc/upgrade.html                  |  6 ++++++
 package/info                      |  2 +-
 src/minutils/s6-uevent-listener.c |  1 +
 src/minutils/s6-uevent-spawner.c  |  1 +
 9 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/INSTALL b/INSTALL
index 153cf8d..2d8d091 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.6.0.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.6.0.2 or later: http://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 3.5 or later.
diff --git a/NEWS b/NEWS
index 7f6c821..db36a8b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 Changelog for s6-linux-utils.
 
+In 2.4.0.2
+----------
+
+ - s6-logwatch rewrite.
+ - Better portability with old glibc versions.
+ - s6-uevent-listener and s6-uevent-spawner are marked as
+deprecated. (The mdevd package obsoletes them.)
+
+
 In 2.4.0.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index ab1a855..150bb22 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -34,7 +34,7 @@
 The Linux kernel must be 3.5 or later. </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.6.0.0 or later. It's a build-time requirement. It's also a run-time
+2.6.0.2 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>
@@ -50,7 +50,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.4.0.1.tar.gz">2.4.0.1</a>. </li>
+<a href="s6-linux-utils-2.4.0.2.tar.gz">2.4.0.2</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
 git repository</a>:
@@ -89,8 +89,8 @@ the previous versions of s6-linux-utils and the current one. </li>
 <ul>
 <li><a href="s6-chroot.html">The <tt>s6-chroot</tt> program</a></li>
 <li><a href="s6-devd.html">The <tt>s6-devd</tt> program</a></li>
-<li><a href="s6-uevent-listener.html">The <tt>s6-uevent-listener</tt> program</a></li>
-<li><a href="s6-uevent-spawner.html">The <tt>s6-uevent-spawner</tt> program</a></li>
+<li><a href="s6-uevent-listener.html">The <tt>s6-uevent-listener</tt> program</a> <strong>(deprecated)</strong></li>
+<li><a href="s6-uevent-spawner.html">The <tt>s6-uevent-spawner</tt> program</a> <strong>(deprecated)</strong></li>
 <li><a href="s6-fillurandompool.html">The <tt>s6-fillurandompool</tt> program</a></li>
 <li><a href="s6-freeramdisk.html">The <tt>s6-freeramdisk</tt> program</a></li>
 <li><a href="s6-hostname.html">The <tt>s6-hostname</tt> program</a></li>
@@ -121,6 +121,8 @@ instance:
 <ul>
  <li> <a href="http://busybox.net/">BusyBox</a> </li>
  <li> <a href="http://landley.net/code/toybox/">toybox</a> </li>
+ <li> <a href="https://core.suckless.org/sbase">sbase</a> and
+<a href="https://core.suckless.org/ubase">ubase</a> </li>
 </ul>
 
 <p>
diff --git a/doc/s6-uevent-listener.html b/doc/s6-uevent-listener.html
index 73bad1d..cd60639 100644
--- a/doc/s6-uevent-listener.html
+++ b/doc/s6-uevent-listener.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Language" content="en" />
     <title>s6-linux-utils: the s6-uevent-listener program</title>
     <meta name="Description" content="s6-linux-utils: the s6-uevent-listener program" />
-    <meta name="Keywords" content="s6 linux administration root utilities devd mdev udev s6-uevent-listener uevent" />
+    <meta name="Keywords" content="s6 linux administration root utilities devd mdev mdevd udev s6-uevent-listener uevent" />
     <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> -->
   </head>
 <body>
@@ -24,6 +24,14 @@
 its standard output, using a simple format.
 </p>
 
+<p>
+<strong>This program is deprecated</strong>, and will disappear in a
+near future version of s6-linux-utils. It has been replaced with the
+<a href="//skarnet.org/software/mdevd/mdevd-netlink.html">mdevd-netlink</a>
+program, from the <a href="//skarnet.org/software/mdevd/">mdevd</a>
+package.
+</p>
+
 <h2> Interface </h2>
 
 <pre>
@@ -38,7 +46,7 @@ null characters, so a terminal will not display them correctly. To
 properly use s6-uevent-listener, it should be piped into a handler
 program such as
 <a href="s6-uevent-spawner.html">s6-uevent-spawner</a>.
-<!-- or <a href="mdevd.html">mdevd</a>. --> </li>
+or <a href="//skarnet.org/software/mdevd/mdevd.html">mdevd</a>. </li>
  <li> s6-uevent-listener is a long-lived program.
 When it receives a SIGTERM, it stops listening; it will
 exit as soon as it has flushed its event queue to stdout. </li>
@@ -93,12 +101,12 @@ only program handling uevents, which means that
  <li> Examples of valid uses of s6-uevent-listener:
   <ul>
    <li> <tt>s6-uevent-listener | s6-uevent-spawner mdev</tt> </li>
-<!--   <li> <tt>s6-uevent-listener | mdevd</tt> </li> -->
+   <li> <tt>s6-uevent-listener | mdevd</tt> </li>
    <li> Those examples can be made safer by using a supervision system:
 under <a href="//skarnet.org/software/s6/">s6</a> or
 <a href="//skarnet.org/software/s6-rc/">s6-rc</a>, write a service
 pipeline where <tt>s6-uevent-listener</tt> is a producer and
-<tt>s6-uevent-spawner mdev</tt> <!-- or <tt>mdevd</tt> --> is a consumer. This
+<tt>s6-uevent-spawner mdev</tt> or <tt>mdevd</tt> is a consumer. This
 setup has the advantage, among others, that you can restart the netlink
 listener and the event handler separately. </li>
   </ul>
diff --git a/doc/s6-uevent-spawner.html b/doc/s6-uevent-spawner.html
index f7a9d7b..6f2ab87 100644
--- a/doc/s6-uevent-spawner.html
+++ b/doc/s6-uevent-spawner.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Language" content="en" />
     <title>s6-linux-utils: the s6-uevent-spawner program</title>
     <meta name="Description" content="s6-linux-utils: the s6-uevent-spawner program" />
-    <meta name="Keywords" content="s6 linux administration root utilities devd mdev udev hotplug" />
+    <meta name="Keywords" content="s6 linux administration root utilities devd mdev mdevd udev hotplug" />
     <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> -->
   </head>
 <body>
@@ -29,6 +29,13 @@ similarly to what the hotplug interface does.
 <a href="s6-uevent-listener.html">s6-uevent-listener</a>.
 </p>
 
+<p>
+<strong>This program is deprecated</strong>, and will disappear in a
+future version of s6-linux-utils. The
+<a href="//skarnet.org/software/mdevd/">mdevd</a> package makes it
+obsolete.
+</p>
+
 <h2> Interface </h2>
 
 <pre>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 9ff53c3..7899dac 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.4.0.2 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.6.0.2. </li>
+</ul>
+
 <h2> in 2.4.0.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 00d1937..58b78f4 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.4.0.1
+version=2.4.0.2
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/s6-uevent-listener.c b/src/minutils/s6-uevent-listener.c
index 4998cd9..4175b54 100644
--- a/src/minutils/s6-uevent-listener.c
+++ b/src/minutils/s6-uevent-listener.c
@@ -123,6 +123,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 {
   iopause_fd x[3] = { { .events = IOPAUSE_READ }, { .fd = 1 }, { .fd = 0 } } ;
   PROG = "s6-uevent-listener" ;
+  strerr_warnw1x("this program is deprecated, see https://skarnet.org/software/mdevd/") ;
   {
     unsigned int kbufsz = 65536 ;
     subgetopt_t l = SUBGETOPT_ZERO ;
diff --git a/src/minutils/s6-uevent-spawner.c b/src/minutils/s6-uevent-spawner.c
index f220d42..87dea11 100644
--- a/src/minutils/s6-uevent-spawner.c
+++ b/src/minutils/s6-uevent-spawner.c
@@ -187,6 +187,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
   char const *linevar = 0 ;
   stralloc sa = STRALLOC_ZERO ;
   PROG = "s6-uevent-spawner" ;
+  strerr_warnw1x("this program is deprecated, see https://skarnet.org/software/mdevd/") ;
   {
     subgetopt_t l = SUBGETOPT_ZERO ;
     for (;;)
-- 
cgit v1.2.3