summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Muhammad Mahendra Subrata2022-02-12 11:12:52 +0100
committer Willy Sudiarto Raharjo2022-02-12 16:24:35 +0100
commit2a88d0b1fed1f7ad61d31e5b780c0de1968cd119 (patch)
tree6f6770d01a208fb5b22232438ac0d81e21dc2ac9
parentb45e080d1821714c8cc020cbd1edc35e3012ae66 (diff)
downloadslackbuilds-2a88d0b1fed1f7ad61d31e5b780c0de1968cd119.tar.gz
system/s6: Updated for version 2.11.0.1, move root-only binaries to /sbin
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/s6/README.Slackware6
-rw-r--r--system/s6/s6.SlackBuild14
-rw-r--r--system/s6/s6.info6
3 files changed, 15 insertions, 11 deletions
diff --git a/system/s6/README.Slackware b/system/s6/README.Slackware
index 5842f3888d..2034e10e98 100644
--- a/system/s6/README.Slackware
+++ b/system/s6/README.Slackware
@@ -4,7 +4,7 @@ init system:
I added the following to my /etc/inittab:
# S6
- sv:12345:respawn:/bin/s6-svscanboot
+ sv:12345:respawn:/sbin/s6-svscanboot
Then did a 'telinit q' to start it.
@@ -15,7 +15,7 @@ Note that the default s6-svscanboot provided disables polling
where /service is a directory that contains all the services that
s6 will supervise. You can change it to other places such as
-/etc/service, /var/service, etc. and edit the provided
-/bin/s6-svscanboot script to change the scan directory to the new
+/etc/service, /var/service, etc., and edit the provided
+/sbin/s6-svscanboot script to change the scan directory to the new
service directory (i.e. change /service in the script to the new service
directory).
diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild
index dcb7c62560..f41824641e 100644
--- a/system/s6/s6.SlackBuild
+++ b/system/s6/s6.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=s6
-VERSION=${VERSION:-2.10.0.3}
+VERSION=${VERSION:-2.11.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -120,10 +120,14 @@ make
make strip
make install DESTDIR=$PKG
-# Promote s6-svscanboot to /bin for users that want to use s6
-# alongside the system's default init system
-install examples/s6-svscanboot $PKG/bin
-sed -i 's|command|bin|g' $PKG/bin/s6-svscanboot
+# Move root-only programs to /sbin
+mkdir $PKG/sbin
+mv $PKG/bin/s6-{set,apply}uidgid $PKG/sbin
+
+# Promote s6-svscanboot to /sbin for users that want to use s6
+# alongside Slackware's default init system
+install examples/s6-svscanboot $PKG/sbin
+sed -i 's|command|bin|g' $PKG/sbin/s6-svscanboot
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING INSTALL NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/s6/s6.info b/system/s6/s6.info
index d17ff68653..aba76072c6 100644
--- a/system/s6/s6.info
+++ b/system/s6/s6.info
@@ -1,8 +1,8 @@
PRGNAM="s6"
-VERSION="2.10.0.3"
+VERSION="2.11.0.1"
HOMEPAGE="https://skarnet.org/software/s6/"
-DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.3.tar.gz"
-MD5SUM="c3956a7c46522e4eea3bf89634d29f88"
+DOWNLOAD="https://skarnet.org/software/s6/s6-2.11.0.1.tar.gz"
+MD5SUM="9c1013437a04daa4b5f3e8ed456ac2b6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="skalibs execline"