extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-17 03:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Shorewall4 to Shorewall-pl

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5665 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-24 19:19:29 +00:00
parent 5890e5ddb5
commit 9bde119b32
19 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
New/Shorewall/Accounting.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Accounting.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Accounting.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Actions.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Actions.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Actions.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Chains.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Chains.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Chains.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Common.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Common.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Common.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

14
New/Shorewall/Config.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Config.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Config.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #
@ -37,6 +37,7 @@ our @VERSION = 1.00;
# #
our %env = ( SHAREDIR => '/usr/share/shorewall' , our %env = ( SHAREDIR => '/usr/share/shorewall' ,
CONFDIR => '/etc/shorewall', CONFDIR => '/etc/shorewall',
SHAREDIR4 => '/usr/share/shorewall-pl/',
LOGPARMS => '', LOGPARMS => '',
VERSION => '3.9.0-1', VERSION => '3.9.0-1',
); );
@ -366,9 +367,12 @@ sub get_configuration() {
default_yes_no 'BLACKLISTNEWONLY' , ''; default_yes_no 'BLACKLISTNEWONLY' , '';
default_yes_no 'DISABLE_IPV6' , ''; default_yes_no 'DISABLE_IPV6' , '';
default_yes_no 'DYNAMIC_ZONES' , ''; default_yes_no 'DYNAMIC_ZONES' , '';
default_yes_no 'BRIDGING' , '';
fatal_error "DYNAMIC_ZONES=Yes is incompatible with the -e option" if $config{DYNAMIC_ZONES} and $ENV{EXPORT}; fatal_error "DYNAMIC_ZONES=Yes is incompatible with the -e option" if $config{DYNAMIC_ZONES} and $ENV{EXPORT};
default_yes_no 'BRIDGING' , '';
fatal_error 'BRIDGING=Yes is not supported by Shorewall-pl' . $env{VERSION} if $config{BRIDGING};
default_yes_no 'STARTUP_ENABLED' , 'Yes'; default_yes_no 'STARTUP_ENABLED' , 'Yes';
default_yes_no 'DELAYBLACKLISTLOAD' , ''; default_yes_no 'DELAYBLACKLISTLOAD' , '';
@ -376,11 +380,11 @@ sub get_configuration() {
default_yes_no 'RFC1918_STRICT' , ''; default_yes_no 'RFC1918_STRICT' , '';
default_yes_no 'SAVE_IPSETS' , ''; default_yes_no 'SAVE_IPSETS' , '';
warning_message 'SAVE_IPSETS=Yes is not supported by Shorewall4 ' . $env{VERSION} if $config{SAVE_IPSETS}; warning_message 'SAVE_IPSETS=Yes is not supported by Shorewall-pl ' . $env{VERSION} if $config{SAVE_IPSETS};
default_yes_no 'MAPOLDACTIONS' , ''; default_yes_no 'MAPOLDACTIONS' , '';
warning_message 'MAPOLDACTIONS=Yes is not supported by Shorewall4 ' . $env{VERSION} if $config{MAPOLDACTIONS}; warning_message 'MAPOLDACTIONS=Yes is not supported by Shorewall-pl ' . $env{VERSION} if $config{MAPOLDACTIONS};
default_yes_no 'FASTACCEPT' , ''; default_yes_no 'FASTACCEPT' , '';
default_yes_no 'IMPLICIT_CONTINUE' , ''; default_yes_no 'IMPLICIT_CONTINUE' , '';
@ -571,7 +575,7 @@ sub generate_aux_config() {
create_temp_aux_config; create_temp_aux_config;
emit( "#\n# Shorewall auxiliary configuration file created by Shorewall4 version " . $env{VERSION} . ' - ' . ( localtime ) . "\n#" ); emit( "#\n# Shorewall auxiliary configuration file created by Shorewall-pl version " . $env{VERSION} . ' - ' . ( localtime ) . "\n#" );
for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS) { for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS) {
conditionally_add_option $option; conditionally_add_option $option;

2
New/Shorewall/Hosts.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Hosts.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Hosts.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/IPAddrs.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/IPAddrs.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/IPAddrs.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Interfaces.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Interfaces.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Interfaces.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Macros.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Macros.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Macros.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Nat.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Nat.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Nat.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Policy.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Policy.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Policy.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Providers.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Providers.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Providers.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Proxyarp.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Proxyarp.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Proxyarp.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Rules.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Rules.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Rules.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Tc.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Tc.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Tc.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Tunnels.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Tunnels.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Tunnels.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

2
New/Shorewall/Zones.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall4 3.9 -- /usr/share/shorewall4/Shorewall/Zones.pm # Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Zones.pm
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #

18
New/compiler.pl
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
# #
# The Shoreline Firewall4 (Shorewall4) Packet Filtering Firewall Compiler - V3.9 # The Shoreline Firewall4 (Shorewall-pl) Packet Filtering Firewall Compiler - V3.9
# #
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm] # This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
# #
@ -40,7 +40,7 @@
# This program performs rudimentary shell variable expansion on action and macro files. # This program performs rudimentary shell variable expansion on action and macro files.
use strict; use strict;
use lib '/usr/share/shorewall4'; use lib '/usr/share/shorewall-pl';
use Shorewall::Common; use Shorewall::Common;
use Shorewall::Config; use Shorewall::Config;
use Shorewall::Chains; use Shorewall::Chains;
@ -60,7 +60,7 @@ use Shorewall::Proc;
use Shorewall::Proxyarp; use Shorewall::Proxyarp;
sub generate_script_1 { sub generate_script_1 {
copy '/usr/share/shorewall4/prog.header'; copy $env{SHAREDIR4} . 'prog.header';
my $date = localtime; my $date = localtime;
@ -442,7 +442,7 @@ stop_firewall() {
sub generate_script_2 () { sub generate_script_2 () {
copy '/usr/share/shorewall4/prog.functions'; copy $env{SHAREDIR4} . 'prog.functions';
emit '#'; emit '#';
emit '# Setup Routing and Traffic Shaping'; emit '# Setup Routing and Traffic Shaping';
@ -575,7 +575,7 @@ esac';
emit "}\n"; emit "}\n";
copy '/usr/share/shorewall4/prog.footer'; copy $env{SHAREDIR4} . 'prog.footer';
} }
sub compile_firewall( $ ) { sub compile_firewall( $ ) {
@ -593,14 +593,12 @@ sub compile_firewall( $ ) {
report_capabilities if $ENV{VERBOSE} > 1; report_capabilities if $ENV{VERBOSE} > 1;
fatal_error( 'Shorewall4 ' . $env{VERSION} . ' requires Conntrack Match Support' ) fatal_error( 'Shorewall-pl ' . $env{VERSION} . ' requires Conntrack Match Support' )
unless $capabilities{CONNTRACK_MATCH}; unless $capabilities{CONNTRACK_MATCH};
fatal_error( 'Shorewall4 ' . $env{VERSION} . ' requires Extended Multi-port Match Support' ) fatal_error( 'Shorewall-pl ' . $env{VERSION} . ' requires Extended Multi-port Match Support' )
unless $capabilities{XMULTIPORT}; unless $capabilities{XMULTIPORT};
fatal_error( 'Shorewall4 ' . $env{VERSION} . ' requires Address Type Match Support' ) fatal_error( 'Shorewall-pl ' . $env{VERSION} . ' requires Address Type Match Support' )
unless $capabilities{ADDRTYPE}; unless $capabilities{ADDRTYPE};
fatal_error 'BRIDGING=Yes is not supported by the ' . $env{VERSION} . ' Perl-based compiler'
if $config{BRIDGING};
fatal_error 'MACLIST_TTL requires the Recent Match capability which is not present in your Kernel and/or iptables' fatal_error 'MACLIST_TTL requires the Recent Match capability which is not present in your Kernel and/or iptables'
if $config{MACLIST_TTL} && ! $capabilities{RECENT_MATCH}; if $config{MACLIST_TTL} && ! $capabilities{RECENT_MATCH};
fatal_error 'RFC1918_STRICT=Yes requires Connection Tracking match' fatal_error 'RFC1918_STRICT=Yes requires Connection Tracking match'

10
New/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall4 3.9.0 Shorewall-pl 3.9.0
This companion product to Shorewall 3.4.2 and later includes a complete This companion product to Shorewall 3.4.2 and later includes a complete
rewrite of the compiler in Perl. rewrite of the compiler in Perl.
@ -74,17 +74,17 @@ Installation
1) Unpack the tarball. 1) Unpack the tarball.
$ tar -jxf shorewall4-3.9.0-1.tar.bz2 $ tar -jxf shorewall-pl-3.9.0-1.tar.bz2
$ pwd $ pwd
/home/teastep/shorewall/ /home/teastep/shorewall/
$ ls $ ls
shorewall4-3.9.0/ shorewall-pl-3.9.0/
$ $
2) As root, create a symbolic link to the directory containing the unpacked 2) As root, create a symbolic link to the directory containing the unpacked
files. files.
$ ln -sf /home/teastep/shorewall/ /usr/share/shorewall4 $ ln -sf /home/teastep/shorewall/ /usr/share/shorewall-pl
Using the New compiler Using the New compiler
---------------------- ----------------------
@ -92,7 +92,7 @@ Using the New compiler
By default, the old Bourne-shell based compiler will be used. By default, the old Bourne-shell based compiler will be used.
There is one change in Shorewall operation that is triggered when There is one change in Shorewall operation that is triggered when
/usr/share/shorewall4 exists and is either a directory or a symbolic /usr/share/shorewall-pl exists and is either a directory or a symbolic
link that points to a directory: Your params file will be processed link that points to a directory: Your params file will be processed
with the shell's '-a' option set which will automatically export any with the shell's '-a' option set which will automatically export any
variables that you set or create. variables that you set or create.