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

@@ -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

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
 {

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
 {

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.
+None.
-
-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:~ #
 
 Other changes in 3.2.0 RC 4
 
-1)  The progress messages produced by Shorewall Lite now correctly
+None.
-    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.
 
 New Features:
 

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

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
 {

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.

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
 {

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
 {

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
+1)  DOA /sbin/shorewall:
-    /usr/share/shorewall/Limit file had incorrect permissions.
 
-2)  Many permission problems in /usr/share/shorewall/configfiles/ have
+    wifitipper:/etc/test # shorewall restart
-    been corrected.
+    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
+None.
-    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 [ <directory> ] <system>
-
-    If <directory> is omitted, the current working directory is
-    assumed.
-
-    The command is equivalent to:
-
-    /sbin/shorewall compile -e . firewall &&\
-    scp firewall root@<system>:/var/lib/shorewall-lite/ &&\
-    ssh root@<system> '/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) <system> using scp. If the copy succeeds,
-    Shorewall Lite on <system> 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.
 
 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 [ <directory> ] <system>
+
+    If <directory> is omitted, the current working directory is
+    assumed.
+
+    The command is equivalent to:
+
+    /sbin/shorewall compile -e . firewall &&\
+    scp firewall root@<system>:/var/lib/shorewall-lite/ &&\
+    ssh root@<system> '/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) <system> using scp. If the copy succeeds,
+    Shorewall Lite on <system> 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 [ <directory> ] <system>
+
+    If <directory> is omitted, the current working directory is
+    assumed.
+
+    The command is equivalent to:
+
+    /sbin/shorewall compile -e . firewall &&\
+    scp firewall root@<system>:/var/lib/shorewall-lite/ &&\
+    ssh root@<system> '/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) <system> using scp. If the copy succeeds,
+    Shorewall Lite on <system> 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.

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

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
 {

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

web/shorewall_index.htm

@@ -18,13 +18,13 @@ notes</a> and here are the <a
  href="http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/known_problems.txt">known
 problems</a> and <a
  href="http://www.shorewall.net/pub/shorewall/3.0/shorewall-3.0.7/errata/">updates</a>.</p>
-<p>The current Development Version is 3.2.0 RC3 – Get it from
+<p>The current Development Version is 3.2.0 RC4 – Get it from
 the <a href="download.htm">download sites</a>. Here are the <a
- href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC3/releasenotes.txt">release
+ href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/releasenotes.txt">release
 notes</a> and here are the <a
- href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC3/known_problems.txt">known
+ href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/known_problems.txt">known
 problems</a> and <a
- href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC3/errata/">updates</a><br>
+ href="http://www1.shorewall.net/pub/shorewall/development/3.2/shorewall-3.2.0-RC4/errata/">updates</a><br>
 <br>
 Copyright
 © 2001-2006 Thomas M. Eastep</p>
@@ -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 “<a href="GnuCopyright.htm" target="_self">GNU Free
 Documentation License</a>”.</p>
-<p>2006-06-13</p>
+<p>2006-06-18</p>
 <hr>
 <h3>Table of Contents</h3>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Intro">Introduction