system/s6-rc: Updated for version 0.5.3.2, removed sticky and setgid bits from `examples` and its subdirectories, general fixups/cleanups

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 29 insertions, 25 deletions

diff --git a/system/s6-rc/README b/system/s6-rc/README
index fcc650f1d71f7..8ba01321b1822 100644
--- a/system/s6-rc/README
+++ b/system/s6-rc/README
@@ -8,23 +8,23 @@ controlled environment.
 NOTE:
 s6-rc has a "live directory" where it puts some internal files that are
 needed at runtime, which defaults to /run/s6-rc. This can be changed to
-other directory by passing LIVE_DIR=/path/to/directory environment
-variable to the SlackBuild script like below:
+another directory by passing LIVE_DIR=/path/to/directory environment
+variable to this SlackBuild script like below:
 
     LIVE_DIR=/path/to/directory ./s6-rc.SlackBuild
 
-Make sure /path/to/directory is readable and writable by s6-rc or it
+Make sure /path/to/directory is readable and writable by s6-rc, or it
 will not work correctly. A good recommendation is to put the live
-directory inside a RAM filesystem (e.g. tmpfs).
+directory inside a RAM filesystem (e.g., tmpfs).
 
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
 
 If you want to also build the shared libraries, pass BUILD_SHARED=yes to
-the SlackBuild script like below:
+the script like below:
 
     BUILD_SHARED=yes ./s6-rc.SlackBuild
 
@@ -34,7 +34,7 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./s6-rc.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild
index 383a70b0dc155..846a37b6f0711 100644
--- a/system/s6-rc/s6-rc.SlackBuild
+++ b/system/s6-rc/s6-rc.SlackBuild
@@ -29,8 +29,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=s6-rc
-VERSION=${VERSION:-0.5.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.5.3.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -65,22 +65,25 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
 [ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
 [ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
 [ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
-# /run/s6-rc is the default live directory, pass LIVE_DIR=/path/to/directory to this script to change it
-# make sure /path/to/directory is readable and writable by s6-rc or it will not work correctly
+# The default s6-rc live directory is /run/s6-rc. Pass
+# LIVE_DIR=/path/to/directory to this script to change it (make sure
+# /path/to/directory is readable and writable by s6-rc).
 LIVE_DIR=${LIVE_DIR:-/run/s6-rc}
 
 set -e
@@ -118,7 +121,8 @@ make strip
 make install DESTDIR=$PKG
 
 # 20220414 bkw: wtf, sticky and setgid dirs in doc.
-chmod -R -t,a-s doc
+# 20220615 mumahendras3: remove sticky and setgid bits from examples too
+chmod -R -t,a-s doc examples
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info
index 284a8a9125633..a950acf1d0477 100644
--- a/system/s6-rc/s6-rc.info
+++ b/system/s6-rc/s6-rc.info
@@ -1,8 +1,8 @@
 PRGNAM="s6-rc"
-VERSION="0.5.3.1"
+VERSION="0.5.3.2"
 HOMEPAGE="https://skarnet.org/software/s6-rc/"
-DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.3.1.tar.gz"
-MD5SUM="61980ea1dd9703a2c539b89d68e81f67"
+DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.3.2.tar.gz"
+MD5SUM="30395a4bfaea2b1720765b087a0d7aa9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"