From 775bee278a602c56a5d51f950d36f3f43cd07d70 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 11 Nov 2010 13:03:00 -0800 Subject: [PATCH] Fix for unexpected /usr/share/shorewall/init Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 2 +- Shorewall/changelog.txt | 2 ++ Shorewall/releasenotes.txt | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index fc8e3dc10..366dbe607 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -3322,7 +3322,7 @@ sub append_file( $;$$ ) { $indent = '' if $unindented; - unless ( $user_exit =~ /^($globals{SHAREDIR})/ ) { + unless ( $user_exit =~ /^($globals{SHAREDIRPL})/ ) { #Don't copy from /usr/share/shorewall* if ( -f $user_exit ) { if ( $nomsg ) { # diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 6539ac9af..07537fd40 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -6,6 +6,8 @@ Changes in Shorewall 4.4.15 3) Fix NULL_ROUTE_RFC1918 +4) Fix problem of appending incorrect files. + Changes in Shorewall 4.4.14 1) Support ipset lists. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 53e4d7e0b..ddce261b6 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -22,6 +22,18 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES NULL_ROUTE_RFC1918=Yes would cause the route to be replaced with an 'unreachable' one. +3) Shorewall6 failed to start correctly if all the following were true: + + - Shorewall was installed using the tarball. It may have + subsequently been installed using a distribution-specific package + or the rpm from shorewall.net without first unstalling the + tarball components. + + - Shorewall6 was installed using a distribution-specific package or + the rpm from shorewall.net. + + - The file /etc/shorewall6/init was not created. + ---------------------------------------------------------------------------- I I. K N O W N P R O B L E M S R E M A I N I N G ----------------------------------------------------------------------------