From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/a/sysvinit-functions/slack-desc | 8 ++++---- .../sysvinit-functions.SlackBuild | 23 +++++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'source/a/sysvinit-functions') diff --git a/source/a/sysvinit-functions/slack-desc b/source/a/sysvinit-functions/slack-desc index 7d8e6182f..1d7d98711 100644 --- a/source/a/sysvinit-functions/slack-desc +++ b/source/a/sysvinit-functions/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| sysvinit-functions: sysvinit-functions (/etc/init.d/functions) sysvinit-functions: sysvinit-functions: This is the /etc/init.d/functions file, the typical sysvinit-style -sysvinit-functions: directories, and a few supporting binaries. Using this system, +sysvinit-functions: directories, and a few supporting binaries. Using this system, sysvinit-functions: subdirectories of /etc/rc.d/ are searched for scripts (which are sysvinit-functions: usually symlinks to the script in /etc/init.d/ or /etc/rc.d/init.d/). sysvinit-functions: The links must start with S to start a script or K to stop (kill) it. diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild index 909f8320e..a6a81ab1e 100755 --- a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild +++ b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,21 +20,30 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) +PKGNAM=sysvinit-functions VERSION=${VERSION:-8.53} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-sysvinit-functions @@ -57,10 +66,10 @@ rm -rf function-src-$VERSION # A small patch was applied to initlog to shut it the %^@& up. tar xjf $CWD/function-src-$VERSION.tar.bz2 || exit 1 cd function-src-$VERSION -make +make || exit 1 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/bin $PKG/sbin $PKG/usr/man/man{1,8} -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 gzip -9 $PKG/usr/man/man?/*.? # The FHS/LSB is a little bit unclear as to what to do here -- -- cgit v1.2.3