diff options
Diffstat (limited to 'network/open-isns')
-rw-r--r-- | network/open-isns/doinst.sh | 13 | ||||
-rw-r--r-- | network/open-isns/open-isns.SlackBuild | 22 | ||||
-rw-r--r-- | network/open-isns/open-isns.info | 6 |
3 files changed, 25 insertions, 16 deletions
diff --git a/network/open-isns/doinst.sh b/network/open-isns/doinst.sh index 8fad217bd6..ffe6583a67 100644 --- a/network/open-isns/doinst.sh +++ b/network/open-isns/doinst.sh @@ -1,17 +1,18 @@ +# 20230620 bkw: Please stick with the config() from our template. config() { - NEW="${1}.new" - OLD="$1" + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; then + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/isns/isnsd.conf -config etc/isns/isnsdd.conf -config etc/isns/isnsadm.conf +config etc/isns/isnsd.conf.new +config etc/isns/isnsdd.conf.new +config etc/isns/isnsadm.conf.new diff --git a/network/open-isns/open-isns.SlackBuild b/network/open-isns/open-isns.SlackBuild index 8aa11e23d4..93207785d0 100644 --- a/network/open-isns/open-isns.SlackBuild +++ b/network/open-isns/open-isns.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for open-isns # Copyright 2019 Wayne Cuddy USA +# Copyright 2021 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,13 @@ # 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) + PRGNAM=open-isns -VERSION=${VERSION:-0.99} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.101} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +39,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} @@ -65,9 +73,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" \ @@ -114,4 +122,4 @@ mkdir -p $PKG/etc/rc.d cp $CWD/rc.isnsd $CWD/rc.isnsdd $PKG/etc/rc.d 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/network/open-isns/open-isns.info b/network/open-isns/open-isns.info index 49ce2080f5..36f15a044e 100644 --- a/network/open-isns/open-isns.info +++ b/network/open-isns/open-isns.info @@ -1,8 +1,8 @@ PRGNAM="open-isns" -VERSION="0.99" +VERSION="0.101" HOMEPAGE="https://github.com/open-iscsi/open-isns" -DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.99/open-isns-0.99.tar.gz" -MD5SUM="512413a285c852195b6240d6a0ad7f5b" +DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.101/open-isns-0.101.tar.gz" +MD5SUM="bd017a07d685b9c87e0da29fc3f899a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |