From 3ec1e156d635cd5658fa71c8217aec67ff209721 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 21 Jun 2007 14:40:40 +0000
Subject: [PATCH] Fix $VERSION in modules

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6635 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Accounting.pm |  2 +-
 Shorewall-perl/Shorewall/Actions.pm    |  2 +-
 Shorewall-perl/Shorewall/Chains.pm     |  2 +-
 Shorewall-perl/Shorewall/Common.pm     |  2 +-
 Shorewall-perl/Shorewall/Config.pm     |  1 +
 Shorewall-perl/Shorewall/Hosts.pm      |  2 +-
 Shorewall-perl/Shorewall/IPAddrs.pm    |  2 +-
 Shorewall-perl/Shorewall/Interfaces.pm |  3 ++-
 Shorewall-perl/Shorewall/Macros.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      |  2 +-
 Shorewall-perl/buildports.pl           | 17 +++++++----------
 19 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm
index 615ee3caf..0a6ad34fb 100644
--- a/Shorewall-perl/Shorewall/Accounting.pm
+++ b/Shorewall-perl/Shorewall/Accounting.pm
@@ -37,7 +37,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_accounting );
 our @EXPORT_OK = qw( );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # 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 c4eb0b98a..1cf9dd861 100644
--- a/Shorewall-perl/Shorewall/Actions.pm
+++ b/Shorewall-perl/Shorewall/Actions.pm
@@ -49,7 +49,7 @@ our @EXPORT = qw( merge_levels
 		  %actions
 		  );
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 #  Used Actions. Each action that is actually used has an entry with value 1.
diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index c3b43d2c7..650e0abe8 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -128,7 +128,7 @@ our @EXPORT = qw( STANDARD
 		  %targets
 		  );
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Chain Table
diff --git a/Shorewall-perl/Shorewall/Common.pm b/Shorewall-perl/Shorewall/Common.pm
index b2b032ac8..d3c9d63a4 100644
--- a/Shorewall-perl/Shorewall/Common.pm
+++ b/Shorewall-perl/Shorewall/Common.pm
@@ -61,7 +61,7 @@ our @EXPORT = qw(
 		 $verbose
 		 );
 our @EXPORT_OK = qw( $timestamp initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 our $line;
 our ($command, $doing, $done );
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 5890b96ae..97f600f9e 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -66,6 +66,7 @@ our @EXPORT = qw(
 
 our @EXPORT_OK = qw( $shorewall_dir initialize );
 our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Misc Globals
diff --git a/Shorewall-perl/Shorewall/Hosts.pm b/Shorewall-perl/Shorewall/Hosts.pm
index 5814b03bb..fbd13924a 100644
--- a/Shorewall-perl/Shorewall/Hosts.pm
+++ b/Shorewall-perl/Shorewall/Hosts.pm
@@ -36,7 +36,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( validate_hosts_file find_hosts_by_option );
 our @EXPORT_OK = ();
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Validates the hosts file. Generates entries in %zone{..}{hosts}
diff --git a/Shorewall-perl/Shorewall/IPAddrs.pm b/Shorewall-perl/Shorewall/IPAddrs.pm
index a97ac2583..cf01cc4a5 100644
--- a/Shorewall-perl/Shorewall/IPAddrs.pm
+++ b/Shorewall-perl/Shorewall/IPAddrs.pm
@@ -41,7 +41,7 @@ our @EXPORT = qw( ALLIPv4
 		  @rfc1918_networks
 		 );
 our @EXPORT_OK = qw( );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Some IPv4 useful stuff
diff --git a/Shorewall-perl/Shorewall/Interfaces.pm b/Shorewall-perl/Shorewall/Interfaces.pm
index 18578b82d..e113deaa9 100644
--- a/Shorewall-perl/Shorewall/Interfaces.pm
+++ b/Shorewall-perl/Shorewall/Interfaces.pm
@@ -47,7 +47,8 @@ our @EXPORT = qw( add_group_to_zone
 		  @interfaces
 		  @bridges );
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
+
 
 #
 #     Interface Table.
diff --git a/Shorewall-perl/Shorewall/Macros.pm b/Shorewall-perl/Shorewall/Macros.pm
index c697bfd62..774f74412 100644
--- a/Shorewall-perl/Shorewall/Macros.pm
+++ b/Shorewall-perl/Shorewall/Macros.pm
@@ -40,7 +40,7 @@ our @EXPORT = qw( find_macro
 
 		  %macros );
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 
 our %macros;
diff --git a/Shorewall-perl/Shorewall/Nat.pm b/Shorewall-perl/Shorewall/Nat.pm
index 671d3baa0..fdc39cb2d 100644
--- a/Shorewall-perl/Shorewall/Nat.pm
+++ b/Shorewall-perl/Shorewall/Nat.pm
@@ -38,7 +38,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses );
 our @EXPORT_OK = ();
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 our @addresses_to_add;
 our %addresses_to_add;
diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm
index f491dcdcd..adb87f572 100644
--- a/Shorewall-perl/Shorewall/Policy.pm
+++ b/Shorewall-perl/Shorewall/Policy.pm
@@ -35,7 +35,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( validate_policy apply_policy_rules complete_standard_chain );
 our @EXPORT_OK = qw(  );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Create a new policy chain and return a reference to it.
diff --git a/Shorewall-perl/Shorewall/Proc.pm b/Shorewall-perl/Shorewall/Proc.pm
index a2098968f..aef5639c9 100644
--- a/Shorewall-perl/Shorewall/Proc.pm
+++ b/Shorewall-perl/Shorewall/Proc.pm
@@ -44,7 +44,7 @@ our @EXPORT = qw(
 		 setup_forwarding
 		 );
 our @EXPORT_OK = qw( );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # ARP Filtering
diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm
index 03fe4a021..75a00da07 100644
--- a/Shorewall-perl/Shorewall/Providers.pm
+++ b/Shorewall-perl/Shorewall/Providers.pm
@@ -36,7 +36,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_providers @routemarked_interfaces);
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 use constant { LOCAL_NUMBER   => 255,
 	       MAIN_NUMBER    => 254,
diff --git a/Shorewall-perl/Shorewall/Proxyarp.pm b/Shorewall-perl/Shorewall/Proxyarp.pm
index 1f2720df4..48aa1532e 100644
--- a/Shorewall-perl/Shorewall/Proxyarp.pm
+++ b/Shorewall-perl/Shorewall/Proxyarp.pm
@@ -36,7 +36,7 @@ our @EXPORT = qw(
 		  );
 
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 our @proxyarp;
 
diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 36cc66d49..e4daeb042 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -51,7 +51,7 @@ our @EXPORT = qw( process_tos
 		  dump_rule_chains
 		  );
 our @EXPORT_OK = qw( process_rule process_rule1 initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # Keep track of chains for the /var/lib/shorewall[-lite]/chains file
diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm
index f076e4ebc..1cba4eb2f 100644
--- a/Shorewall-perl/Shorewall/Tc.pm
+++ b/Shorewall-perl/Shorewall/Tc.pm
@@ -41,7 +41,7 @@ use strict;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( setup_tc );
 our @EXPORT_OK = qw( process_tc_rule initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 our %tcs = ( T => { chain  => 'tcpost',
 		    connmark => 0,
diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm
index d941c9f81..36bbc4fa4 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 = 1.00;
+our $VERSION = 1.00;
 
 #
 # 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 07ea57eb0..0a3427a4e 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -48,7 +48,7 @@ our @EXPORT = qw( NOTHING
 		  %interfaces );
 
 our @EXPORT_OK = qw( initialize );
-our @VERSION = 1.00;
+our $VERSION = 1.00;
 
 #
 # IPSEC Option types
diff --git a/Shorewall-perl/buildports.pl b/Shorewall-perl/buildports.pl
index cecb06cb2..262561050 100755
--- a/Shorewall-perl/buildports.pl
+++ b/Shorewall-perl/buildports.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# Tool for building tables used to validate protocol and service names in Shorewall rules.
+# Tool for building Shorewall::Ports.
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
@@ -87,17 +87,14 @@ print <<"EOF";
 #       along with this program; if not, write to the Free Software
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
-#   This module is responsible for lower level configuration file handling.
-#   It also exports functions for generating warning and error messages.
-#   The get_configuration function parses the shorewall.conf, capabilities and 
-#   modules files during compiler startup.
+# This module exports the %protocols and %services hashes built from 
+# /etc/protocols and /etc/services respectively.
 #
-#
-# Protocol and Services module generated using buildports.pl - $date
+# Module generated using buildports.pl $globals{VERSION} - $date
 #
 EOF
 
-print<<'EOF';
+print <<'EOF';
 package Shorewall::Ports;
 
 use strict;
@@ -106,7 +103,7 @@ use warnings;
 our @ISA = qw(Exporter);
 our @EXPORT = qw( %protocols %services );
 our @EXPORT_OK = qw();
-our @VERSION = 1.00;
+our $VERSION = '1.00';
 
 our %protocols = (
 EOF
@@ -122,7 +119,7 @@ while ( read_a_line1 ) {
 
 print "\t\t );\n\n";
 
-print "our \%services  = (\n";
+print "our %services  = (\n";
 
 open_file 'services' or fatal_error "Cannot open services: $!";