mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-24 19:51:40 +02:00
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:
parent
f714c03826
commit
38861c3a4f
@ -28,7 +28,7 @@
|
|||||||
# shown below. Simply run this script to revert to your prior version of
|
# shown below. Simply run this script to revert to your prior version of
|
||||||
# Shoreline Firewall.
|
# Shoreline Firewall.
|
||||||
|
|
||||||
VERSION=3.4.2
|
VERSION=3.9.2
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=3.4.2
|
VERSION=3.9.1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
# You may only use this script to uninstall the version
|
# You may only use this script to uninstall the version
|
||||||
# shown below. Simply run this script to remove Shorewall Firewall
|
# shown below. Simply run this script to remove Shorewall Firewall
|
||||||
|
|
||||||
VERSION=3.4.2
|
VERSION=3.9.2
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -59,7 +59,7 @@ our %globals = ( SHAREDIR => '/usr/share/shorewall' ,
|
|||||||
CONFDIR => '/etc/shorewall',
|
CONFDIR => '/etc/shorewall',
|
||||||
SHAREDIRPL => '/usr/share/shorewall-perl/',
|
SHAREDIRPL => '/usr/share/shorewall-perl/',
|
||||||
LOGPARMS => '',
|
LOGPARMS => '',
|
||||||
VERSION => '3.9.0-1',
|
VERSION => '3.9.1',
|
||||||
);
|
);
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -647,7 +647,7 @@ sub ensure_config_path( $ ) {
|
|||||||
unless ( $config{CONFIG_PATH} ) {
|
unless ( $config{CONFIG_PATH} ) {
|
||||||
fatal_error "$f does not exist" unless -f $f;
|
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 ) {
|
while ( read_a_line ) {
|
||||||
if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
|
if ( $line =~ /^\s*([a-zA-Z]\w*)=(.*?)\s*$/ ) {
|
||||||
|
@ -69,7 +69,9 @@ INIT {
|
|||||||
# Generate the 'initialize()' function.
|
# Generate the 'initialize()' function.
|
||||||
#
|
#
|
||||||
|
|
||||||
sub generate_script_1 {
|
sub generate_script_1() {
|
||||||
|
my $export = $_[0];
|
||||||
|
|
||||||
copy $globals{SHAREDIRPL} . 'prog.header';
|
copy $globals{SHAREDIRPL} . 'prog.header';
|
||||||
|
|
||||||
my $date = localtime;
|
my $date = localtime;
|
||||||
@ -488,22 +490,16 @@ sub generate_script_2 () {
|
|||||||
save_progress_message 'Initializing...';
|
save_progress_message 'Initializing...';
|
||||||
|
|
||||||
if ( $export ) {
|
if ( $export ) {
|
||||||
my $mf = find_file 'modules';
|
my $fn = 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";
|
|
||||||
|
|
||||||
|
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';
|
emit 'reload_kernel_modules < ${VARDIR}/.modules';
|
||||||
} else {
|
} else {
|
||||||
emit 'load_kernel_modules Yes';
|
emit 'load_kernel_modules Yes';
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=3.9.0-1
|
VERSION=3.9.1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
%define name shorewall-perl
|
%define name shorewall-perl
|
||||||
%define version 3.9.0
|
%define version 3.9.1
|
||||||
%define release 1
|
%define release 1
|
||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
|
|
||||||
@ -80,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%changelog
|
%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
|
* Sat Mar 24 2007 Tom Eastep tom@shorewall.net
|
||||||
- Initial version 3.9.0-1
|
- Initial version 3.9.0-1
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user