From 373368003fcb932c8654086fc66881ad34e4ced0 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 23 Dec 2025 08:36:34 +0000
Subject: releng fixes

---
 NEWS                               | 4 ++++
 doc/index.html                     | 2 +-
 src/daemontools-extras/s6-fghack.c | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index ee8eb51..0b007e0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,13 @@ In 2.14.0.0
 
  - Bugfixes.
  - Support for shared libraries on MacOS.
+ - New -m option to s6-accessrules-cdb-from-fs.
  - New Rperiod directive for s6-log periodic rotations.
  - s6-svc now accepts several service directory arguments.
  - s6-svc now exits 102 on unsupervised directory argument.
+ - New s6-background-watch binary, to counter auto-backgrounding.
+ - s6-fghack is now obsolescent.
+ - New -P prio option to s6-softlimit.
 
 
 In 2.13.2.0
diff --git a/doc/index.html b/doc/index.html
index 8d3ffa8..517c826 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -123,7 +123,7 @@ git repository</a>:
 <pre> git clone git://git.skarnet.org/s6 </pre> </li>
  <li> There's also a
 <a href="https://github.com/skarnet/s6">GitHub mirror</a>, or a
-<a href="<a href="https://git.sr.ht/~skarnet/s6">SourceHut mirror</a>">SourceHut mirror</a>
+<a href="https://git.sr.ht/~skarnet/s6">SourceHut mirror</a>
 of the s6 git repository. </li>
 </ul>
 
diff --git a/src/daemontools-extras/s6-fghack.c b/src/daemontools-extras/s6-fghack.c
index fec2962..ada2301 100644
--- a/src/daemontools-extras/s6-fghack.c
+++ b/src/daemontools-extras/s6-fghack.c
@@ -23,6 +23,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
 
   PROG = "s6-fghack" ;
   if (argc < 2) strerr_dieusage(100, USAGE) ;
+  strerr_warnw("this program is obsolescent, please use s6-background-watch instead") ;
   if (pipe(p) == -1) strerr_diefu1sys(111, "create hackpipe") ;
   for (size_t i = 0 ; i < N ; i++)
     fds[i] = dup(p[1]) ;
-- 
cgit v1.3.1