From 80296819ffde5fa04be6383d6e5766f30585fc9d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 17 Dec 2008 19:25:43 +0000
Subject: [PATCH] Update versions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9096 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Accounting.pm | 2 +-
 Shorewall-perl/Shorewall/Actions.pm    | 4 ++--
 Shorewall-perl/Shorewall/Chains.pm     | 3 +--
 Shorewall-perl/Shorewall/Compiler.pm   | 2 +-
 Shorewall-perl/Shorewall/Config.pm     | 2 +-
 Shorewall-perl/Shorewall/IPAddrs.pm    | 2 +-
 Shorewall-perl/Shorewall/Nat.pm        | 2 +-
 Shorewall-perl/Shorewall/Policy.pm     | 2 +-
 Shorewall-perl/Shorewall/Proc.pm       | 2 +-
 Shorewall-perl/Shorewall/Providers.pm  | 2 +-
 Shorewall-perl/Shorewall/Proxyarp.pm   | 2 +-
 Shorewall-perl/Shorewall/Rules.pm      | 2 +-
 Shorewall-perl/Shorewall/Tc.pm         | 2 +-
 Shorewall-perl/Shorewall/Tunnels.pm    | 2 +-
 Shorewall-perl/Shorewall/Zones.pm      | 4 ++--
 Shorewall6-lite/shorewall6-lite        | 2 +-
 Shorewall6/init.sh                     | 2 +-
 Shorewall6/lib.base                    | 2 +-
 Shorewall6/lib.cli                     | 2 +-
 19 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm
index 0f5dfeb83..8064b0dd4 100644
--- a/Shorewall-perl/Shorewall/Accounting.pm
+++ b/Shorewall-perl/Shorewall/Accounting.pm
@@ -35,7 +35,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_accounting );
 our @EXPORT_OK = qw( );
-our $VERSION = 4.0.6;
+our $VERSION = 4.2.4;
 
 #
 # Initialize globals -- we take this novel approach to globals initialization to allow
diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm
index 03ee90c04..1d6ba2778 100644
--- a/Shorewall-perl/Shorewall/Actions.pm
+++ b/Shorewall-perl/Shorewall/Actions.pm
@@ -56,7 +56,7 @@ our @EXPORT = qw( merge_levels
 		  $macro_commands
 		  );
 our @EXPORT_OK = qw( initialize );
-our $VERSION = 4.1.1;
+our $VERSION = 4.2.4;
 
 #
 #  Used Actions. Each action that is actually used has an entry with value 1.
@@ -761,7 +761,7 @@ sub process_actions3 () {
     sub allowBcast( $$$ ) {
 	my ($chainref, $level, $tag) = @_;
 
-	if ( $capabilities{ADDRTYPE} ) {
+	if ( $family == F_IPV4 && $capabilities{ADDRTYPE} ) {
 	    if ( $level ne '' ) {
 		log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -m addrtype --dst-type BROADCAST ';
 		log_rule_limit $level, $chainref, 'allowBcast' , 'ACCEPT', '', $tag, 'add', ' -d 224.0.0.0/4 ';
diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index 10b600423..90f7855da 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -68,7 +68,6 @@ our %EXPORT_TAGS = (
 				       POSTROUTE_RESTRICT
 				       ALL_RESTRICT
 				       
-				       chain_family
 				       add_command
 				       add_commands
 				       move_rules
@@ -151,7 +150,7 @@ our %EXPORT_TAGS = (
 
 Exporter::export_ok_tags('internal');
 
-our $VERSION = 4.3.0;
+our $VERSION = 4.2.4;
 
 #
 # Chain Table
diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm
index f238fdcf8..994918a0d 100644
--- a/Shorewall-perl/Shorewall/Compiler.pm
+++ b/Shorewall-perl/Shorewall/Compiler.pm
@@ -42,7 +42,7 @@ use Shorewall::IPAddrs;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( compiler EXPORT TIMESTAMP DEBUG );
 our @EXPORT_OK = qw( $export );
-our $VERSION = 4.1.4;
+our $VERSION = 4.2.4;
 
 our $export;
 
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 267179e78..b52dcddc0 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -120,7 +120,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_object
 
 Exporter::export_ok_tags('internal');
 
-our $VERSION = 4.3.0;
+our $VERSION = 4.2.4;
 
 #
 # describe the current command, it's present progressive, and it's completion.
diff --git a/Shorewall-perl/Shorewall/IPAddrs.pm b/Shorewall-perl/Shorewall/IPAddrs.pm
index d5a1aa2f5..cf8b5173c 100644
--- a/Shorewall-perl/Shorewall/IPAddrs.pm
+++ b/Shorewall-perl/Shorewall/IPAddrs.pm
@@ -71,7 +71,7 @@ our @EXPORT = qw( ALLIPv4
 		  validate_icmp6
 		 );
 our @EXPORT_OK = qw( );
-our $VERSION = 4.3.0;
+our $VERSION = 4.2.4;
 
 #
 # Some IPv4/6 useful stuff
diff --git a/Shorewall-perl/Shorewall/Nat.pm b/Shorewall-perl/Shorewall/Nat.pm
index c5f27c3cd..d3531b0d7 100644
--- a/Shorewall-perl/Shorewall/Nat.pm
+++ b/Shorewall-perl/Shorewall/Nat.pm
@@ -37,7 +37,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses );
 our @EXPORT_OK = ();
-our $VERSION = 4.1.5;
+our $VERSION = 4.2.4;
 
 our @addresses_to_add;
 our %addresses_to_add;
diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm
index 414a1e6f4..ba6d21134 100644
--- a/Shorewall-perl/Shorewall/Policy.pm
+++ b/Shorewall-perl/Shorewall/Policy.pm
@@ -34,7 +34,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( validate_policy apply_policy_rules complete_standard_chain sub setup_syn_flood_chains );
 our @EXPORT_OK = qw(  );
-our $VERSION = 4.3.0;
+our $VERSION = 4.2.4;
 
 # @policy_chains is a list of references to policy chains in the filter table
 
diff --git a/Shorewall-perl/Shorewall/Proc.pm b/Shorewall-perl/Shorewall/Proc.pm
index 0b1f7038e..3041c0baa 100644
--- a/Shorewall-perl/Shorewall/Proc.pm
+++ b/Shorewall-perl/Shorewall/Proc.pm
@@ -41,7 +41,7 @@ our @EXPORT = qw(
 		 setup_forwarding
 		 );
 our @EXPORT_OK = qw( );
-our $VERSION = 4.0.6;
+our $VERSION = 4.2.4;
 
 #
 # ARP Filtering
diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm
index 69805ea9d..b056fd8c2 100644
--- a/Shorewall-perl/Shorewall/Providers.pm
+++ b/Shorewall-perl/Shorewall/Providers.pm
@@ -35,7 +35,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_providers @routemarked_interfaces);
 our @EXPORT_OK = qw( initialize lookup_provider );
-our $VERSION = 4.1.5;
+our $VERSION = 4.2.4;
 
 use constant { LOCAL_TABLE   => 255,
 	       MAIN_TABLE    => 254,
diff --git a/Shorewall-perl/Shorewall/Proxyarp.pm b/Shorewall-perl/Shorewall/Proxyarp.pm
index c84d3920e..85059a27f 100644
--- a/Shorewall-perl/Shorewall/Proxyarp.pm
+++ b/Shorewall-perl/Shorewall/Proxyarp.pm
@@ -35,7 +35,7 @@ our @EXPORT = qw(
 		  );
 
 our @EXPORT_OK = qw( initialize );
-our $VERSION = 4.0.6;
+our $VERSION = 4.2.4;
 
 our @proxyarp;
 
diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index e1ca4e5dd..55d47c2a6 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw( process_tos
 		  setup_mss
 		  );
 our @EXPORT_OK = qw( process_rule process_rule1 initialize );
-our $VERSION = 4.3.0;
+our $VERSION = 4.2.4;
 
 #
 # Set to one if we find a SECTION
diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm
index abe6d7b99..c0935e3eb 100644
--- a/Shorewall-perl/Shorewall/Tc.pm
+++ b/Shorewall-perl/Shorewall/Tc.pm
@@ -40,7 +40,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_tc );
 our @EXPORT_OK = qw( process_tc_rule initialize );
-our $VERSION = 4.1.5;
+our $VERSION = 4.2.4;
 
 our %tcs = ( T => { chain  => 'tcpost',
 		    connmark => 0,
diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm
index a2d370887..984b4afd2 100644
--- a/Shorewall-perl/Shorewall/Tunnels.pm
+++ b/Shorewall-perl/Shorewall/Tunnels.pm
@@ -34,7 +34,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_tunnels );
 our @EXPORT_OK = ( );
-our $VERSION = 4.1.5;
+our $VERSION = 4.2.4;
 
 #
 # Here starts the tunnel stuff -- we really should get rid of this crap...
diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm
index 0e45e11c8..c9b9e1269 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -1,5 +1,5 @@
 #
-# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Zones.pm
+# Shorewall-perl 4.2 -- /usr/share/shorewall-perl/Shorewall/Zones.pm
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
@@ -67,7 +67,7 @@ our @EXPORT = qw( NOTHING
 		 );
 
 our @EXPORT_OK = qw( initialize );
-our $VERSION = 4.3.1;
+our $VERSION = 4.2.4;
 
 #
 # IPSEC Option types
diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite
index dd37c073e..a1bf1cc97 100755
--- a/Shorewall6-lite/shorewall6-lite
+++ b/Shorewall6-lite/shorewall6-lite
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#     Shorewall6  Lite Packet Filtering Firewall Control Program - V4.4
+#     Shorewall6  Lite Packet Filtering Firewall Control Program - V4.2
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
diff --git a/Shorewall6/init.sh b/Shorewall6/init.sh
index 9ccd55b50..054f18269 100755
--- a/Shorewall6/init.sh
+++ b/Shorewall6/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 RCDLINKS="2,S41 3,S41 6,K41"
 #
-#     The Shoreline Firewall (Shorewall6) Packet Filtering Firewall - V4.4
+#     The Shoreline Firewall (Shorewall6) Packet Filtering Firewall - V4.2
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base
index 9716a4617..3a6331508 100644
--- a/Shorewall6/lib.base
+++ b/Shorewall6/lib.base
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall6 4.4 -- /usr/share/shorewall/lib.base
+# Shorewall6 4.2-- /usr/share/shorewall/lib.base
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #
diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli
index bc32413ab..84b00333e 100644
--- a/Shorewall6/lib.cli
+++ b/Shorewall6/lib.cli
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Shorewall6 4.4 -- /usr/share/shorewall6/lib.cli.
+# Shorewall6 4.2 -- /usr/share/shorewall6/lib.cli.
 #
 #     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
 #