network/shorewall6: Updated for version 5.0.15.3.

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

3 files changed, 9 insertions, 27 deletions

diff --git a/network/shorewall6/README b/network/shorewall6/README
index d743755a30..db74f2ab7b 100644
--- a/network/shorewall6/README
+++ b/network/shorewall6/README
@@ -1,11 +1,11 @@
-shorewall (IPv6 support package for shorewall)
+Shorewall (IPv6 support package for shorewall)
 
 The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
 (iptables) based firewall that can be used on a dedicated firewall system, a
 multi-function gateway/router/server or on a standalone GNU/Linux system.
 
 As of version 4.5, shorewall consists of 3 packages: 
-* shorewall-core, contains the common elements to both IPv4 and IPv6 components
+* shorewall-core, containing the common elements to both IPv4 and IPv6 components
 * shorewall, the IPv4 component
 * shorewall6, the IPv6 component
 
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index 6144adfc1a..e29519266e 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -1,5 +1,4 @@
 #!/bin/sh
-# vim: et ts=2 sw=2
 
 # Slackware build script for shorewall-common
 
@@ -24,19 +23,19 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall6
-VERSION=${VERSION:-5.0.13.4}
+VERSION=${VERSION:-5.0.15.3}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=5.0.13
+BASEVERS=$VERSION
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -46,13 +45,6 @@ tar xvf $CWD/$PRGNAM-$BASEVERS.tar.bz2
 cd $TMP/$PRGNAM-$BASEVERS
 chown -R root:root .
 
-# Patch the base against all the patchlevel patches in order if present
-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
-
 ./configure
 
 DESTDIR=$PKG \
@@ -73,9 +65,7 @@ chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall6
 chmod 0644 $PKG/etc/shorewall6/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples6 \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING INSTALL *.txt tunnel ipsecvpn Samples6 $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 38748b6348..9fba0dab9b 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,16 +1,8 @@
 PRGNAM="shorewall6"
-VERSION="5.0.13.4"
+VERSION="5.0.15.3"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.13/base/shorewall6-5.0.13.tar.bz2 \
-	http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.13/patch-6-5.0.13.1 \
-	http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.13/patch-6-5.0.13.2 \
-	http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.13/patch-6-5.0.13.3 \
-	http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.13/patch-6-5.0.13.4"
-MD5SUM="4bf5de7ef9fa844eefc0e54488d40b2f \
-	cca59f137aff76d61834e2f0d79fda02 \
-	6b621086423f6c5a6e54e8cd5f704169 \
-	16601bef1e06b0bdbae225971eaec20c \
-	fcd19a6547f05c98d44971952b26ca16"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.0/shorewall-5.0.15/shorewall6-5.0.15.3.tar.bz2"
+MD5SUM="fb2b8169ff462671d5fe7dc2d0553779"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="shorewall-core"