mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-18 07:36:48 +02:00
Tighten up dependency handling -- Phase III
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6752 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
bb75d0f161
commit
c8b8316e08
@ -25,6 +25,8 @@
|
||||
# /usr/share/shorewall/compiler and /usr/share/shorewall/firewall
|
||||
#
|
||||
|
||||
SHOREWALL_CONFIGVERSION=40000
|
||||
|
||||
#
|
||||
# Replace commas with spaces and echo the result
|
||||
#
|
||||
|
@ -129,8 +129,6 @@ sub initialize() {
|
||||
TC_SCRIPT => '',
|
||||
VERSION => '4.0.0-RC1',
|
||||
CAPVERSION => 30405 ,
|
||||
MIN_COMMON_VERSION => 40000 ,
|
||||
MIN_COMMON_VERSION_PRINTABLE => '4.0.0',
|
||||
);
|
||||
#
|
||||
# From shorewall.conf file
|
||||
@ -177,7 +175,9 @@ sub initialize() {
|
||||
DROP_DEFAULT => undef,
|
||||
REJECT_DEFAULT => undef,
|
||||
ACCEPT_DEFAULT => undef,
|
||||
QUEUE_DEFAULT => undef,
|
||||
QUEUE_DEFAULT => undef, MIN_COMMON_VERSION => 40000 ,
|
||||
MIN_COMMON_VERSION_PRINTABLE => '4.0.0',
|
||||
|
||||
#
|
||||
# RSH/RCP Commands
|
||||
#
|
||||
@ -217,7 +217,9 @@ sub initialize() {
|
||||
USE_ACTIONS=> undef,
|
||||
OPTIMIZE => undef,
|
||||
EXPORTPARAMS => undef,
|
||||
SHOREWALL_COMPILER => undef,
|
||||
SHOREWALL_COMPILER => undef, MIN_COMMON_VERSION => 40000 ,
|
||||
MIN_COMMON_VERSION_PRINTABLE => '4.0.0',
|
||||
|
||||
#
|
||||
# Packet Disposition
|
||||
#
|
||||
|
@ -35,8 +35,11 @@
|
||||
# SHOREWALL_DIR A directory name was passed to /sbin/shorewall
|
||||
# VERBOSE Standard Shorewall verbosity control.
|
||||
|
||||
COMMON_VERSION=40000
|
||||
COMMON_VERSION_PRINTABLE=4.0.0
|
||||
BASE_VERSION=40000
|
||||
BASE_VERSION_PRINTABLE=4.0.0
|
||||
CONFIG_VERSION=40000
|
||||
CONFIG_VERSION_PRINTABLE=4.0.0
|
||||
|
||||
|
||||
#
|
||||
# Fatal error -- stops the compiler after issuing the error message
|
||||
@ -5741,7 +5744,8 @@ done
|
||||
|
||||
VERSION=$(cat $SHELLSHAREDIR/version)
|
||||
|
||||
[ $SHOREWALL_LIBVERSION -ne $COMMON_VERSION ] || fatal_error "Shorewall-shell $VERSION requires Shorewall-common $MIN_COMMON_VERSION_PRINTABLE"
|
||||
[ "$SHOREWALL_LIBVERSION" -eq $BASE_VERSION ] || fatal_error "Shorewall-shell $VERSION requires Shorewall-common lib.base version $BASE_VERSION_PRINTABLE"
|
||||
[ "$SHOREWALL_CONFIGVERSION" -eq $CONFIG_VERSION ] || fatal_error "Shorewall-shell $VERSION requires Shorewall-common lib.config version $CONFIG_VERSION_PRINTABLE"
|
||||
|
||||
PROGRAM=compiler
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user