Update version to 3.9.1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5840 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-07 17:14:55 +00:00
parent f714c03826
commit 38861c3a4f
7 changed files with 21 additions and 23 deletions

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall.
VERSION=3.4.2
VERSION=3.9.2
usage() # $1 = exit status
{

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
VERSION=3.4.2
VERSION=3.9.1
usage() # $1 = exit status
{

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.4.2
VERSION=3.9.2
usage() # $1 = exit status
{

View File

@ -59,7 +59,7 @@ our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
CONFDIR => '/etc/shorewall',
SHAREDIRPL => '/usr/share/shorewall-perl/',
LOGPARMS => '',
VERSION => '3.9.0-1',
VERSION => '3.9.1',
);
#
@ -647,7 +647,7 @@ sub ensure_config_path( $ ) {
unless ( $config{CONFIG_PATH} ) {
fatal_error "$f does not exist" unless -f $f;
open $currentfile , '<', $f or fatal_error "Cannot open $f";
open_file $f;
while ( read_a_line ) {
if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {

View File

@ -69,7 +69,9 @@ INIT {
# Generate the 'initialize()' function.
#
sub generate_script_1 {
sub generate_script_1() {
my $export = $_[0];
copy $globals{SHAREDIRPL} . 'prog.header';
my $date = localtime;
@ -488,22 +490,16 @@ sub generate_script_2 () {
save_progress_message 'Initializing...';
if ( $export ) {
my $mf = find_file 'modules';
if ( $mf ne "$globals{SHAREDIR}/module" && -f $mf ) {
emitj( 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir',
'cat > ${VARDIR}/.modules << EOF'
);
open MF, $mf or fatal_error "Unable to open $mf: $!";
while ( my $line = <MF> ) { emit_as_is $line if $line =~ /^\s*loadmodule\b/; }
close MF;
emit_unindented "EOF\n";
my $fn = find_file 'modules';
if ( $fn ne "$globals{SHAREDIR}/modules" && -f $fn ) {
emit 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir';
emit 'cat > ${VARDIR}/.modules << EOF';
open_file $fn;
while ( read_a_line ) {
emit_unindented $line;
}
emit_unindented 'EOF';
emit 'reload_kernel_modules < ${VARDIR}/.modules';
} else {
emit 'load_kernel_modules Yes';

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
VERSION=3.9.0-1
VERSION=3.9.1
usage() # $1 = exit status
{

View File

@ -1,5 +1,5 @@
%define name shorewall-perl
%define version 3.9.0
%define version 3.9.1
%define release 1
%define prefix /usr
@ -80,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Apr 07 2007 Tom Eastep tom@shorewall.net
- Initial version 3.9.1-1
* Sat Mar 24 2007 Tom Eastep tom@shorewall.net
- Initial version 3.9.0-1