diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index 41a24b6ed..250cb4262 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -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. diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 38c43f86d..afa7198db 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -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' diff --git a/Shorewall-perl/compiler.pl b/Shorewall-perl/compiler.pl index e6b7f919c..1d25519fd 100755 --- a/Shorewall-perl/compiler.pl +++ b/Shorewall-perl/compiler.pl @@ -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 -# 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');