network/shorewall6: Updated for version 4.4.13.1.

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

4 files changed, 8 insertions, 225 deletions

diff --git a/network/shorewall6/patch-6-4.4.12.1 b/network/shorewall6/patch-6-4.4.12.1
deleted file mode 100644
index 38d7450a86..0000000000
--- a/network/shorewall6/patch-6-4.4.12.1
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12/changelog.txt shorewall6-4.4.12.1/changelog.txt
---- shorewall6-4.4.12/changelog.txt	2010-08-17 07:34:57.000000000 -0700
-+++ shorewall6-4.4.12.1/changelog.txt	2010-08-24 13:17:59.000000000 -0700
-@@ -1,3 +1,9 @@
-+Changes in Shorewall 4.4.12.1
-+
-+1)  Fix optimization bugs.
-+
-+2)  Fix detection of old ipset match capability
-+
- Changes in Shorewall 4.4.12
- 
- 1)  Fix IPv6 shorecap program.
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12/install.sh shorewall6-4.4.12.1/install.sh
---- shorewall6-4.4.12/install.sh	2010-08-17 07:34:21.000000000 -0700
-+++ shorewall6-4.4.12.1/install.sh	2010-08-24 13:15:35.000000000 -0700
-@@ -22,7 +22,7 @@
- #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- #
- 
--VERSION=4.4.12
-+VERSION=4.4.12.1
- 
- usage() # $1 = exit status
- {
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12/releasenotes.txt shorewall6-4.4.12.1/releasenotes.txt
---- shorewall6-4.4.12/releasenotes.txt	2010-08-17 07:34:57.000000000 -0700
-+++ shorewall6-4.4.12.1/releasenotes.txt	2010-08-24 13:17:59.000000000 -0700
-@@ -1,5 +1,5 @@
- ----------------------------------------------------------------------------
--                      S H O R E W A L L  4 . 4 . 1 2
-+                   S H O R E W A L L  4 . 4 . 1 2 . 1
- ----------------------------------------------------------------------------
- 
- I.    RELEASE 4.4 HIGHLIGHTS
-@@ -10,7 +10,7 @@
- VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
- 
- ----------------------------------------------------------------------------
--             I.  R E L E A S E  4 . 4  H I G H L I G H T S
-+                I.  R E L E A S E  4 . 4  H I G H L I G H T S
- ----------------------------------------------------------------------------
- 
- 1)  Support for Shorewall-shell has been discontinued. Shorewall-perl
-@@ -224,6 +224,22 @@
- I I I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
- ----------------------------------------------------------------------------
- 
-+4.4.12.1
-+
-+1)  Under rare circumstances where COMMENT is used to attach comments
-+    to rules, OPTIMIZE 8 through 15 could result in invalid
-+    iptables-restore (ip6tables-restore) input.
-+
-+2)  Under rare circumstances unvolving exclusion, OPTIMIZE 8 through 15
-+    could result in invalid iptables-restore (ip6tables-restore) input.
-+
-+3)  The change in 4.4.12 to detect and use the new ipset match syntax
-+    broke the ability to detect the old ipset match capability. Now,
-+    both versions of the capability can be correctly detected.
-+
-+4.4.12
-+
-+
- 1)  Previously, the Shorewall6-lite version of shorecap was using
-     iptables rather than ip6tables, with the result that many capabilities
-     that are only available in IPv4 were being reported as available.
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12/shorewall6.spec shorewall6-4.4.12.1/shorewall6.spec
---- shorewall6-4.4.12/shorewall6.spec	2010-08-17 07:34:21.000000000 -0700
-+++ shorewall6-4.4.12.1/shorewall6.spec	2010-08-24 13:15:35.000000000 -0700
-@@ -1,6 +1,6 @@
- %define name shorewall6
- %define version 4.4.12
--%define release 0base
-+%define release 1
- 
- Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
- Name: %{name}
-@@ -98,6 +98,8 @@
- %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
- 
- %changelog
-+* Mon Aug 23 2010 Tom Eastep tom@shorewall.net
-+- Updated to 4.4.12-1
- * Sun Aug 15 2010 Tom Eastep tom@shorewall.net
- - Updated to 4.4.12-0base
- * Fri Aug 06 2010 Tom Eastep tom@shorewall.net
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12/uninstall.sh shorewall6-4.4.12.1/uninstall.sh
---- shorewall6-4.4.12/uninstall.sh	2010-08-17 07:34:21.000000000 -0700
-+++ shorewall6-4.4.12.1/uninstall.sh	2010-08-24 13:15:35.000000000 -0700
-@@ -26,7 +26,7 @@
- #       You may only use this script to uninstall the version
- #       shown below. Simply run this script to remove Shorewall Firewall
- 
--VERSION=4.4.12
-+VERSION=4.4.12.1
- 
- usage() # $1 = exit status
- {
diff --git a/network/shorewall6/patch-6-4.4.12.2 b/network/shorewall6/patch-6-4.4.12.2
deleted file mode 100644
index 917d4656c4..0000000000
--- a/network/shorewall6/patch-6-4.4.12.2
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12.1/changelog.txt shorewall6-4.4.12.2/changelog.txt
---- shorewall6-4.4.12.1/changelog.txt	2010-08-24 13:17:59.000000000 -0700
-+++ shorewall6-4.4.12.2/changelog.txt	2010-09-04 07:30:23.000000000 -0700
-@@ -1,9 +1,17 @@
-+Changes in Shorewall 4.4.12.2
-+
-+1)  Add tweak to 4.4.12.1 optimization fix.
-+
-+2)  Fix exclusion in the blacklist file.
-+
- Changes in Shorewall 4.4.12.1
- 
- 1)  Fix optimization bugs.
- 
- 2)  Fix detection of old ipset match capability
- 
-+3)  Fix REQUIRE_INTERFACE=Yes
-+
- Changes in Shorewall 4.4.12
- 
- 1)  Fix IPv6 shorecap program.
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12.1/install.sh shorewall6-4.4.12.2/install.sh
---- shorewall6-4.4.12.1/install.sh	2010-08-24 13:15:35.000000000 -0700
-+++ shorewall6-4.4.12.2/install.sh	2010-09-04 07:30:24.000000000 -0700
-@@ -22,7 +22,7 @@
- #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- #
- 
--VERSION=4.4.12.1
-+VERSION=4.4.12.2
- 
- usage() # $1 = exit status
- {
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12.1/releasenotes.txt shorewall6-4.4.12.2/releasenotes.txt
---- shorewall6-4.4.12.1/releasenotes.txt	2010-08-24 13:17:59.000000000 -0700
-+++ shorewall6-4.4.12.2/releasenotes.txt	2010-09-04 07:30:23.000000000 -0700
-@@ -1,5 +1,5 @@
- ----------------------------------------------------------------------------
--                   S H O R E W A L L  4 . 4 . 1 2 . 1
-+                   S H O R E W A L L  4 . 4 . 1 2 . 2
- ----------------------------------------------------------------------------
- 
- I.    RELEASE 4.4 HIGHLIGHTS
-@@ -224,21 +224,38 @@
- I I I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
- ----------------------------------------------------------------------------
- 
-+4.4.12.2
-+
-+1)  Earlier releases allowed CONTINUE rules with exclusion. These rules
-+    generated valid but incorrect iptables (ip6tables) input. Such
-+    rules are now disallowed.
-+
-+2)  The fix for COMMENT and OPTIMIZE 8-15 in 4.4.12.1 missed one case
-+    which has now been corrected.
-+
-+3)  Previously, exclusion in the blacklist file was correctly validated
-+    but was then ignored when generating iptables (ip6tables) rules.
-+
-+4)  Previously, the interface option combination of 'optional' and
-+    'upnpclient' did not work correctly.
-+
- 4.4.12.1
- 
- 1)  Under rare circumstances where COMMENT is used to attach comments
-     to rules, OPTIMIZE 8 through 15 could result in invalid
-     iptables-restore (ip6tables-restore) input.
- 
--2)  Under rare circumstances unvolving exclusion, OPTIMIZE 8 through 15
-+2)  Under rare circumstances involving exclusion, OPTIMIZE 8 through 15
-     could result in invalid iptables-restore (ip6tables-restore) input.
- 
- 3)  The change in 4.4.12 to detect and use the new ipset match syntax
-     broke the ability to detect the old ipset match capability. Now,
-     both versions of the capability can be correctly detected.
- 
--4.4.12
-+4)  Previously, if REQUIRE_INTERFACE=Yes then start/restart would fail
-+    if the last optional interface tested was not available.
- 
-+4.4.12
- 
- 1)  Previously, the Shorewall6-lite version of shorecap was using
-     iptables rather than ip6tables, with the result that many capabilities
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12.1/shorewall6.spec shorewall6-4.4.12.2/shorewall6.spec
---- shorewall6-4.4.12.1/shorewall6.spec	2010-08-24 13:15:35.000000000 -0700
-+++ shorewall6-4.4.12.2/shorewall6.spec	2010-09-04 07:30:24.000000000 -0700
-@@ -1,6 +1,6 @@
- %define name shorewall6
- %define version 4.4.12
--%define release 1
-+%define release 2
- 
- Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
- Name: %{name}
-@@ -98,6 +98,8 @@
- %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
- 
- %changelog
-+* Sat Sep 04 2010 Tom Eastep tom@shorewall.net
-+- Updated to 4.4.12-2
- * Mon Aug 23 2010 Tom Eastep tom@shorewall.net
- - Updated to 4.4.12-1
- * Sun Aug 15 2010 Tom Eastep tom@shorewall.net
-diff -Naur -X /Users/teastep/bin/exclude.txt shorewall6-4.4.12.1/uninstall.sh shorewall6-4.4.12.2/uninstall.sh
---- shorewall6-4.4.12.1/uninstall.sh	2010-08-24 13:15:35.000000000 -0700
-+++ shorewall6-4.4.12.2/uninstall.sh	2010-09-04 07:30:24.000000000 -0700
-@@ -26,7 +26,7 @@
- #       You may only use this script to uninstall the version
- #       shown below. Simply run this script to remove Shorewall Firewall
- 
--VERSION=4.4.12.1
-+VERSION=4.4.12.2
- 
- usage() # $1 = exit status
- {
diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild
index 400af78051..a8fc26854b 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.12.2}
+VERSION=${VERSION:-4.4.13.1}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-BASEVERS=4.4.12
+BASEVERS=4.4.13
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info
index 69cf72caf0..9dfa05d860 100644
--- a/network/shorewall6/shorewall6.info
+++ b/network/shorewall6/shorewall6.info
@@ -1,14 +1,12 @@
 PRGNAM="shorewall6"
-VERSION="4.4.12.2"
+VERSION="4.4.13.1"
 HOMEPAGE="http://www.shorewall.net"
-DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.12/base/shorewall6-4.4.12.tar.bz2 \
-	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.12/patch-6-4.4.12.1 \
-	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.12/patch-6-4.4.12.2"
-MD5SUM="2945363dde28ee91898193eb62c38d63 \
-	ef9fd8070580f0da3371e0c4a12a93fe \
-	c23625afe9b1eef5895566b0fe3c1882"
+DOWNLOAD="http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.13/base/shorewall6-4.4.13.tar.bz2 \
+	http://www.shorewall.net/pub/shorewall/4.4/shorewall-4.4.13/patch-6-4.4.13.1"
+MD5SUM="a21eaf8e15313a62de4917e60f32253b \
+	492473458064fae7c02c9d1bf2523240"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ArTourter"
 EMAIL="artourter@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"