Change shorewall-pl to shorewall-perl

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5726 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-28 16:19:35 +00:00
parent 9edff873c9
commit cc755b33b9
22 changed files with 81 additions and 81 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
#
# Shorewall-pl 3.9 -- /usr/share/shorewall-pl/Shorewall/Config.pm
# Shorewall-perl 3.9 -- /usr/share/shorewall-perl/Shorewall/Config.pm
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#
@ -37,7 +37,7 @@ our @VERSION = 1.00;
#
our %env = ( SHAREDIR => '/usr/share/shorewall' ,
CONFDIR => '/etc/shorewall',
SHAREDIRPL => '/usr/share/shorewall-pl/',
SHAREDIRPL => '/usr/share/shorewall-perl/',
LOGPARMS => '',
VERSION => '3.9.0-1',
);
@ -117,7 +117,7 @@ our %config =
USE_ACTIONS=> undef,
OPTIMIZE => undef,
EXPORTPARAMS => undef,
SHOREWALL_PL => undef,
SHOREWALL_PERL => undef,
#
# Packet Disposition
#
@ -380,7 +380,7 @@ sub get_configuration() {
default_yes_no 'BRIDGING' , '';
fatal_error 'BRIDGING=Yes is not supported by Shorewall-pl' . $env{VERSION} if $config{BRIDGING};
fatal_error 'BRIDGING=Yes is not supported by Shorewall-perl' . $env{VERSION} if $config{BRIDGING};
default_yes_no 'STARTUP_ENABLED' , 'Yes';
default_yes_no 'DELAYBLACKLISTLOAD' , '';
@ -388,11 +388,11 @@ sub get_configuration() {
default_yes_no 'RFC1918_STRICT' , '';
default_yes_no 'SAVE_IPSETS' , '';
warning_message 'SAVE_IPSETS=Yes is not supported by Shorewall-pl ' . $env{VERSION} if $config{SAVE_IPSETS};
warning_message 'SAVE_IPSETS=Yes is not supported by Shorewall-perl ' . $env{VERSION} if $config{SAVE_IPSETS};
default_yes_no 'MAPOLDACTIONS' , '';
warning_message 'MAPOLDACTIONS=Yes is not supported by Shorewall-pl ' . $env{VERSION} if $config{MAPOLDACTIONS};
warning_message 'MAPOLDACTIONS=Yes is not supported by Shorewall-perl ' . $env{VERSION} if $config{MAPOLDACTIONS};
default_yes_no 'FASTACCEPT' , '';
default_yes_no 'IMPLICIT_CONTINUE' , '';
@ -577,7 +577,7 @@ sub generate_aux_config() {
create_temp_aux_config;
emit( "#\n# Shorewall auxiliary configuration file created by Shorewall-pl version " . $env{VERSION} . ' - ' . ( localtime ) . "\n#" );
emit( "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version " . $env{VERSION} . ' - ' . ( localtime ) . "\n#" );
for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS) {
conditionally_add_option $option;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#! /usr/bin/perl -w
#
# The Shoreline Firewall4 (Shorewall-pl) Packet Filtering Firewall Compiler - V3.9
# The Shoreline Firewall4 (Shorewall-perl) Packet Filtering Firewall Compiler - V3.9
#
# 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.
use strict;
use lib '/usr/share/shorewall-pl';
use lib '/usr/share/shorewall-perl';
use Shorewall::Common;
use Shorewall::Config;
use Shorewall::Chains;
@ -96,7 +96,7 @@ sub generate_script_1 {
my $date = localtime;
emit "#\n# Compiled firewall script generated by Shorewall-pl $env{VERSION} - $date\n#";
emit "#\n# Compiled firewall script generated by Shorewall-perl $env{VERSION} - $date\n#";
if ( $ENV{EXPORT} ) {
emitj ( 'SHAREDIR=/usr/share/shorewall-lite',
@ -655,11 +655,11 @@ sub compiler( $ ) {
report_capabilities if $ENV{VERBOSE} > 1;
fatal_error join( '', 'Shorewall-pl ', $env{VERSION}, ' requires Conntrack Match Support' )
fatal_error join( '', 'Shorewall-perl ', $env{VERSION}, ' requires Conntrack Match Support' )
unless $capabilities{CONNTRACK_MATCH};
fatal_error join ( '', 'Shorewall-pl ', $env{VERSION}, ' requires Multi-port Match Support' )
fatal_error join ( '', 'Shorewall-perl ', $env{VERSION}, ' requires Multi-port Match Support' )
unless $capabilities{MULTIPORT};
fatal_error join( '', 'Shorewall-pl ', $env{VERSION}, ' requires Address Type Match Support' )
fatal_error join( '', 'Shorewall-perl ', $env{VERSION}, ' requires Address Type Match Support' )
unless $capabilities{ADDRTYPE};
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};

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Script to install Shorewall-pl.
# Script to install Shorewall-perl.
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#
@ -117,7 +117,7 @@ while [ $# -gt 0 ] ; do
usage 0
;;
-v)
echo "Shorewall-pl Installer Version $VERSION"
echo "Shorewall-perl Installer Version $VERSION"
exit 0
;;
-n)
@ -150,42 +150,42 @@ fi
#
cd "$(dirname $0)"
echo "Installing Shorewall-pl Version $VERSION"
echo "Installing Shorewall-perl Version $VERSION"
#
# /usr/share/shorewall-pl if needed
# /usr/share/shorewall-perl if needed
#
mkdir -p ${PREFIX}/usr/share/shorewall-pl/Shorewall
mkdir -p ${PREFIX}/usr/share/shorewall-perl/Shorewall
chmod 755 ${PREFIX}/usr/share/shorewall-pl
chmod 755 ${PREFIX}/usr/share/shorewall-pl/Shorewall
chmod 755 ${PREFIX}/usr/share/shorewall-perl
chmod 755 ${PREFIX}/usr/share/shorewall-perl/Shorewall
#
# Install the Compiler
#
install_file compiler.pl ${PREFIX}/usr/share/shorewall-pl/compiler.pl 0555
install_file compiler.pl ${PREFIX}/usr/share/shorewall-perl/compiler.pl 0555
echo
echo "Compiler installed in ${PREFIX}/usr/share/shorewall-pl/compiler.pl"
echo "Compiler installed in ${PREFIX}/usr/share/shorewall-perl/compiler.pl"
#
# Install the libraries
#
for f in Shorewall/*.pm ; do
install_file $f ${PREFIX}/usr/share/shorewall-pl/$f 0644
echo "Library ${f%.*} file installed as ${PREFIX}/usr/share/shorewall-pl/$f"
install_file $f ${PREFIX}/usr/share/shorewall-perl/$f 0644
echo "Library ${f%.*} file installed as ${PREFIX}/usr/share/shorewall-perl/$f"
done
#
# Install the program skeleton files
#
for f in prog.* ; do
install_file $f ${PREFIX}/usr/share/shorewall-pl/$f 0644
echo "Program skeleton file ${f#*.} installed as ${PREFIX}/usr/share/shorewall-pl/$f"
install_file $f ${PREFIX}/usr/share/shorewall-perl/$f 0644
echo "Program skeleton file ${f#*.} installed as ${PREFIX}/usr/share/shorewall-perl/$f"
done
#
# Report Success
#
echo "Shorewall-pl Version $VERSION Installed"
echo "Shorewall-perl Version $VERSION Installed"

View File

@ -1,25 +1,25 @@
Shorewall-pl 3.9.0
Shorewall-perl 3.9.0
This companion product to Shorewall 3.4.2 and later includes a complete
rewrite of the compiler in Perl.
Shorewall-pl depends on Shorewall (3.4.2 or later). So if you want to use the
new compiler, you must install both Shorewall and Shorewall-pl.
Shorewall-perl depends on Shorewall (3.4.2 or later). So if you want to use the
new compiler, you must install both Shorewall and Shorewall-perl.
Even if you install Shorewall-pl, you have a choice of which compiler you use.
Even if you install Shorewall-perl, you have a choice of which compiler you use.
The choice is specified in the shorewall.conf file so you can select the
compiler to use on a system-by-system basis when running Shorewall Lite on
remote systems.
I decided to make Shorewall-pl a separate product for several reasons:
I decided to make Shorewall-perl a separate product for several reasons:
a) Embedded applications are unlikely to adopt Shorewall-pl; even Mini-Perl
a) Embedded applications are unlikely to adopt Shorewall-perl; even Mini-Perl
has a substantial disk and Ram footprint.
b) Because of the gross incompatibilities between the new compiler and the
old (see below), migration to the new compiler must be voluntary.
c) By allowing Shorewall-pl to co-exist with the current Shorewall stable
c) By allowing Shorewall-perl to co-exist with the current Shorewall stable
release (3.4), I'm hoping that the new compiler will get more testing and
validation than it would if I were to package it with a new development
version of Shorewall itself.
@ -122,8 +122,8 @@ Installation
Either
$ tar -jxf shorewall-pl-3.9.0.tar.bz2
$ cd shorewall-pl-3.9.0
$ tar -jxf shorewall-perl-3.9.0.tar.bz2
$ cd shorewall-perl-3.9.0
$ ./install.sh
or
@ -136,7 +136,7 @@ Using the New compiler
By default, the old Bourne-shell based compiler will be used.
There is one change in Shorewall operation that is triggered when
/usr/share/shorewall-pl exists and is either a directory or a symbolic
/usr/share/shorewall-perl exists and is either a directory or a symbolic
link that points to a directory: Your params file will be processed
with the shell's '-a' option set which will automatically export any
variables that you set or create in that file. Since the params file is
@ -146,7 +146,7 @@ should it be used.
To actually use the new compiler, add this to shorewall.conf:
SHOREWALL_PL=Yes
SHOREWALL_PERL=Yes
If you add this setting to /etc/shorewall/shorewall.conf then by
default, the new compiler will be used on the system. If you add it to

View File

@ -1,4 +1,4 @@
%define name shorewall-pl
%define name shorewall-perl
%define version 3.9.0
%define release 1
%define prefix /usr
@ -23,7 +23,7 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter
(iptables) based firewall that can be used on a dedicated firewall system,
a multi-function gateway/ router/server or on a standalone GNU/Linux system.
Shorewall-pl is a companion product to Shorewall that allows faster
Shorewall-perl is a companion product to Shorewall that allows faster
compilation and execution.
%prep
@ -50,31 +50,31 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%attr(0755,root,root) %dir /usr/share/shorewall-pl
%attr(0755,root,root) %dir /usr/share/shorewall-pl/Shorewall
%attr(0755,root,root) %dir /usr/share/shorewall-perl
%attr(0755,root,root) %dir /usr/share/shorewall-perl/Shorewall
%attr(555,root,root) /usr/share/shorewall-pl/compiler.pl
%attr(0644,root,root) /usr/share/shorewall-pl/prog.header
%attr(0644,root,root) /usr/share/shorewall-pl/prog.functions
%attr(0644,root,root) /usr/share/shorewall-pl/prog.footer
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Accounting.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Actions.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Chains.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Common.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Config.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Hosts.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Interfaces.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/IPAddrs.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Macros.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Nat.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Policy.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Proc.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Providers.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Proxyarp.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Rules.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Tc.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Tunnels.pm
%attr(0555,root,root) /usr/share/shorewall-pl/Shorewall/Zones.pm
%attr(555,root,root) /usr/share/shorewall-perl/compiler.pl
%attr(0644,root,root) /usr/share/shorewall-perl/prog.header
%attr(0644,root,root) /usr/share/shorewall-perl/prog.functions
%attr(0644,root,root) /usr/share/shorewall-perl/prog.footer
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Accounting.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Actions.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Chains.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Common.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Config.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Hosts.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Interfaces.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/IPAddrs.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Macros.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Nat.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Policy.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Proc.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Providers.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Proxyarp.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Rules.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Tc.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Tunnels.pm
%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Zones.pm
%doc COPYING releasenotes.txt