diff options
Diffstat (limited to 'system/s6')
| -rw-r--r-- | system/s6/README | 32 | ||||
| -rw-r--r-- | system/s6/README.Slackware | 6 | ||||
| -rw-r--r-- | system/s6/s6.SlackBuild | 66 | ||||
| -rw-r--r-- | system/s6/s6.info | 8 |
4 files changed, 59 insertions, 53 deletions
diff --git a/system/s6/README b/system/s6/README index 2c7ec758e3..b7b7c8d67b 100644 --- a/system/s6/README +++ b/system/s6/README @@ -1,15 +1,13 @@ s6 is a small suite of programs for UNIX, designed to allow process -supervision (a.k.a service supervision), in the line of daemontools -and runit, as well as various operations on processes and daemons. It -is meant to be a toolbox for low-level process and service -administration, providing different sets of independent tools that can -be used within or without the framework, and that can be assembled -together to achieve powerful functionality with a very small amount of -code. +supervision (a.k.a service supervision), in the line of daemontools and +runit, as well as various operations on processes and daemons. It is +meant to be a toolbox for low-level process and service administration, +providing different sets of independent tools that can be used within or +without the framework, and that can be assembled together to achieve +powerful functionality with a very small amount of code. Examples of things you can do by assembling together several programs provided by s6 - besides process supervision: - - syslogd functionality, using much less resources than the traditional syslogd. - Reliable service readiness notification, which is the basis for @@ -21,14 +19,14 @@ provided by s6 - besides process supervision: without having to switch to any specific init system. NOTE: -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 -environment variable to the SlackBuild script like below: +environment variable to this SlackBuild script like below: BUILD_SHARED=yes ./s6.SlackBuild @@ -38,8 +36,10 @@ libraries and not the static ones, you can do something like: BUILD_SHARED=yes BUILD_STATIC=no ./s6.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.SlackBuild 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 b410f0fe57..a644b72fdd 100644 --- a/system/s6/s6.SlackBuild +++ b/system/s6/s6.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for s6 @@ -23,10 +23,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2: fix doc permissions. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=s6 -VERSION=${VERSION:-2.10.0.1} +VERSION=${VERSION:-2.12.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +41,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} @@ -55,28 +64,21 @@ 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} - -if [ "$BUILD_STATIC" = "no" ]; then - LIBS_CONF="--disable-static" -fi - -if [ "$BUILD_SHARED" = "yes" ]; then - LIBS_CONF="--enable-shared $LIBS_CONF" -fi - -# 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 +[ "$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. 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} - -if [ "$LINK_SHARED" = "yes" ]; then - LIBS_CONF="--disable-allstatic $LIBS_CONF" -fi +[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF" set -e @@ -89,9 +91,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" \ @@ -110,17 +112,21 @@ 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 +chmod -R -t 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/s6.info b/system/s6/s6.info index a0bc8d4347..5d6a2f186d 100644 --- a/system/s6/s6.info +++ b/system/s6/s6.info @@ -1,10 +1,10 @@ PRGNAM="s6" -VERSION="2.10.0.1" +VERSION="2.12.0.3" HOMEPAGE="https://skarnet.org/software/s6/" -DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.1.tar.gz" -MD5SUM="acc7c5cc1f100bd09e7efac7a30b06f4" +DOWNLOAD="https://skarnet.org/software/s6/s6-2.12.0.3.tar.gz" +MD5SUM="0af573a178274c16d1a22f2c0de51695" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="skalibs execline" +REQUIRES="execline" MAINTAINER="Muhammad Mahendra Subrata" EMAIL="mumahendras3@gmail.com" |