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

Remove 3.4 compatibility hacks from Shorewall-perl

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6805 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-08 15:58:13 +00:00
parent ce6ebfdc0a
commit 0251c3729e
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -4,6 +4,8 @@ Changes in 4.0.0 RC 2
2) Remove -f as default start OPTIONS.
3) Remove 3.4 compatibility hacks.
Changes in 4.0.0 RC 1
1) shorewall-perl RPM no longer installable under shorewall 3.4.

5
Shorewall-common/releasenotes.txt
View File

@ -32,12 +32,15 @@ Problems corrected in 4.0.0 RC 2.
Other changes in Shorewall 4.0.0 RC 2.
2) The -f option is no longer the default when Shorewall is started at
1) The -f option is no longer the default when Shorewall is started at
boot time (usually via /etc/init.d/shorewall). With Shorewall-perl,
"shorewall start" is nearly as fast as "shorewall restore" and
"shorewall start" uses the current configuration which avoids
confusion.
2) Code in Shorewall-perl that allowed it to run under Shorewall 3.4
has been removed (although it might still work under 3.4.4).
Migration Considerations:
1) Beginning with Shorewall 4.0.0, there is no single 'shorewall'

18
Shorewall-perl/compiler.pl
View File

@ -33,16 +33,6 @@
# --timestamp # Timestamp all progress messages
# --debug # Print stack trace on warnings and fatal error.
#
# Default values for compiler options are given in environmental variables as follows:
#
# Option Variable
#
# --verbosity VERBOSE
# --export EXPORT
# --directory SHOREWALL_DIR
# --timestamp TIMESTAMP
# --debug <none>
#
use strict;
use lib '/usr/share/shorewall-perl';
use Shorewall::Compiler;
@ -56,10 +46,10 @@ sub usage() {
#
# E x e c u t i o n B e g i n s H e r e
#
my $export = $ENV{EXPORT} || 0;
my $shorewall_dir = $ENV{SHOREWALL_DIR} || '';
my $verbose = $ENV{VERBOSE} || 0;
my $timestamp = $ENV{TIMESTAMP} || '';
my $export = 0;
my $shorewall_dir = '';
my $verbose = 0;
my $timestamp = '';
my $debug = 0;
Getopt::Long::Configure ('bundling');