Fix for unexpected /usr/share/shorewall/init

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall/Perl/Shorewall/Config.pm

@@ -3286,7 +3286,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 ) {
 		#

Shorewall/changelog.txt

@@ -4,6 +4,8 @@ Changes in Shorewall 4.4.14.1
 
 2)  Fix NULL_ROUTE_RFC1918
 
+3)  Fix problem of appending incorrect files.
+
 Changes in Shorewall 4.4.14
 
 1)  Support ipset lists.

Shorewall/known_problems.txt

@@ -1,3 +1,21 @@
 1)  On systems running Upstart, shorewall-init cannot reliably start the
     firewall before interfaces are brought up.
 
+2)  If a route exists for an entire RFC1918 subnet (10.0.0.0/8,
+    172.20.0.0/12 or 192.168.0.0/16), then setting
+    NULL_ROUTE_RFC1918=Yes will cause the route to be replaced with an
+    'unreachable' one.
+
+3)  Shorewall6 fails to start correctly if all the following are 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.
+
+

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.
+
 4.4.14
 
 1)  Previously, messages to the STARTUP_LOG had inconsistent date formats.