extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring this branch up to 3.4

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5669 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-24 20:01:42 +00:00
parent be39e43b8a
commit b24b7ecf21
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/compiler
View File

@ -5668,13 +5668,13 @@ case "$COMMAND" in
check) check)
[ $# -ne 1 ] && usage [ $# -ne 1 ] && usage
do_initialize do_initialize
[ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl || compile_firewall [ -n "$SHOREWALL_PL" ] && exec perl $debug /usr/share/shorewall-pl/compiler.pl || compile_firewall
;; ;;
compile) compile)
[ $# -ne 2 ] && usage [ $# -ne 2 ] && usage
do_initialize do_initialize
[ -n "$SHOREWALL4" ] && exec perl $debug /usr/share/shorewall4/compiler.pl $2 || compile_firewall $2 [ -n "$SHOREWALL_PL" ] && exec perl $debug /usr/share/shorewall-pl/compiler.pl $2 || compile_firewall $2
;; ;;
call) call)

2
Shorewall/fallback.sh
View File

@ -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.1 VERSION=3.4.2
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall/install.sh
View File

@ -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.1 VERSION=3.4.2
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall/lib.base
View File

@ -339,7 +339,7 @@ lib_load() # $1 = Name of the Library, $2 = Error Message heading if the library
eval loaded=\$LIB_${1}_LOADED eval loaded=\$LIB_${1}_LOADED
if [ -z "$loaded" ]; then if [ -z "$loaded" ]; then
if [ -n "$SHOREWALL4" ]; then if [ -n "$SHOREWALL_PL" ]; then
eval LIB_${1}_LOADED=Yes eval LIB_${1}_LOADED=Yes
return return
fi fi

8
Shorewall/lib.config
View File

@ -1787,11 +1787,11 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
[ -d /usr/share/shorewall4 ] && set -a; [ -d /usr/share/shorewall-pl ] && set -a;
run_user_exit params run_user_exit params
[ -d /usr/share/shorewall4 ] && set +a [ -d /usr/share/shorewall-pl ] && set +a
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
@ -1962,7 +1962,7 @@ do_initialize() {
TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT) TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS) EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
SHOREWALL4=$(added_param_value_no SHOREWALL4 $SHOREWALL4) SHOREWALL_PL=$(added_param_value_no SHOREWALL_PL $SHOREWALL_PL)
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes" [ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
@ -2108,7 +2108,7 @@ do_initialize() {
strip_file_and_lib_load tcrules tcrules strip_file_and_lib_load tcrules tcrules
strip_file tos strip_file tos
strip_file_and_lib_load tunnels tunnels strip_file_and_lib_load tunnels tunnels
if [ -n "$SHOREWALL4" ]; then if [ -n "$SHOREWALL_PL" ]; then
report_capabilities1 > $TMP_DIR/capabilities report_capabilities1 > $TMP_DIR/capabilities
export TMP_DIR export TMP_DIR
export CONFIG_PATH export CONFIG_PATH

4
Shorewall/shorewall.spec
View File

@ -1,5 +1,5 @@
%define name shorewall %define name shorewall
%define version 3.4.1 %define version 3.4.2
%define release 1 %define release 1
%define prefix /usr %define prefix /usr
@ -260,6 +260,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
%changelog %changelog
* Thu Mar 24 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.2-1
* Thu Mar 15 2007 Tom Eastep tom@shorewall.net * Thu Mar 15 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.1-1 - Updated to 3.4.1-1
* Sat Mar 10 2007 Tom Eastep tom@shorewall.net * Sat Mar 10 2007 Tom Eastep tom@shorewall.net

2
Shorewall/uninstall.sh
View File

@ -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.1 VERSION=3.4.2
usage() # $1 = exit status usage() # $1 = exit status
{ {