From d7964121254d547368da57d73204feef125fe376 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 16 Apr 2007 22:39:29 +0000 Subject: [PATCH] Fix dynamic zones git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5959 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/lib.config | 3 ++- .../lib.dynamiczones | 0 Shorewall-common/releasenotes.txt | 13 ++++++++++++- Shorewall-common/shorewall.spec | 3 +++ Shorewall-shell/shorewall-shell.spec | 3 ++- 5 files changed, 19 insertions(+), 3 deletions(-) rename {Shorewall-shell => Shorewall-common}/lib.dynamiczones (100%) diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config index b5d3b85b2..0e973943c 100644 --- a/Shorewall-common/lib.config +++ b/Shorewall-common/lib.config @@ -2113,6 +2113,7 @@ do_initialize() { strip_file_and_lib_load tcrules tcrules strip_file tos strip_file_and_lib_load tunnels tunnels - FW= fi + + FW= } diff --git a/Shorewall-shell/lib.dynamiczones b/Shorewall-common/lib.dynamiczones similarity index 100% rename from Shorewall-shell/lib.dynamiczones rename to Shorewall-common/lib.dynamiczones diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 4ac925f9b..0f32d990d 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -47,7 +47,18 @@ Problems corrected in Shorewall 3.9.2 'shorewall clear' failed with the diagnostic: ERROR: USE_ACTIONS=Yes requires the Shorewall Library actions - (/usr/share/shorewall-shell/lib.actions) which is not installed + (/usr/share/shorewall-shell/lib.actions) which is not installed. + +8) When shorewall-shell was not installed, 'shorewall add' and + 'shorewall clear' failed with the diagnostic: + + ERROR: The add command requires the Shorewall library dynamiczones + (/usr/share/shorewall-shell/lib.dynamiczones) which is not + installed + + With shorewall-shell installed, 'shorewall add' failed with: + + ERROR: Only one firewall zone may be defined Other changes in Shorewall 3.9.2 diff --git a/Shorewall-common/shorewall.spec b/Shorewall-common/shorewall.spec index 7856616f2..3806250ba 100644 --- a/Shorewall-common/shorewall.spec +++ b/Shorewall-common/shorewall.spec @@ -117,6 +117,7 @@ fi %attr(0444,root,root) /usr/share/shorewall/lib.base %attr(0444,root,root) /usr/share/shorewall/lib.cli %attr(0444,root,root) /usr/share/shorewall/lib.config +%attr(0444,root,root) /usr/share/shorewall/lib.dynamiczones %attr(0644,root,root) /usr/share/shorewall/macro.AllowICMPs %attr(0644,root,root) /usr/share/shorewall/macro.Amanda %attr(0644,root,root) /usr/share/shorewall/macro.Auth @@ -251,6 +252,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Mon Arp 16 2007 Tom EAstep tom@shorewall.net +- Moved lib.dynamiczones from Shorewall-shell * Sat Apr 14 2007 Tom Eastep tom@shorewall.net - Updated to 3.9.2-1 * Tue Apr 03 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index 5b8588f37..bda12e13a 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -69,7 +69,6 @@ fi %attr(0555,root,root) /usr/share/shorewall-shell/compiler %attr(0444,root,root) /usr/share/shorewall-shell/lib.accounting %attr(0444,root,root) /usr/share/shorewall-shell/lib.actions -%attr(0444,root,root) /usr/share/shorewall-shell/lib.dynamiczones %attr(0444,root,root) /usr/share/shorewall-shell/lib.maclist %attr(0444,root,root) /usr/share/shorewall-shell/lib.nat %attr(0444,root,root) /usr/share/shorewall-shell/lib.providers @@ -83,6 +82,8 @@ fi %doc COPYING INSTALL %changelog +* Mon Arp 16 2007 Tom EAstep tom@shorewall.net +- Moved lib.dynamiczones to Shorewall-common * Sat Apr 14 2007 Tom Eastep tom@shorewall.net - Updated to 3.9.2-1 * Tue Apr 03 2007 Tom Eastep tom@shorewall.net