diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index d9d699524..dafa35954 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -24,6 +24,8 @@ Changes in Shorewall 4.4.2 11) Add three new columns to macro body. +12) Change 'wait4ifup' so that it requires no PATH + Changes in Shorewall 4.4.1 1) Deleted extra 'use ...IPAddrs.pm' from Nat.pm. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 0da3ceda4..8f516cd69 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -453,6 +453,15 @@ if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/blacklist ]; then echo "Blacklist file installed as ${PREFIX}/etc/shorewall/blacklist" fi # +# Install the findgw file +# +run_install $OWNERSHIP -m 0644 configfiles/findgw ${PREFIX}/usr/share/shorewall/configfiles/findgw + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/findgw ]; then + run_install $OWNERSHIP -m 0600 configfiles/findgw ${PREFIX}/etc/shorewall/findgw + echo "Find GW file installed as ${PREFIX}/etc/shorewall/findgw" +fi +# # Delete the Routes file # delete_file ${PREFIX}/etc/shorewall/routes diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d5d75138f..ed7c7f8a1 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -211,6 +211,9 @@ Shorewall 4.4.2 ADDRESS column of /etc/shorewall/masq. Thanks go to Jessee Shrieve for the patch. +7) The 'wait4ifup' script included for Debian compatibility now runs + correctly with no PATH. + ---------------------------------------------------------------------------- K N O W N P R O B L E M S R E M A I N I N G ---------------------------------------------------------------------------- diff --git a/Shorewall/wait4ifup b/Shorewall/wait4ifup index 01089821a..6e11110dd 100755 --- a/Shorewall/wait4ifup +++ b/Shorewall/wait4ifup @@ -33,7 +33,7 @@ # interface_is_up() { - [ -n "$(ip link list dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ] + [ -n "$(/sbin/ip link list dev $1 2> /dev/null | /bin/grep -e '[<,]UP[,>]')" ] } case $# in @@ -51,7 +51,7 @@ esac while [ $timeout -gt 0 ]; do interface_is_up $1 && exit 0 - sleep 1 + /bin/sleep 1 timeout=$(( $timeout - 1 )) done diff --git a/docs/Introduction.xml b/docs/Introduction.xml index 8aba7bc44..422de42be 100644 --- a/docs/Introduction.xml +++ b/docs/Introduction.xml @@ -212,8 +212,8 @@ dmz eth2 detect nets=(192.168.1.0/24) for 192.168.0.0/23, the loc zone as IPv4 hosts 192.168.0.0/24 interfacing through eth1 and the dmz as IPv4 hosts 192.168.1.0/24 interfacing through eth2 (Note that - 192.168.0.0/24 together with 192.168.1.0/24 constitutes - 192.168.0.0.23). + 192.168.0.0/24 together with 192.168.1.0/24 comprises + 192.168.0.0/23). Rules about what traffic to allow and what traffic to deny are expressed in terms of zones. diff --git a/docs/LennyToSqueeze.xml b/docs/LennyToSqueeze.xml index 21cd5e098..8b0055c6b 100644 --- a/docs/LennyToSqueeze.xml +++ b/docs/LennyToSqueeze.xml @@ -59,7 +59,7 @@ in the packaging Most distributions use a similar packaging structure. Note, however, that the 'shorewall' package in Simon Mater's RPMs for - RedHat/Fedora/CentOS is like the Debian shorewall-common + RedHat/Fedora/CentOS is like the Lenny shorewall-common package. . In Lenny, there are six Shorewall packages: