From 7757c0bc206a7ea8dcf0ff6d9c538627ebd902c3 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 4 Mar 2010 09:54:56 -0800 Subject: [PATCH] Rename lib.run to lib.common Signed-off-by: Tom Eastep --- Shorewall-lite/shorewall-lite.spec | 2 +- Shorewall/Perl/Shorewall/Compiler.pm | 4 ++-- Shorewall/lib.run | 8 +++++--- Shorewall/shorewall.spec | 2 +- Shorewall6-lite/shorewall6-lite.spec | 2 +- Shorewall6/lib.run | 4 ++-- Shorewall6/shorewall6.spec | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index d678b9d56..c2a1e1816 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -88,7 +88,7 @@ fi %attr(- ,root,root) /usr/share/shorewall-lite/functions %attr(0644,root,root) /usr/share/shorewall-lite/lib.base %attr(0644,root,root) /usr/share/shorewall-lite/lib.cli -%attr(0644,root,root) /usr/share/shorewall-lite/lib.run +%attr(0644,root,root) /usr/share/shorewall-lite/lib.common %attr(0644,root,root) /usr/share/shorewall-lite/modules %attr(0544,root,root) /usr/share/shorewall-lite/shorecap %attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 537cf060e..7518e3944 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -72,7 +72,7 @@ sub initialize_package_globals() { # # First stage of script generation. # -# Copy prog.header to the generated script. +# Copy prog.header and lib.common to the generated script. # Generate the various user-exit jacket functions. # # Note: This function is not called when $command eq 'check'. So it must have no side effects other @@ -91,7 +91,7 @@ sub generate_script_1() { } else { copy $globals{SHAREDIRPL} . 'prog.header6'; } - copy $globals{SHAREDIR} . '/lib.run'; + copy $globals{SHAREDIR} . '/lib.common'; } my $lib = find_file 'lib.private'; diff --git a/Shorewall/lib.run b/Shorewall/lib.run index 394927a72..2a7e1312d 100644 --- a/Shorewall/lib.run +++ b/Shorewall/lib.run @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall 4.4 -- /usr/share/shorewall/lib.run. +# Shorewall 4.4 -- /usr/share/shorewall/lib.common. # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # @@ -21,7 +21,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# This library contains the wrapper code for running a generated script. +# This library will gradually replace lib.base. It's purpose is to hold those functions +# used by both the CLI and by the generated firewall scripts. To avoid versioning issues, +# it is copied into generated scripts rather than loaded at run-time. # # @@ -107,5 +109,5 @@ run_it() { $SHOREWALL_SHELL $script $options $@ } ################################################################################# -# End of lib.run +# End of lib.common ################################################################################# diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index cda86607d..0822ccdb2 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -89,7 +89,7 @@ fi %attr(- ,root,root) /usr/share/shorewall/functions %attr(0644,root,root) /usr/share/shorewall/lib.base %attr(0644,root,root) /usr/share/shorewall/lib.cli -%attr(0644,root,root) /usr/share/shorewall/lib.run +%attr(0644,root,root) /usr/share/shorewall/lib.common %attr(0644,root,root) /usr/share/shorewall/macro.* %attr(0644,root,root) /usr/share/shorewall/modules %attr(0644,root,root) /usr/share/shorewall/helpers diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index f598c6de0..ee2536c93 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -79,7 +79,7 @@ fi %attr(- ,root,root) /usr/share/shorewall6-lite/functions %attr(0644,root,root) /usr/share/shorewall6-lite/lib.base %attr(0644,root,root) /usr/share/shorewall6-lite/lib.cli -%attr(0644,root,root) /usr/share/shorewall6-lite/lib.run +%attr(0644,root,root) /usr/share/shorewall6-lite/lib.common %attr(0644,root,root) /usr/share/shorewall6-lite/modules %attr(0544,root,root) /usr/share/shorewall6-lite/shorecap %attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup diff --git a/Shorewall6/lib.run b/Shorewall6/lib.run index 09f2bada2..ddc63c6ec 100644 --- a/Shorewall6/lib.run +++ b/Shorewall6/lib.run @@ -1,6 +1,6 @@ #!/bin/sh # -# Shorewall 4.4 -- /usr/share/shorewall6/lib.run. +# Shorewall 4.4 -- /usr/share/shorewall6/lib.common. # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # @@ -106,5 +106,5 @@ run_it() { $SHOREWALL_SHELL $script $options $@ } ################################################################################# -# End of lib.run +# End of lib.common ################################################################################# diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index b903b7e91..bd137b9c7 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -82,7 +82,7 @@ fi %attr(- ,root,root) /usr/share/shorewall6/functions %attr(0644,root,root) /usr/share/shorewall6/lib.base %attr(0644,root,root) /usr/share/shorewall6/lib.cli -%attr(0644,root,root) /usr/share/shorewall6/lib.run +%attr(0644,root,root) /usr/share/shorewall6/lib.common %attr(0644,root,root) /usr/share/shorewall6/macro.* %attr(0644,root,root) /usr/share/shorewall6/modules %attr(0644,root,root) /usr/share/shorewall6/helpers