From d3ba2890319099f07c2b631bafd4d9ff4b51b25f Mon Sep 17 00:00:00 2001
From: ArTourter
Date: Thu, 13 May 2010 00:38:13 +0200
Subject: network/shorewall6: Updated for version 4.4.7

---
 network/shorewall6/shorewall6.SlackBuild | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'network/shorewall6/shorewall6.SlackBuild')

diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index ea378606b4..02602c2773 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -1,4 +1,5 @@
 #!/bin/sh
+# vim: et ts=2 sw=2
 
 # Slackware build script for shorewall-common
 
@@ -23,12 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall6
-VERSION=${VERSION:-4.2.10}
+VERSION=${VERSION:-4.4.7}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.2.10
+BASEVERS=4.4.7
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -46,8 +47,8 @@ cd $TMP/$PRGNAM-$BASEVERS
 chown -R root:root .
 
 # Patch the base against all the patchlevel patches in order if present
-if [ $(ls $CWD/patches 2>/dev/null | wc -l) -gt 0 ]; then
-  for PATCH in $CWD/patches/* ; do
+if [ $(ls $CWD/patch-6-$BASEVERS.* 2>/dev/null | wc -l) -gt 0 ]; then
+  for PATCH in $CWD/patch-6-$BASEVERS.* ; do
     patch -p1 < $PATCH
   done
 fi
@@ -85,13 +86,16 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+for NEW in $PKG/etc/shorewall6/*.new;
+do
+    echo $NEW | sed 's/.*etc/config etc/' >> $PKG/install/doinst.sh
+done
+
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
 
 # Clean up the extra stuff:
 if [ "$1" = "--cleanup" ]; then
   rm -rf $TMP/$PRGNAM-$BASEVERS
   rm -rf $PKG
 fi
-
-# vim: et ts=2
-- 
cgit v1.2.3