holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Update version for build testing

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6366 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-15 22:42:00 +00:00
parent bb7c83912c
commit 1f1bd792e1
14 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/fallback.sh
View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-common/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

6
Shorewall-common/shorewall.spec
View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 3.9.7 %define version 4.0.0
%define release 1 %define release 0Beta1
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -252,6 +252,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
%changelog %changelog
* Tue May 15 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta1
* Fri May 11 2007 Tom Eastep tom@shorewall.net * Fri May 11 2007 Tom Eastep tom@shorewall.net
- Updated to 3.9.7-1 - Updated to 3.9.7-1
* Sat May 05 2007 Tom Eastep tom@shorewall.net * Sat May 05 2007 Tom Eastep tom@shorewall.net

2
Shorewall-common/uninstall.sh
View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/fallback.sh
View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

6
Shorewall-lite/shorewall-lite.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-lite %define name shorewall-lite
%define version 3.9.7 %define version 4.0.0
%define release 1 %define release 0Beta1
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@ -99,6 +99,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Tue May 15 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta1
* Fri May 11 2007 Tom Eastep tom@shorewall.net * Fri May 11 2007 Tom Eastep tom@shorewall.net
- Updated to 3.9.7-1 - Updated to 3.9.7-1
* Sat May 05 2007 Tom Eastep tom@shorewall.net * Sat May 05 2007 Tom Eastep tom@shorewall.net

2
Shorewall-lite/uninstall.sh
View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-perl/Shorewall/Config.pm
View File

@ -72,7 +72,7 @@ our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
ORIGINAL_POLICY_MATCH => '', ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '', LOGPARMS => '',
TC_SCRIPT => '', TC_SCRIPT => '',
VERSION => '3.9.7', VERSION => '4.0.0-Beta1',
); );
# #

19
Shorewall-perl/Shorewall/Rules.pm
View File

@ -1308,7 +1308,7 @@ sub process_rules() {
} }
# #
# To quote an old comment, generate_matrix makes a sows ear out of a silk purse. # To quote an old comment, "generate_matrix makes a sows ear out of a silk purse".
# #
# The biggest disadvantage of the zone-policy-rule model used by Shorewall is that it doesn't scale well as the number of zones increases (Order N**2 where N = number of zones). # The biggest disadvantage of the zone-policy-rule model used by Shorewall is that it doesn't scale well as the number of zones increases (Order N**2 where N = number of zones).
# A major goal of the rewrite of the compiler in Perl was to restrict those scaling effects to this functions and the rules that it generates. # A major goal of the rewrite of the compiler in Perl was to restrict those scaling effects to this functions and the rules that it generates.
@ -1375,15 +1375,23 @@ sub generate_matrix() {
} }
} }
#
# Set a breakpoint in this function if you want to step through generate_matrix().
#
sub start_matrix() {
}
#
# Generate_Matrix() Starts Here
#
start_matrix;
my $prerouting_rule = 1; my $prerouting_rule = 1;
my $postrouting_rule = 1; my $postrouting_rule = 1;
my $exclusion_seq = 1; my $exclusion_seq = 1;
my %chain_exclusions; my %chain_exclusions;
my %policy_exclusions; my %policy_exclusions;
#
# Generate_Matrix() Starts Here
#
for my $interface ( @interfaces ) { for my $interface ( @interfaces ) {
addnatjump 'POSTROUTING' , snat_chain( $interface ), "-o $interface "; addnatjump 'POSTROUTING' , snat_chain( $interface ), "-o $interface ";
} }
@ -1456,7 +1464,6 @@ sub generate_matrix() {
my $complex = $zoneref->{options}{complex} || 0; my $complex = $zoneref->{options}{complex} || 0;
my $type = $zoneref->{type}; my $type = $zoneref->{type};
my $exclusions = $zoneref->{exclusions}; my $exclusions = $zoneref->{exclusions};
my $need_broadcast = {}; ### Fixme ###
my $frwd_ref = 0; my $frwd_ref = 0;
my $chain = 0; my $chain = 0;
my %needbroadcast; my %needbroadcast;
@ -1549,7 +1556,7 @@ sub generate_matrix() {
# One thing that the Llama fails to mention is that evaluating a hash in a numeric context produces a warning. # One thing that the Llama fails to mention is that evaluating a hash in a numeric context produces a warning.
# #
no warnings; no warnings;
next if ( %{ $zoneref->{interfaces}} < 2 ) && ! ( $zoneref->{options}{in_out}{routeback} || @$exclusions ); next if ( %{ $zoneref->{interfaces} } < 2 ) && ! ( $zoneref->{options}{in_out}{routeback} || @$exclusions );
} }
if ( $chain =~ /2all$/ ) { if ( $chain =~ /2all$/ ) {

2
Shorewall-perl/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

6
Shorewall-perl/shorewall-perl.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-perl %define name shorewall-perl
%define version 3.9.7 %define version 4.0.0
%define release 1 %define release 0Beta1
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall Perl-based compiler. Summary: Shoreline Firewall Perl-based compiler.
@ -80,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING releasenotes.txt %doc COPYING releasenotes.txt
%changelog %changelog
* Tue May 15 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta1
* Fri May 11 2007 Tom Eastep tom@shorewall.net * Fri May 11 2007 Tom Eastep tom@shorewall.net
- Updated to 3.9.7-1 - Updated to 3.9.7-1
* Sat May 05 2007 Tom Eastep tom@shorewall.net * Sat May 05 2007 Tom Eastep tom@shorewall.net

2
Shorewall-shell/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=3.9.7 VERSION=4.0.0-Beta1
usage() # $1 = exit status usage() # $1 = exit status
{ {

6
Shorewall-shell/shorewall-shell.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-shell %define name shorewall-shell
%define version 3.9.7 %define version 4.0.0
%define release 1 %define release 0Beta1
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -63,6 +63,8 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING INSTALL %doc COPYING INSTALL
%changelog %changelog
* Tue May 15 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta1
* Fri May 11 2007 Tom Eastep tom@shorewall.net * Fri May 11 2007 Tom Eastep tom@shorewall.net
- Updated to 3.9.6-1 - Updated to 3.9.6-1
* Sat May 05 2007 Tom Eastep tom@shorewall.net * Sat May 05 2007 Tom Eastep tom@shorewall.net