network/arno-iptables-firewall: Updated for version 2.0.1e.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 19 insertions, 16 deletions

diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild
index 6be33adc91..a3fbecded7 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 bluebottle dot com>
+# Copyright 2013-2014 Philip Lacroix <philnx at posteo at de>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 # Thanks to Matteo Bernardini and Robby Workman for their valuable remarks.
 
 PRGNAM=arno-iptables-firewall
-VERSION=${VERSION:-2.0.1d}
+VERSION=${VERSION:-2.0.1e}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -39,10 +39,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM\_$VERSION
-tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz
+rm -rf aif-$VERSION
+tar xvf $CWD/$VERSION.tar.gz
 
-cd $PRGNAM\_$VERSION
+cd aif-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,19 +64,22 @@ cp -a ./bin/arno-fwfilter $PRGBIN/
 
 # Patch the configuration script. We need this in order to be able to
 # run the script from outside the source directory as well. We're going
-# to (1) change from relative to absolute the path to the environment
+# to (1) change from relative to absolute the paths to the environment
 # file and firewall executable; (2) rename and change the path to the
 # startup script (this is for better consistency with Slackware's init
 # system); (3) change the path to the unmodified copy of the config
 # file, needed to check for existing custom setups. We will NOT create
 # a Slackware-compliant /etc/rc.d/rc.firewall symlink to the startup
 # script, as this should be done manually by the sysadmin. We won't 
-# create any SystemV-style symlinks either. Finally (4) we append the
-# note, picked from the original installation script and slightly
-# enhanced, that will be shown to the user when configuration is done
-# (this is to inform that an rc.firewall symlink has to be created in
-# order to start up the firewall at boot-time in a proper way).
-patch $PRGBIN/$PRGNAM-configure < $CWD/patch-configuration-script.diff
+# create any SystemV-style symlinks either. (4) We will allow the script
+# to be run correctly more than once, by removing previously set values
+# if no value is entered: this is to prevent e.g. ports from remaining
+# open, or internal interfaces from remaining enabled with NAT. Finally
+# (5) we append the note, picked from the original installation script
+# and slightly enhanced, that the user will see when configuration is
+# done: this is to inform that an rc.firewall symlink has to be created
+# in order to start up the firewall at boot-time in a proper way.
+patch $PRGBIN/$PRGNAM-configure < $CWD/files/patch-configuration-script.diff
 
 # Copy and compress man pages
 mkdir -p $PRGMAN
@@ -87,8 +90,8 @@ find $PRGMAN -type f -exec gzip -9 {} \;
 # in order to fix paths; set permissions.
 mkdir -p $PRGETC/conf.d
 cp -a ./etc/$PRGNAM/* $PRGETC/
-cat $CWD/conf.d.readme > $PRGETC/conf.d/README
-patch $PRGETC/firewall.conf < $CWD/patch-configuration-file.diff
+cat $CWD/files/conf.d.readme > $PRGETC/conf.d/README
+patch $PRGETC/firewall.conf < $CWD/files/patch-configuration-file.diff
 for conf in $( find $PRGETC -type f -not -name README ); do
   mv ${conf} ${conf}.new
   chmod 600 ${conf}.new
@@ -107,10 +110,10 @@ ln -sv /usr/share/$PRGNAM/plugins/traffic-accounting-show $PRGBIN/
 # Slackware system.
 mkdir -p $PKG/etc/rc.d/
 install -m 0644 ./etc/init.d/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
-patch $PKG/etc/rc.d/rc.$PRGNAM < $CWD/patch-startup-script.diff
+patch $PKG/etc/rc.d/rc.$PRGNAM < $CWD/files/patch-startup-script.diff
 
 # Copy documentation, include third-party sample files.
-mkdir -p $PRGDOC/contrib $PKG/usr/doc
+mkdir -p $PRGDOC/contrib
 for doc in README CHANGELOG gpl_license.txt ; do
   cp -a ./${doc} $PRGDOC/
 done