network/shorewall6: Updated for version 4.5.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 23 insertions, 31 deletions

diff --git a/network/shorewall6/README b/network/shorewall6/README
index b09c9ccaf7..bcee42bb9c 100644
--- a/network/shorewall6/README
+++ b/network/shorewall6/README
@@ -1,14 +1,16 @@
-Shorewall6 (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.
+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.
 
-This is the IPv6 part of Shorewall. It only provides IPv6 support.
-The IPv6 part is started by /etc/rc.d/rc.shorewall6 from rc.firewall 
-(provided by shorewall-common) if both are executable.
-rc.shorewall provided by shorewall-common will only start the IPv4
-part of the firewall. Both can run simultaneously.
+As of version 4.5, shorewall consists of 3 packages: 
+* shorewall-core, containing the common elements to both IPv4 and IPv6 components
+* shorewall, the IPv4 component
+* shorewall6, the IPv6 component
 
-You will also need the shorewall package.
+The shorewall-core package is needed for both but now you can install the IPv6
+packages without needing the IPv4 one if you are on aIV6 network only.
+
+This requires shorewall-core (and xtables-addons to use the new per-IP
+accounting feature).
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index 758ed71467..31a7200d10 100644
--- a/network/shorewall6/shorewall6.SlackBuild
+++ b/network/shorewall6/shorewall6.SlackBuild
@@ -24,12 +24,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shorewall6
-VERSION=${VERSION:-4.4.27.3}
+VERSION=${VERSION:-4.5.6}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.4.27
+BASEVERS=4.5.6
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -53,12 +53,9 @@ if [ $(ls $CWD/patch-6-$BASEVERS.* 2>/dev/null | wc -l) -gt 0 ]; then
   done
 fi
 
-PREFIX=$PKG \
-  OWNER='root' \
-  GROUP='root' \
-  DEST=/etc/rc.d \
-  MANDIR=/usr/man \
-  SLACKWARE=yes \
+./configure
+
+DESTDIR=$PKG \
   ./install.sh
 
 # Don't clobber config files
@@ -72,8 +69,7 @@ PREFIX=$PKG \
   mv rc.shorewall6 rc.shorewall6.new
 )
 
-mkdir -p $PKG/var/lock/subsys
-chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall6 $PKG/var/lock/subsys
+chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall6
 chmod 0644 $PKG/etc/shorewall6/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 5be6f72f17..a03d114b07 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,14 +1,8 @@
 PRGNAM="shorewall6"
-VERSION="4.4.27.3"
+VERSION="4.5.6"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/base/shorewall6-4.4.27.tar.bz2 \
-	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-6-4.4.27.1 \
-	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-6-4.4.27.2 \
-	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-6-4.4.27.3"
-MD5SUM="9137c4fda07884b99aeecb38f7947c20 \
-	4f8848216b7395a08c84b490c0607574 \
-	2e41ad42d8c275f67579929a91e7e6db \
-	01a1e10c3b0349f9a218fef07d454ff5"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.6/base/shorewall6-4.5.6.tar.bz2"
+MD5SUM="61a35aa0ba22632f2c6d37a87556e7fb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ArTourter"
diff --git a/network/shorewall6/slack-desc b/network/shorewall6/slack-desc
index 8497f19a19..da58aea89c 100644
--- a/network/shorewall6/slack-desc
+++ b/network/shorewall6/slack-desc
@@ -13,7 +13,7 @@ shorewall6: Netfilter (iptables) based firewall that can be used on a dedicated
 shorewall6: firewall system, a multi-function gateway/router/server or on a 
 shorewall6: standalone GNU/Linux system.
 shorewall6:
-shorewall6: This package provides IPv6 support to shorewall.
+shorewall6: This package provides the IPv6 components to shorewall.
 shorewall6:
 shorewall6: http://www.shorewall.net/
 shorewall6: