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

Allow Shorewall-perl to be installed before Shorewall

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6684 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-26 22:49:16 +00:00
parent 417707e781
commit 47419bee3f
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shorewall-perl/Shorewall/Config.pm
View File

@ -64,7 +64,7 @@ our @EXPORT = qw(
%globals %globals
%capabilities ); %capabilities );
our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 ); our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 set_config_path );
our $VERSION = 1.00; our $VERSION = 1.00;
# #
@ -346,6 +346,13 @@ sub set_shorewall_dir( $ ) {
$shorewall_dir = shift; $shorewall_dir = shift;
} }
#
# Set $globals{CONFIG_PATH}
#
sub set_config_path( $ ) {
$config{CONFIG_PATH} = shift;
}
# #
# Set $debug # Set $debug
# #

5
Shorewall-perl/buildports.pl
View File

@ -34,7 +34,8 @@ use Shorewall::Config qw( open_file
fatal_error fatal_error
%globals %globals
ensure_config_path ensure_config_path
set_shorewall_dir ); set_shorewall_dir
set_config_path );
our $offset = "\t\t "; our $offset = "\t\t ";
@ -65,6 +66,8 @@ sub print_service( $$ ) {
} }
} }
set_config_path( '/etc/shorewall:/usr/share/shorewall' );
set_shorewall_dir($ARGV[0] || '/etc'); set_shorewall_dir($ARGV[0] || '/etc');
ensure_config_path; ensure_config_path;

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

@ -15,7 +15,7 @@ Source: %{name}-%{version}.tgz
URL: http://www.shorewall.net/ URL: http://www.shorewall.net/
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: perl shorewall Requires: perl
Provides: shorewall_compiler Provides: shorewall_compiler
%description %description