diff --git a/Shorewall/compiler b/Shorewall/compiler index db8217e46..c77ee3881 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -5668,13 +5668,13 @@ case "$COMMAND" in check) [ $# -ne 1 ] && usage 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) [ $# -ne 2 ] && usage 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) diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index 5dfd53677..658a7766a 100755 --- a/Shorewall/fallback.sh +++ b/Shorewall/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=3.4.1 +VERSION=3.4.2 usage() # $1 = exit status { diff --git a/Shorewall/install.sh b/Shorewall/install.sh index fdd16dbf2..2aeddc5dc 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.4.1 +VERSION=3.4.2 usage() # $1 = exit status { diff --git a/Shorewall/lib.base b/Shorewall/lib.base index b09193a65..d94dc4f4b 100644 --- a/Shorewall/lib.base +++ b/Shorewall/lib.base @@ -339,7 +339,7 @@ lib_load() # $1 = Name of the Library, $2 = Error Message heading if the library eval loaded=\$LIB_${1}_LOADED if [ -z "$loaded" ]; then - if [ -n "$SHOREWALL4" ]; then + if [ -n "$SHOREWALL_PL" ]; then eval LIB_${1}_LOADED=Yes return fi diff --git a/Shorewall/lib.config b/Shorewall/lib.config index 0bb53e151..3c0133e7a 100644 --- a/Shorewall/lib.config +++ b/Shorewall/lib.config @@ -1787,11 +1787,11 @@ do_initialize() { [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) - [ -d /usr/share/shorewall4 ] && set -a; + [ -d /usr/share/shorewall-pl ] && set -a; run_user_exit params - [ -d /usr/share/shorewall4 ] && set +a + [ -d /usr/share/shorewall-pl ] && set +a config=$(find_file shorewall.conf) @@ -1962,7 +1962,7 @@ do_initialize() { TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) 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" @@ -2108,7 +2108,7 @@ do_initialize() { strip_file_and_lib_load tcrules tcrules strip_file tos strip_file_and_lib_load tunnels tunnels - if [ -n "$SHOREWALL4" ]; then + if [ -n "$SHOREWALL_PL" ]; then report_capabilities1 > $TMP_DIR/capabilities export TMP_DIR export CONFIG_PATH diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 871c6ebae..cef756f21 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 3.4.1 +%define version 3.4.2 %define release 1 %define prefix /usr @@ -260,6 +260,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %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 - Updated to 3.4.1-1 * Sat Mar 10 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 21e8c17b1..0f5d903f1 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/uninstall.sh @@ -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.1 +VERSION=3.4.2 usage() # $1 = exit status {