summaryrefslogtreecommitdiffstats
path: root/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
diff options
context:
space:
mode:
author Philip Lacroix2015-04-29 16:33:27 +0200
committer Willy Sudiarto Raharjo2015-04-29 16:33:27 +0200
commit1b6e3e199819f8db59da7a168cf0f2560df8a0ae (patch)
tree4528021c1106cc2dc5edfa72b27ffe76e3807f95 /network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
parent0af17d28124558254094dffcf037056379db6e05 (diff)
downloadslackbuilds-1b6e3e199819f8db59da7a168cf0f2560df8a0ae.tar.gz
network/arno-iptables-firewall: Fix source naming.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild')
-rw-r--r--network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild19
1 files changed, 13 insertions, 6 deletions
diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index dd26d5775d..4c29a237a0 100644
--- a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
+++ b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for arno-iptables-firewall
-# Copyright 2013-2014 Philip Lacroix <philnx at posteo dot de>
+# Copyright 2013-2015 Philip Lacroix <philnx at posteo dot de>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@
PRGNAM=arno-iptables-firewall
SRCNAM=aif
VERSION=${VERSION:-2.0.1e}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -42,7 +42,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz
+
+# The upstream tarball will be named differently, depending on
+# the file being downloaded manually (web browser) or with wget.
+if [ -e $CWD/$VERSION.tar.gz ]; then
+ tar xvzf $CWD/$VERSION.tar.gz
+else
+ tar xvzf $CWD/$SRCNAM-$VERSION.tar.gz
+fi
cd $SRCNAM-$VERSION
chown -R root:root .
@@ -107,9 +114,9 @@ cp -a ./share/$PRGNAM/* $PRGSHR/
cp -a $PRGETC/firewall.conf.new $PRGSHR/firewall.conf.orig
ln -sv /usr/share/$PRGNAM/plugins/traffic-accounting-show $PRGBIN/
-# Install startup script and set permissions; apply patch to fix path
-# to the executable file and make comments more consistent with the
-# Slackware system.
+# Install startup script and set permissions; apply patch to fix the
+# path to the executable file and make comments more consistent with
+# the Slackware system.
install -m 0644 -D ./etc/init.d/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
patch $PKG/etc/rc.d/rc.$PRGNAM < $CWD/files/patch-startup-script.diff