diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index e80c0e6cd..9ce29297d 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -23,7 +23,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 4bfe4d03d..7e6818c0b 100644 --- a/Shorewall-init/shorewall-init.spec +++ b/Shorewall-init/shorewall-init.spec @@ -1,6 +1,6 @@ %define name shorewall-init %define version 4.4.12 -%define release 0Beta3 +%define release 0Beta4 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -99,6 +99,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sun Aug 01 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta4 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 8578c07b2..707f8e433 100755 --- a/Shorewall-init/uninstall.sh +++ b/Shorewall-init/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=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index f888b27e7..6f131cfc3 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index eaac7a500..2d3078119 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.4.12 -%define release 0Beta3 +%define release 0Beta4 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -102,6 +102,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sun Aug 01 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta4 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index a2178b381..99de49237 100755 --- a/Shorewall-lite/uninstall.sh +++ b/Shorewall-lite/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=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 908630d24..d575fa762 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -343,7 +343,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.12-Beta3", + VERSION => "4.4.12-Beta4", CAPVERSION => 40411 , ); diff --git a/Shorewall/install.sh b/Shorewall/install.sh index fc6282070..831a66053 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt index 5666d3ac2..d35f61470 100644 --- a/Shorewall/known_problems.txt +++ b/Shorewall/known_problems.txt @@ -1 +1 @@ -There are no known problems in Shorewall 4.4.12-Beta3 +There are no known problems in Shorewall 4.4.12-Beta4 diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 22d84d385..4bc339611 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,6 +1,6 @@ ---------------------------------------------------------------------------- S H O R E W A L L 4 . 4 . 1 2 - R C 1 + B E T A 4 ---------------------------------------------------------------------------- I. RELEASE 4.4 HIGHLIGHTS diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 9b5c248ce..962464a1f 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.12 -%define release 0Beta3 +%define release 0Beta4 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -108,6 +108,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Sun Aug 01 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta4 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index b7acdb5c9..31b857290 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=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index dc899cfd2..54ceee8b7 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 98fe6da49..a645a8b75 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -1,6 +1,6 @@ %define name shorewall6-lite %define version 4.4.12 -%define release 0Beta3 +%define release 0Beta4 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -93,6 +93,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sun Aug 01 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta4 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 068dde545..9970b4519 100755 --- a/Shorewall6-lite/uninstall.sh +++ b/Shorewall6-lite/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=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index cd468044b..267f8adc6 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index dbe2a2337..0029b32ad 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.12 -%define release 0Beta3 +%define release 0Beta4 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -98,6 +98,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Sun Aug 01 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta4 * Sat Jul 31 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 79795892e..6fa09f244 100755 --- a/Shorewall6/uninstall.sh +++ b/Shorewall6/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=4.4.12-Beta3 +VERSION=4.4.12-Beta4 usage() # $1 = exit status { diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml index 8ccfa4ee3..3bd496575 100644 --- a/docs/MultiISP.xml +++ b/docs/MultiISP.xml @@ -1110,6 +1110,28 @@ gateway:~ #Note that because we used a priority of 1000, the ip route ls table provider where provider can be either the provider name or number. + + Example: + + lillycat:- #ip route ls +144.77.167.142 dev ppp0 proto kernel scope link src 144.177.121.199 +71.190.227.208 dev ppp1 proto kernel scope link src 71.24.88.151 +192.168.7.254 dev eth1 scope link src 192.168.7.1 +192.168.7.253 dev eth1 scope link src 192.168.7.1 +192.168.7.0/24 dev eth1 proto kernel scope link src 192.168.7.1 +192.168.5.0/24 via 192.168.4.2 dev eth0 +192.168.4.0/24 dev eth0 proto kernel scope link src 192.168.4.223 +192.168.1.0/24 via 192.168.4.222 dev eth0 +default + nexthop dev ppp1 weight 2 + nexthop dev ppp0 weight 1 +lillycat: #ip route ls provider 1 +144.77.167.142 dev ppp0 proto kernel scope link src 144.177.121.199 +192.168.5.0/24 via 192.168.4.2 dev eth0 +192.168.4.0/24 dev eth0 proto kernel scope link src 192.168.4.223 +192.168.1.0/24 via 192.168.4.222 dev eth0 +default dev ppp0 scope link +lillycat: #