aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThales A. Tsailas <ttsailas@enforcingit.com>2010-05-12 17:43:32 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-12 17:43:32 +0200
commit6afd509ba0e456b3df5fce759715dca8cb742b66 (patch)
tree4dfbd5fdfe63bb21244c20a7519203e8122bb4f0
parent16c880a35c52c1ebaea5802b66027b0bc304101b (diff)
network/iscsitarget: Updated for version 0.4.17
-rw-r--r--network/iscsitarget/doinst.sh11
-rw-r--r--network/iscsitarget/iscsitarget.SlackBuild65
-rw-r--r--network/iscsitarget/iscsitarget.info8
3 files changed, 36 insertions, 48 deletions
diff --git a/network/iscsitarget/doinst.sh b/network/iscsitarget/doinst.sh
index 89debfb1e38c0..e02c47b197eb1 100644
--- a/network/iscsitarget/doinst.sh
+++ b/network/iscsitarget/doinst.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
config() {
NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -21,10 +20,10 @@ else
# Install executable otherwise - irrelevant unless user starts in rc.local
chmod 0755 etc/rc.d/rc.iscsi-target.new
fi
-
config etc/rc.d/rc.iscsi-target.new
+config etc/initiators.deny.new
+config etc/initiators.allow.new
+config etc/ietd.conf.new
+
+chroot . depmod -a 2>/dev/null 1>/dev/null
-if [ -x /sbin/depmod ]; then
-echo -e "Updating modules..."
-depmod -a
-fi
diff --git a/network/iscsitarget/iscsitarget.SlackBuild b/network/iscsitarget/iscsitarget.SlackBuild
index 5d78da2be02cf..d055a6c644a02 100644
--- a/network/iscsitarget/iscsitarget.SlackBuild
+++ b/network/iscsitarget/iscsitarget.SlackBuild
@@ -4,16 +4,13 @@
# Written by Thales A. Tsailas <ttsailas@enforcingit.com>
-# Exit on most errors
-set -e
-set -x
-# Definitions
PRGNAM=iscsitarget
-VERSION=0.4.16
+VERSION=0.4.17
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
-TAG=${TAG:_SBo}
-kernel=$(uname -r)
+TAG=${TAG:-_SBo}
+
+kernel=${kernel:-$(uname -r)}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
@@ -28,61 +25,53 @@ elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $TMP/$PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
-make KERNELSRC=/lib/modules/$kernel/build
-
-install -d $PKG/etc/rc.d/
-install -d $PKG/usr/man/man8/
-install -d $PKG/usr/man/man5/
-make install KERNELSRC=/lib/modules/$kernel/build DISTDIR=$PKG/
-install -m 644 -D etc/ietd.conf $PKG/etc/ietd.conf
-install -m 644 -D etc/initiators.allow $PKG/etc/initiators.allow
-install -m 644 -D etc/initiators.deny $PKG/etc/initiators.deny
-install -m 644 -D doc/manpages/ietd.8 $PKG/usr/man/man8/ietd.8
-install -m 644 -D doc/manpages/ietd.conf.5 $PKG/usr/man/man5/ietd.conf.5
-
-# Rename the init script to something Slackware compatible:
+make \
+ MANDIR=/usr/man \
+ DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+ KSRC=/lib/modules/$kernel/build
+make install \
+ MANDIR=/usr/man \
+ DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+ KSRC=/lib/modules/$kernel/build \
+ DISTDIR=$PKG
+
+# Rename init script and don't clobber existing config files on upgrade
mv $PKG/etc/rc.d/iscsi-target $PKG/etc/rc.d/rc.iscsi-target.new
+mv $PKG/etc/initiators.deny $PKG/etc/initiators.deny.new
+mv $PKG/etc/initiators.allow $PKG/etc/initiators.allow.new
+mv $PKG/etc/ietd.conf $PKG/etc/ietd.conf.new
-## Revert to Slack Default folders and naming
-mv $PKG/usr/share/doc $PKG/usr/doc
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share
+# Add the build script to the docs
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
+# Remove some cruft that shouldn't be in the package
+# (if I'm wrong, let me know) --rworkman
+rm -f $PKG/lib/modules/$kernel/modules*
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
)
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
find . -type f -exec gzip -9 {} \;
for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
)
-
-# Set correct permissions
-( cd $PKG
- find . -perm 444 -exec chmod 0644 {} \;
- find . -perm 555 -exec chmod 0755 {} \;
-)
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-set +x
diff --git a/network/iscsitarget/iscsitarget.info b/network/iscsitarget/iscsitarget.info
index 233a91008f0e1..4f20485b4dc7e 100644
--- a/network/iscsitarget/iscsitarget.info
+++ b/network/iscsitarget/iscsitarget.info
@@ -1,8 +1,8 @@
PRGNAM="iscsitarget"
-VERSION="0.4.16"
+VERSION="0.4.17"
HOMEPAGE="http://iscsitarget.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/iscsitarget/iscsitarget-0.4.16.tar.gz"
-MD5SUM="c7ea3192f1717b40e4c483c9d630082d"
+DOWNLOAD="http://downloads.sourceforge.net/iscsitarget/iscsitarget-0.4.17.tar.gz"
+MD5SUM="e79b437695fc50e7d054631855a16b1b"
MAINTAINER="Thales A. Tsailas"
EMAIL="ttsailas@enforcingit.com"
-APPROVED="David Somero" \ No newline at end of file
+APPROVED="rworkman"