From a547820ae92d0f31ee096480384c0691d3ed018d Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 19 Jun 2006 15:00:29 +0000 Subject: [PATCH] Update versions for RC5 (Grumble, grumble,...) git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4142 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-lite/changelog.txt | 4 + Shorewall-lite/fallback.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/releasenotes.txt | 35 +------- Shorewall-lite/shorewall-lite.spec | 4 +- Shorewall-lite/uninstall.sh | 2 +- Shorewall/changelog.txt | 5 ++ Shorewall/fallback.sh | 2 +- Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 125 ++++++++++++++++++----------- Shorewall/shorewall.spec | 4 +- Shorewall/uninstall.sh | 2 +- tools/build/upload | 8 +- web/shorewall_index.htm | 10 +-- 14 files changed, 113 insertions(+), 94 deletions(-) diff --git a/Shorewall-lite/changelog.txt b/Shorewall-lite/changelog.txt index dbf0d04d7..da9038012 100644 --- a/Shorewall-lite/changelog.txt +++ b/Shorewall-lite/changelog.txt @@ -1,3 +1,7 @@ +Changes in 3.2.0 RC 5 + +1) Update version. + Changes in 3.2.0 RC 4 1) Add RESTOREFILE to shorewall.conf diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index f3fbfb4a4..1cbb16afb 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.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index fdab27eea..1cd2ca420 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.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt index 41f8598a9..997aa95e7 100644 --- a/Shorewall-lite/releasenotes.txt +++ b/Shorewall-lite/releasenotes.txt @@ -1,41 +1,12 @@ -Shorewall Lite 3.2.0 RC 4 +Shorewall Lite 3.2.0 RC 5 Problems Corrected in 3.2.0 RC 4 -1) RESTOREFILE has been added to shorewall.conf. - -2) Many references to incorrect file names and commands have been - corrected in shorewall.conf. - -3) /sbin/shorewall-lite still supported the 'refresh' command - whereas the firewall script generated by 'compile' did not. - This lead to the following: - - gateway:~ # shorewall-lite refresh - Usage: /usr/share/shorewall-lite/firewall [ -q ] [ -v ] [ -n ] [ start|stop|clear|restart|status|version ] - gateway:~ # +None. Other changes in 3.2.0 RC 4 -1) The progress messages produced by Shorewall Lite now correctly - identify the product as 'Shorewall Lite' rather than - 'Shorewall'. In order for this to work, you must have Shorewall RC4 - installed on your administrative system(s) and Shorewall Lite RC4 - on the firewall system(s). - -2) /usr/share/shorewall-lite/firewall has been moved to - /var/lib/shorewall-lite/firewall. When upgrading to this release of - Shorewall Lite, please execute the following command: - - cp -a /usr/share/shorewall-lite/firewall /var/lib/shorewall-lite/ - - Note : The 'firewall' script is in /var/lib/shorewall-lite in - packages from shorewall.net. The package maintainers for the - various distributions are free to choose the directory where the - script will be stored under their distribution by altering the - value of LITEDIR in /usr/share/shorewall/configpath. You can run - the "shorewall show config" command to see how your distribution - defines LITEDIR. +None. New Features: diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 6cb1e2519..7fdfdf40e 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 3.2.0 -%define release 0RC4 +%define release 0RC5 %define prefix /usr Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. @@ -84,6 +84,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* 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 diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index b737f860a..5ac1b55f6 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.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 2f40f9ddf..ba961b2a0 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,8 @@ +Changes in 3.2.0 RC 5 + +1) Fix DOA 'LITEDIR' problem in /sbin/shorewall. + +------------------------------------------------------------------------------- Changes in 3.2.0 RC 4 1) Fix permissions on Limit file. diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index e4ba4af46..6caaf0e87 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.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/Shorewall/install.sh b/Shorewall/install.sh index b51ae833a..4440153e3 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=3.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 5538ab36e..413400a8c 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 3.2.0 RC 4 +Shorewall 3.2.0 RC 5 Note to users upgrading from Shorewall 2.x or 3.0 @@ -31,56 +31,18 @@ Note to users upgrading from Shorewall 2.x or 3.0 Please see the "Migration Considerations" below for additional upgrade information. -Problems Corrected in 3.2.0 RC 4 +Problems Corrected in 3.2.0 RC 5 -1) When install.sh was used to install/update Shorewall, the - /usr/share/shorewall/Limit file had incorrect permissions. +1) DOA /sbin/shorewall: -2) Many permission problems in /usr/share/shorewall/configfiles/ have - been corrected. + wifitipper:/etc/test # shorewall restart + Compiling... + ERROR: LITEDIR not defined in /usr/share/shorewall/configpath + wifitipper: -Other changes in 3.2.0 RC 4 +Other changes in 3.2.0 RC 5 -1) The progress messages produced by Shorewall Lite now correctly - identify the product as 'Shorewall Lite' rather than - 'Shorewall'. In order for this to work, you must have Shorewall RC4 - installed on your administrative system(s) and Shorewall Lite RC4 - on the firewall system(s). - -2) "load" and "reload" commands have been added. These commands allow - a non-root user with ssh access to a remote system to compile a - firewall script on the local system and to install that script on - the remote system. - - Syntax is: - - shorewall [re]load [ ] - - If is omitted, the current working directory is - assumed. - - The command is equivalent to: - - /sbin/shorewall compile -e . firewall &&\ - scp firewall root@:/var/lib/shorewall-lite/ &&\ - ssh root@ '/sbin/shorewall-lite [re]start' # Note 1 - - In other words, the configuration in the specified (or defaulted) - directory is compiled to a file called firewall in that - directory. If compilation succeeds, then 'firewall' is copied to the - (usually remote) using scp. If the copy succeeds, - Shorewall Lite on is started or restarted via ssh ( - load causes Shorewall Lite to be started and 'reload' causes - Shorewall Lite to be re-started) - - Note 1: In Shorewall Lite 3.2.0 RC4, the 'firewall' script has moved - from /usr/share/shorewall-lite/ to /var/lib/shorewall-lite in - packages from shorewall.net. The package maintainers for the - various distributions are free to choose the directory where the - script will be stored under their distribution by altering the - value of LITEDIR in /usr/share/shorewall/configpath. You can run the - "shorewall show config" command to see how your distribution - defines LITEDIR. +None. Migration Considerations: @@ -365,7 +327,42 @@ New Features: 4) In macro files, you can now use the reserved words SOURCE and DEST in the columns of the same names. When Shorewall expands the macro, it will substitute the SOURCE from the macro invocation for - SOURCE and the DEST from the invocation for DEST. This allows you + SOURCE and the DEST from the invocation for DEST. This allows you2) "load" and "reload" commands have been added. These commands allow + a non-root user with ssh access to a remote system to compile a + firewall script on the local system and to install that script on + the remote system. + + Syntax is: + + shorewall [re]load [ ] + + If is omitted, the current working directory is + assumed. + + The command is equivalent to: + + /sbin/shorewall compile -e . firewall &&\ + scp firewall root@:/var/lib/shorewall-lite/ &&\ + ssh root@ '/sbin/shorewall-lite [re]start' # Note 1 + + In other words, the configuration in the specified (or defaulted) + directory is compiled to a file called firewall in that + directory. If compilation succeeds, then 'firewall' is copied to the + (usually remote) using scp. If the copy succeeds, + Shorewall Lite on is started or restarted via ssh ( + load causes Shorewall Lite to be started and 'reload' causes + Shorewall Lite to be re-started) + + Note 1: In Shorewall Lite 3.2.0 RC4, the 'firewall' script has moved + from /usr/share/shorewall-lite/ to /var/lib/shorewall-lite in + packages from shorewall.net. The package maintainers for the + various distributions are free to choose the directory where the + script will be stored under their distribution by altering the + value of LITEDIR in /usr/share/shorewall/configpath. You can run the + "shorewall show config" command to see how your distribution + defines LITEDIR. + + to write macros that act in both directions (from source to destination and from destination to source). @@ -591,5 +588,37 @@ New Features: applies to "shorewall start", "shorewall restart" and "shorewall refresh". +18) "load" and "reload" commands have been added. These commands allow + a non-root user with ssh access to a remote system running + Shorewall Lite to compile a firewall script on the local system and + to install that script on the remote system. + Syntax is: + shorewall [re]load [ ] + + If is omitted, the current working directory is + assumed. + + The command is equivalent to: + + /sbin/shorewall compile -e . firewall &&\ + scp firewall root@:/var/lib/shorewall-lite/ &&\ + ssh root@ '/sbin/shorewall-lite [re]start' # Note 1 + + In other words, the configuration in the specified (or defaulted) + directory is compiled to a file called firewall in that + directory. If compilation succeeds, then 'firewall' is copied to the + (usually remote) using scp. If the copy succeeds, + Shorewall Lite on is started or restarted via ssh ( + load causes Shorewall Lite to be started and 'reload' causes + Shorewall Lite to be re-started) + + Note 1: In Shorewall Lite 3.2.0 RC4, the 'firewall' script has moved + from /usr/share/shorewall-lite/ to /var/lib/shorewall-lite in + packages from shorewall.net. The package maintainers for the + various distributions are free to choose the directory where the + script will be stored under their distribution by altering the + value of LITEDIR in /usr/share/shorewall/configpath. You can run the + "shorewall show config" command to see how your distribution + defines LITEDIR. diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 9f8bbd7ce..df3097980 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 3.2.0 -%define release 0RC4 +%define release 0RC5 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -209,6 +209,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Mon Jun 19 2006 Tom Eastep tom@shorewall.net +- Updated to 3.2.0-0RC5 * Sun Jun 18 2006 Tom Eastep tom@shorewall.net - Updated to 3.2.0-0RC4 * Fri Jun 09 2006 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 3bf1f9ac3..f472efc97 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.2.0-RC4 +VERSION=3.2.0-RC5 usage() # $1 = exit status { diff --git a/tools/build/upload b/tools/build/upload index 995d41465..9160068a6 100755 --- a/tools/build/upload +++ b/tools/build/upload @@ -23,4 +23,10 @@ esac echo "There are no known problems in Shorewall version $1" > known_problems.txt -scp -r errata known_problems.txt patch-$1 ${1}.* shorewall-${1}/releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $DEST +if [ -f shorewall-lite-${1}/releasenotes.txt ]; then + cat shorewall-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt +else + cat shorewall-${1}/releasenotes.txt > releasenotes.txt ||\ +fi + +scp -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $DEST diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm index e65bcaf27..763d1db98 100644 --- a/web/shorewall_index.htm +++ b/web/shorewall_index.htm @@ -18,13 +18,13 @@ notes and here are the known problems and updates.

-

The current Development Version is 3.2.0 RC3 – Get it from +

The current Development Version is 3.2.0 RC4 – Get it from the download sites. Here are the release + href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/releasenotes.txt">release notes and here are the known + href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/known_problems.txt">known problems and updates
+ href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/errata/">updates

Copyright © 2001-2006 Thomas M. Eastep

@@ -35,7 +35,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-06-13

+

2006-06-18

Table of Contents

Introduction