extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-23 13:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename lib.run to lib.common

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-04 09:54:56 -08:00
parent 41d709b043
commit 7757c0bc20
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/shorewall-lite.spec
View File

@ -88,7 +88,7 @@ fi
%attr(- ,root,root) /usr/share/shorewall-lite/functions %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.base
%attr(0644,root,root) /usr/share/shorewall-lite/lib.cli %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(0644,root,root) /usr/share/shorewall-lite/modules
%attr(0544,root,root) /usr/share/shorewall-lite/shorecap %attr(0544,root,root) /usr/share/shorewall-lite/shorecap
%attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup %attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -72,7 +72,7 @@ sub initialize_package_globals() {
# #
# First stage of script generation. # 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. # 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 # 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 { } else {
copy $globals{SHAREDIRPL} . 'prog.header6'; copy $globals{SHAREDIRPL} . 'prog.header6';
} }
copy $globals{SHAREDIR} . '/lib.run'; copy $globals{SHAREDIR} . '/lib.common';
} }
my $lib = find_file 'lib.private'; my $lib = find_file 'lib.private';

8
Shorewall/lib.run
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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] # 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 # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 $@ $SHOREWALL_SHELL $script $options $@
} }
################################################################################# #################################################################################
# End of lib.run # End of lib.common
################################################################################# #################################################################################

2
Shorewall/shorewall.spec
View File

@ -89,7 +89,7 @@ fi
%attr(- ,root,root) /usr/share/shorewall/functions %attr(- ,root,root) /usr/share/shorewall/functions
%attr(0644,root,root) /usr/share/shorewall/lib.base %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.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/macro.*
%attr(0644,root,root) /usr/share/shorewall/modules %attr(0644,root,root) /usr/share/shorewall/modules
%attr(0644,root,root) /usr/share/shorewall/helpers %attr(0644,root,root) /usr/share/shorewall/helpers

2
Shorewall6-lite/shorewall6-lite.spec
View File

@ -79,7 +79,7 @@ fi
%attr(- ,root,root) /usr/share/shorewall6-lite/functions %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.base
%attr(0644,root,root) /usr/share/shorewall6-lite/lib.cli %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(0644,root,root) /usr/share/shorewall6-lite/modules
%attr(0544,root,root) /usr/share/shorewall6-lite/shorecap %attr(0544,root,root) /usr/share/shorewall6-lite/shorecap
%attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup %attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup

4
Shorewall6/lib.run
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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] # 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 $@ $SHOREWALL_SHELL $script $options $@
} }
################################################################################# #################################################################################
# End of lib.run # End of lib.common
################################################################################# #################################################################################

2
Shorewall6/shorewall6.spec
View File

@ -82,7 +82,7 @@ fi
%attr(- ,root,root) /usr/share/shorewall6/functions %attr(- ,root,root) /usr/share/shorewall6/functions
%attr(0644,root,root) /usr/share/shorewall6/lib.base %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.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/macro.*
%attr(0644,root,root) /usr/share/shorewall6/modules %attr(0644,root,root) /usr/share/shorewall6/modules
%attr(0644,root,root) /usr/share/shorewall6/helpers %attr(0644,root,root) /usr/share/shorewall6/helpers