diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh index 4a7ee1364..7c7e82e9e 100755 --- a/Shorewall2/fallback.sh +++ b/Shorewall2/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=2.3.2 +VERSION=2.4.0-RC2 usage() # $1 = exit status { diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh index 4df4a6d4a..64609e845 100755 --- a/Shorewall2/install.sh +++ b/Shorewall2/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=2.3.2 +VERSION=2.4.0-RC1 usage() # $1 = exit status { @@ -415,8 +415,20 @@ if [ -f ${PREFIX}/etc/shorewall/routes ]; then else run_install $OWNERSHIP -m 0600 routes ${PREFIX}/etc/shorewall/routes echo - echo "Routes file installed as ${PREFIX}/etc/shorewall/blacklist" + echo "Routes file installed as ${PREFIX}/etc/shorewall/routes" fi + +# +# Install the Providers file +# +if [ -f ${PREFIX}/etc/shorewall/providers ]; then + backup_file /etc/shorewall/providers +else + run_install $OWNERSHIP -m 0600 providers ${PREFIX}/etc/shorewall/providers + echo + echo "Providers file installed as ${PREFIX}/etc/shorewall/providers" +fi + # # Backup and remove the whitelist file # diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index db87a7ef4..6c743e113 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -41,7 +41,7 @@ New Features in version 2.3.2 to be tracked so that responses may be routed back out this same interface. - You want specify 'trask' if internet hosts will be + You want specify 'track' if internet hosts will be connecting to local servers through this provider. diff --git a/Shorewall2/routes b/Shorewall2/routes index 76c727b44..b15fc76a4 100755 --- a/Shorewall2/routes +++ b/Shorewall2/routes @@ -12,6 +12,9 @@ # have ROUTE target support (see the output of "shorewall show # capabilities"). # +# This facility is *EXPERIMENTAL* -- the Netfilter team have no intention +# of ever submitting the ROUTE target patch to kernel.org. +# # To omit any column, enter "-" in that column. # # Columns are: diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec index 46fe3e563..0693165f0 100644 --- a/Shorewall2/shorewall.spec +++ b/Shorewall2/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall -%define version 2.3.2 -%define release 1 +%define version 2.4.0 +%define release 0RC1 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -96,6 +96,7 @@ fi %attr(0600,root,root) %config(noreplace) /etc/shorewall/continue %attr(0600,root,root) %config(noreplace) /etc/shorewall/started %attr(0600,root,root) %config(noreplace) /etc/shorewall/routes +%attr(0600,root,root) %config(noreplace) /etc/shorewall/providers %attr(0544,root,root) /sbin/shorewall @@ -141,6 +142,8 @@ fi %changelog * Thu May 19 2005 Tom Eastep tom@shorewall.net +- Updated to 2.4.0-0RC1 +* Thu May 19 2005 Tom Eastep tom@shorewall.net - Updated to 2.3.2-1 * Sun May 15 2005 Tom Eastep tom@shorewall.net - Updated to 2.3.1-1 diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh index 8d4503a45..b209d4f8f 100755 --- a/Shorewall2/uninstall.sh +++ b/Shorewall2/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Seattle Firewall -VERSION=2.3.2 +VERSION=2.4.0-RC1 usage() # $1 = exit status {