From 486e89e50bf17fd18f9f865f82befad4e58d9edf Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 30 Aug 2006 22:17:12 +0000 Subject: [PATCH] Update version to 3.3.1; fix USE_ACTIONS=No with DROP/REJECT_DEFAULT git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4491 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-lite/changelog.txt | 4 ++++ Shorewall-lite/fallback.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/releasenotes.txt | 12 ++---------- Shorewall-lite/shorewall-lite.spec | 23 +++++------------------ Shorewall-lite/uninstall.sh | 2 +- Shorewall/compiler | 7 +++++-- Shorewall/fallback.sh | 2 +- Shorewall/install.sh | 2 +- Shorewall/shorewall.spec | 4 +++- Shorewall/uninstall.sh | 2 +- web/shorewall_index.htm | 12 +++++++++--- 12 files changed, 34 insertions(+), 40 deletions(-) diff --git a/Shorewall-lite/changelog.txt b/Shorewall-lite/changelog.txt index d701012c4..db33a4f62 100644 --- a/Shorewall-lite/changelog.txt +++ b/Shorewall-lite/changelog.txt @@ -1,3 +1,7 @@ +Changes in 3.3.1 + +1) Update Versions. + Changes in 3.3.0 1) Fix output of 'hits' command under busybox 1.2.0. diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index dc21d6ec3..9ea680e83 100755 --- a/Shorewall-lite/fallback.sh +++ b/Shorewall-lite/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=3.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index f3a98f042..d8487dfcb 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt index 25b13192a..23195c2e5 100644 --- a/Shorewall-lite/releasenotes.txt +++ b/Shorewall-lite/releasenotes.txt @@ -1,16 +1,8 @@ -Shorewall Lite 3.3.0 +Shorewall Lite 3.3.1 Problems Corrected in 3.3.0 -1) The output formatting of the 'hits' command under BusyBox 1.2.0 has - been corrected. - -2) The output of the 'hits' command was previously scrambled if - /etc/services contained spaces as column delimiters rather than - tabs. - -3) The /etc/shorewall/xmodules file was the same as the - /etc/shorewall/modules file. +None. Other changes in 3.3.0 diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 90c36450d..88264c527 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,5 +1,5 @@ %define name shorewall-lite -%define version 3.3.0 +%define version 3.3.1 %define release 1 %define prefix /usr @@ -84,24 +84,11 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Aug 30 2006 Tom Eastep tom@shorewall.net +- Updated to 3.3.1-1 +* Wed Aug 09 2006 Tom Eastep tom@shorewall.net +- Updated to 3.3.0-1 * Wed Aug 09 2006 Tom Eastep tom@shorewall.net - Updated to 3.3.0-1 -* Sat Jul 08 2006 Tom Eastep tom@shorewall.net -- Updated to 3.2.0-1 -* Thu Jun 29 2006 Tom Eastep tom@shorewall.net -- Updated to 3.2.0-0RC6 -* Mon Jun 19 2006 Tom Eastep tom@shorewall.net -- Version 3.2.0-RC5 -* Sun Jun 18 2006 Tom Eastep tom@shorewall.net -- Version 3.2.0-RC4 -* Mon Jun 12 2006 Tom Eastep tom@shorewall.net -- Change control program to /sbin/shorewall-lite -- Version 3.2.0-RC3 -* Fri Jun 09 2006 Tom Eastep tom@shorewall.net -- Install Shorewall-lite in its own directories -* Wed Jun 07 2006 Tom Eastep tom@shorewall.net -- Version 3.2.0-RC2 -* Tue Apr 18 2006 Tom Eastep tom@shorewall.net -- Initial Version diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 601a514cd..c63f9981f 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=3.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/Shorewall/compiler b/Shorewall/compiler index 032ed0aeb..846886b13 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -445,8 +445,11 @@ validate_policy() ;; *) if ! list_search $default USEDACTIONS; then - if [ ! -f $(find_file macro.$default) ]; then - fatal_error "Default Action/Macro $var=$default not found" + if ! list_search $default $DEFAULT_MACROS; then + if [ ! -f $(find_file macro.$default) ]; then + fatal_error "Default Action/Macro $var=$default not found" + fi + DEFAULT_MACROS="$DEFAULT_MACROS $default" fi fi esac diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index c0e4b6171..82170b87f 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.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/Shorewall/install.sh b/Shorewall/install.sh index be7f54279..403eaa537 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 8094396ac..3e093dd91 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 3.3.0 +%define version 3.3.1 %define release 1 %define prefix /usr @@ -218,6 +218,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Wed Aug 30 2006 Tom Eastep tom@shorewall.net +- Updated to 3.3.1-1 * Sun Aug 27 2006 Tom Eastep tom@shorewall.net - Updated to 3.3.0-1 * Fri Aug 25 2006 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index d04c184de..326066add 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.3.0 +VERSION=3.3.1 usage() # $1 = exit status { diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm index 06e619aaa..deb7928c3 100644 --- a/web/shorewall_index.htm +++ b/web/shorewall_index.htm @@ -18,8 +18,14 @@ notes and here are the known problems and updates.

-

The current Development Version is 3.3.0 -- No releases of that -version are available yet.
+

The current Development Version is 3.3.0 -- Get it from the +download sites. Here are the release +notes and here are the known +problems and updates.

Copyright © 2001-2006 Thomas M. Eastep

@@ -30,7 +36,7 @@ Foundation; with no Invariant Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of the license is included in the section entitled “GNU Free Documentation License”.

-

2006-08-26

+

2006-08-28

Table of Contents

Introduction