3 files changed, 49 insertions, 30 deletions
diff --git a/system/s6-rc/README b/system/s6-rc/README
index fcc650f1d7..b6c9809096 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,8 +34,10 @@ 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
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./s6-rc.SlackBuild
diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild
index 8a472ef5c1..a2b55021de 100644
--- a/system/s6-rc/s6-rc.SlackBuild
+++ b/system/s6-rc/s6-rc.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for s6-rc
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions
+# Note: ignore sbopkglint complaints about empty files in the doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=s6-rc
-VERSION=${VERSION:-0.5.2.1}
+VERSION=${VERSION:-0.5.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,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
@@ -83,9 +97,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -106,12 +120,15 @@ make
 make strip
 make install DESTDIR=$PKG
 
+# 20220414 bkw: wtf, sticky and setgid dirs in 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 INSTALL NEWS README doc examples $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
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info
index d5fa325138..0e785d043d 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.2.1"
+VERSION="0.5.4.2"
 HOMEPAGE="https://skarnet.org/software/s6-rc/"
-DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.1.tar.gz"
-MD5SUM="0fbee215343fda8ccdfcc4c9817d18ff"
+DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.4.2.tar.gz"
+MD5SUM="c3c36ab55d340e4146d459b9abcc766a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="s6"