summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/shorewall/README23
-rw-r--r--network/shorewall/doinst.sh1
-rw-r--r--network/shorewall/shorewall.SlackBuild17
-rw-r--r--network/shorewall/shorewall.info12
-rw-r--r--network/shorewall/slack-desc24
5 files changed, 34 insertions, 43 deletions
diff --git a/network/shorewall/README b/network/shorewall/README
index 307cabe89d..3137dbc2e9 100644
--- a/network/shorewall/README
+++ b/network/shorewall/README
@@ -1,13 +1,16 @@
-Shorewall (Iptables Made Easy)
+Shorewall (IPv4 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 replacement for shorewall-common and shorewall-perl.
-Shorewall-shell support has been dropped from 4.4. If you are upgrading
-from versions 4.2 and below make sure you read the documentation, as a
-lot has changed.
+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
-This requires xtables-addons to use the new per-IP accounting feature.
+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/shorewall/doinst.sh b/network/shorewall/doinst.sh
index c56e81cd2c..e59a7af5d6 100644
--- a/network/shorewall/doinst.sh
+++ b/network/shorewall/doinst.sh
@@ -24,6 +24,5 @@ preserve_perms() {
config $NEW
}
-preserve_perms etc/rc.d/rc.firewall.new
preserve_perms etc/rc.d/rc.shorewall.new
diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild
index 02ca6b330d..020a392341 100644
--- a/network/shorewall/shorewall.SlackBuild
+++ b/network/shorewall/shorewall.SlackBuild
@@ -24,12 +24,12 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=shorewall
-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-$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
@@ -68,12 +65,10 @@ PREFIX=$PKG \
done
)
( cd $PKG/etc/rc.d/
- mv rc.firewall rc.firewall.new
mv rc.shorewall rc.shorewall.new
)
-mkdir -p $PKG/var/lock/subsys
-chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall $PKG/var/lock/subsys
+chmod 0755 $PKG/{etc,usr/share,var/lib}/shorewall
chmod 0644 $PKG/etc/shorewall/* $PKG/etc/rc.d/*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/shorewall/shorewall.info b/network/shorewall/shorewall.info
index 6a0fb7a234..d8144177c0 100644
--- a/network/shorewall/shorewall.info
+++ b/network/shorewall/shorewall.info
@@ -1,14 +1,8 @@
PRGNAM="shorewall"
-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/shorewall-4.4.27.tar.bz2 \
- http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-4.4.27.1 \
- http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-4.4.27.2 \
- http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.27/patch-4.4.27.3"
-MD5SUM="0a4a88f1ba34894bbdd949e72aae3afa \
- a834684c9b70b7e103ab46e3f8bef56b \
- a214bffeb6dd2f4c89084a1178ee5717 \
- 58c2e890e133f8230c18a3339076ea4b"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.5/shorewall-4.5.6/base/shorewall-4.5.6.tar.bz2"
+MD5SUM="f756c3e257addc018119b15b03c7353a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="ArTourter"
diff --git a/network/shorewall/slack-desc b/network/shorewall/slack-desc
index a670f8d892..8ce2a0e0e0 100644
--- a/network/shorewall/slack-desc
+++ b/network/shorewall/slack-desc
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler---------------------------------------------|
-shorewall: Shorewall (Iptables Made Easy)
-shorewall:
-shorewall: The Shoreline Firewall, more commonly known as "Shorewall",
-shorewall: is a Netfilter (iptables) based firewall that can be used on
-shorewall: a dedicated firewall system, a multi-function gateway /
-shorewall: router / server, or on a standalone GNU/Linux system.
-shorewall: This package contains common files required by both the
-shorewall: shorewall-perl and shorewall-shell compilers for Shoreline.
-shorewall:
-shorewall: http://www.shorewall.net/
-shorewall:
+ |-----handy-ruler------------------------------------------------------|
+shorewall6: Shorewall (IPv4 support package for the Shoreline Firewall)
+shorewall6:
+shorewall6: The Shoreline Firewall, more commonly known as "Shorewall", is a
+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 the IPv4 components for shorewall.
+shorewall6:
+shorewall6: http://www.shorewall.net/
+shorewall6: