diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh index 89f040893..fff1049bc 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.0.0-Beta1 +VERSION=2.0.1-Beta2 usage() # $1 = exit status { diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 59d873097..1ca4a16ff 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -4698,7 +4698,7 @@ add_common_rules() { # # Bogons # - nobogon_interfaces="$(find_interfaces_by_option norfc1918)" + nobogon_interfaces="$(find_interfaces_by_option bogons)" if [ -n "$nobogon_interfaces" ]; then echo "Enabling Bogon Filtering" diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh index 5381359a1..12c604d8b 100755 --- a/Shorewall2/install.sh +++ b/Shorewall2/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=2.0.0-Beta1 +VERSION=2.0.1-Beta2 usage() # $1 = exit status { diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 4cd041178..835e2e9dc 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.0.1-Beta1 +Shorewall 2.0.1-Beta2 ---------------------------------------------------------------------- Problems Corrected since 2.0.0 @@ -6,6 +6,14 @@ Problems Corrected since 2.0.0 1) Using actions in the manner recommended in the documentation results in a Warning that the rule is a policy. +Problems Corrected since 2.0.1 Beta 1 + +1) The BOGON_LOG_LEVEL variable is now included in shorewall.conf. It + was inadvertently omitted from the Beta 1 file. + +2) Previously, setting 'norfc1918' also set 'nobogons'; setting + 'nobogons' by itself had no effect. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: @@ -38,9 +46,9 @@ New Features: 2) Support for NETMAP has been added. NETMAP allows NAT to be defined between two network: - a.b.c.1 <-> x.y.z.1 - a.b.c.2 <-> x.y.z.2 - a.b.c.3 <-> x.y.z.3 + a.b.c.1 -> x.y.z.1 + a.b.c.2 -> x.y.z.2 + a.b.c.3 -> x.y.z.3 ... http://shorewall.net/netmap.html diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec index 2e4b8fd27..541ec0066 100644 --- a/Shorewall2/shorewall.spec +++ b/Shorewall2/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall -%define version 2.0.0 -%define release 0Beta1 +%define version 2.0.1 +%define release 0Beta2 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -139,6 +139,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Fri Mar 19 2004 Tom Eastep tom@shorewall.net +- Updated for 2.0.1 Beta 2 * Thu Mar 18 2004 Tom Eastep tom@shorewall.net - Added netmap file * Wed Mar 17 2004 Tom Eastep diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh index 1a091a522..14a946ac3 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.0.0-Beta1 +VERSION=2.0.1-Beta2 usage() # $1 = exit status {