diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index 23d853ca0..40bbe2ca6 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -3,6 +3,9 @@ Changes in 4.1.4 1) Fix do_test() to accept 0 and to use the same mask as Shorewall-shell +2) The compilation date recorded in the firewall.conf file produced by + Shorewall-perl was previously mangled. + Changes in 4.1.3 1) Fix NFLOG/ULOG upcasing problem. diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index a19303e72..b5f4359df 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -20,6 +20,9 @@ Problems corrected in Shorewall 4.1.4. Also, the default mask for entries in these columns has been changed from 0xFF to 0xFFFF for compatibility with Shorewall-shell. +2) The compilation date recorded in the firewall.conf file produced by + Shorewall-perl was previously mangled. + Other changes in Shorewall 4.1.3. None. diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index c3560164c..1914c73e1 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -2131,7 +2131,9 @@ sub generate_aux_config() { create_temp_aux_config; - emit join ( '', "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version ", $globals{VERSION}, ' - ' , localtime , "\n#" ); + my $date = localtime; + + emit "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version $globals{VERSION} - $date\n#"; for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE SAVE_IPSETS) { conditionally_add_option $option;