From d73a8330016fbf172f8e3521b879502b9139a970 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 14 Jan 2015 00:48:32 +0000
Subject:  - Parallel build fix  - Complete readiness notification via
 supervise/ready  - Version updated to 2.0.1.0, release candidate

---
 src/daemontools-extras/deps-exe/s6-notifywhenup |  2 +-
 src/daemontools-extras/s6-notifywhenup.c        |  5 +++++
 src/daemontools-extras/s6-setuidgid.c           | 30 +++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/daemontools-extras')

diff --git a/src/daemontools-extras/deps-exe/s6-notifywhenup b/src/daemontools-extras/deps-exe/s6-notifywhenup
index 58a34e0..077e863 100644
--- a/src/daemontools-extras/deps-exe/s6-notifywhenup
+++ b/src/daemontools-extras/deps-exe/s6-notifywhenup
@@ -1,3 +1,3 @@
--ls6
+${LIBS6}
 -lskarnet
 ${TAINNOW_LIB}
diff --git a/src/daemontools-extras/s6-notifywhenup.c b/src/daemontools-extras/s6-notifywhenup.c
index 37f6de1..e1c02b7 100644
--- a/src/daemontools-extras/s6-notifywhenup.c
+++ b/src/daemontools-extras/s6-notifywhenup.c
@@ -11,6 +11,7 @@
 #include <skalibs/iopause.h>
 #include <skalibs/djbunix.h>
 #include <s6/ftrigw.h>
+#include <s6/s6-supervise.h>
 
 #define USAGE "s6-notifywhenup [ -d fd ] [ -e fifodir ] [ -f ] [ -t timeout ] prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
@@ -36,6 +37,10 @@ static int run_child (int fd, char const *fifodir, unsigned int timeout)
     else if (r)
       if (byte_chr(dummy, r, '\n') < r) break ;
   }
+  close(fd) ;
+  fd = open_create(S6_SUPERVISE_READY_FILENAME) ;
+  if (fd < 0) strerr_warnwu1sys("touch " S6_SUPERVISE_READY_FILENAME) ;
+  else close(fd) ;
   ftrigw_notify(fifodir, 'U') ;
   return 0 ;
 }
diff --git a/src/daemontools-extras/s6-setuidgid.c b/src/daemontools-extras/s6-setuidgid.c
index d2e7361..cc7f21a 100644
--- a/src/daemontools-extras/s6-setuidgid.c
+++ b/src/daemontools-extras/s6-setuidgid.c
@@ -1,30 +1,26 @@
 /* ISC license. */
 
-#include <unistd.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/uint.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/djbunix.h>
+#include <s6/config.h>
 
 #define USAGE "s6-setuidgid username prog..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 int main (int argc, char const *const *argv, char const *const *envp)
 {
-  unsigned int pos ;
+  char const *newargv[argc + 4] ;
+  unsigned int m = 5 ;
   PROG = "s6-setuidgid" ;
   if (argc < 3) dieusage() ;
-  pos = str_chr(argv[1], ':') ;
-  if (argv[1][pos])
-  {
-    unsigned int uid = 0, gid = 0, len = uint_scan(argv[1], &uid) ;
-    if (len != pos) dieusage() ;
-    if (argv[1][pos+1] && !uint0_scan(argv[1]+pos+1, &gid)) dieusage() ;
-    if (gid && setgid(gid)) strerr_diefu1sys(111, "setgid") ;
-    if (uid && setuid(uid)) strerr_diefu1sys(111, "setuid") ;
-  }
-  else if (!prot_setuidgid(argv[1]))
-    strerr_diefu2sys(111, "change identity to ", argv[1]) ;
-  pathexec_run(argv[2], argv+2, envp) ;
-  strerr_dieexec(111, argv[2]) ;
+  argv++ ;
+  newargv[0] = S6_BINPREFIX "s6-envuidgid" ;
+  newargv[1] = *argv++ ;
+  newargv[2] = S6_BINPREFIX "s6-applyuidgid" ;
+  newargv[3] = "-Uz" ;
+  newargv[4] = "--" ;
+  while (*argv) newargv[m++] = *argv++ ;
+  newargv[m++] = 0 ;
+  pathexec_run(newargv[0], newargv, envp) ;
+  strerr_dieexec(111, newargv[0]) ;
 }
-- 
cgit v1.2.3