Fix rule generated by MULTICAST=Yes

This reverts commit 966f162c87.

Shorewall-lite/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall-lite/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall-lite/shorewall-lite.spec

@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.4.0
-%define release 0base
+%define release 3
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -98,6 +98,12 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sat Aug 29 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-3
+* Fri Aug 28 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-2
+* Thu Aug 13 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-1
 * Mon Aug 03 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.4.0-0base
 * Tue Jul 28 2009 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=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall/Perl/Shorewall/Config.pm

@@ -327,7 +327,7 @@ sub initialize( $ ) {
 		    TC_SCRIPT => '',
 		    EXPORT => 0,
 		    UNTRACKED => 0,
-		    VERSION => "4.4.0",
+		    VERSION => "4.4.0.3",
 		    CAPVERSION => 40310 ,
 		  );
 

Shorewall/Perl/Shorewall/Policy.pm

@@ -356,7 +356,7 @@ sub policy_rules( $$$$$ ) {
     my ( $chainref , $target, $loglevel, $default, $dropmulticast ) = @_;
 
     unless ( $target eq 'NONE' ) {
-	add_rule $chainref, "-d 224.0.0.0/24 -j RETURN" if $dropmulticast && $target ne 'CONTINUE';
+	add_rule $chainref, "-d 224.0.0.0/4 -j RETURN" if $dropmulticast && $target ne 'CONTINUE' && $target ne 'ACCEPT';
 	add_rule $chainref, "-j $default" if $default && $default ne 'none';
 	log_rule $loglevel , $chainref , $target , '' if $loglevel ne '';
 	fatal_error "Null target in policy_rules()" unless $target;
@@ -454,7 +454,7 @@ sub complete_standard_chain ( $$$$ ) {
 
     run_user_exit $stdchainref;
 
-    my $ruleschainref = $filter_table->{"${zone}2${zone2}"};
+    my $ruleschainref = $filter_table->{"${zone}2${zone2}"} || $filter_table->{all2all};
     my ( $policy, $loglevel, $defaultaction ) = ( $default , 6, $config{$default . '_DEFAULT'} );
     my $policychainref;
 

Shorewall/Perl/Shorewall/Rules.pm

@@ -1698,7 +1698,7 @@ sub generate_matrix() {
 			add_jump(
 				 $sourcechainref,
 				 source_exclusion( $hostref->{exclusions}, $frwd_ref ),
-				 1,
+				 ! @{$zoneref->{parents}},
 				 join( '', $interfacematch , match_source_net( $net ), $ipsec_match )
 				);
 		    }

Shorewall/Perl/Shorewall/Zones.pm

@@ -601,7 +601,6 @@ sub add_group_to_zone($$$$$)
     my $interfaceref;
     my $zoneref  = $zones{$zone};
     my $zonetype = $zoneref->{type};
-    my $ifacezone = $interfaces{$interface}{zone};
 
     $zoneref->{interfaces}{$interface} = 1;
 
@@ -610,8 +609,6 @@ sub add_group_to_zone($$$$$)
     my $new = \@newnetworks;
     my $switched = 0;
 
-    $ifacezone = '' unless defined $ifacezone;
-
     for my $host ( @$networks ) {
 	$interfaces{$interface}{nets}++;
 
@@ -626,8 +623,8 @@ sub add_group_to_zone($$$$$)
 
 	unless ( $switched ) {
 	    if ( $type == $zonetype ) {
-		fatal_error "Duplicate Host Group ($interface:$host) in zone $zone" if $ifacezone eq $zone;
+		fatal_error "Duplicate Host Group ($interface:$host) in zone $zone" if $interfaces{$interface}{zone} eq $zone;
-		$ifacezone = $zone if $host eq ALLIP;
+		$interfaces{$interface}{zone} = $zone if $host eq ALLIP;
 	    }
 	}
 
@@ -841,6 +838,7 @@ sub process_interface( $ ) {
 		$hostoptions{$option} = $numval if $hostopt;
 	    } elsif ( $type == IPLIST_IF_OPTION ) {
 		fatal_error "The $option option requires a value" unless defined $value;
+		fatal_error q("nets=" may not be specified for a multi-zone interface) unless $zone;
 		fatal_error "Duplicate $option option" if $nets;
 		#
 		# Remove parentheses from address list if present
@@ -887,14 +885,14 @@ sub process_interface( $ ) {
 				number     => $nextinum ,
 				root       => $root ,
 				broadcasts => $broadcasts ,
-				options    => \%options };
+				options    => \%options ,
+			        zone       => ''
+			      };
 
     $nets = [ allip ] unless $nets; 
 
     add_group_to_zone( $zone, $zoneref->{type}, $interface, $nets, $hostoptionsref ) if $zone;
 
-    $interfaces{$interface}{zone} = $zone; #Must follow the call to add_group_to_zone()
-
     progress_message "  Interface \"$currentline\" Validated";
 
     return $interface;

Shorewall/README.txt

@@ -1 +1 @@
-This is the Shorewall 4.3 development branch of SVN.
+This is the Shorewall 4.4 stable branch of Git.

Shorewall/changelog.txt

@@ -1,3 +1,23 @@
+Changes in Shorewall 4.4.0.3
+
+1) Fix rule generated by MULTICAST=Yes
+
+Changes in Shorewall 4.4.0.2
+
+1)  Fix MULTICAST=Yes and ACCEPT policy.
+
+2)  Allow extension of zone definition with nets=.
+
+3)  Don't allow nets= in a multi-zone interface definition.
+
+Changes in Shorewall 4.4.0.1
+
+1)  Updated release versions.
+
+2)  Fix log level in rules at the end of INPUT and OUTPUT
+
+3)  Correct handling of nested IPSEC chains.
+
 Changes in Shorewall 4.4.0
 
 1)  Fix 'compile ... -' so that it no longer requires '-v-1'

Shorewall/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall/known_problems.txt

@@ -1 +1,36 @@
-There are no known problems in Shorewall version 4.4.0
+1)  If ULOG is specified as the LOG LEVEL in the all->all policy, the
+    rules at the end of the INPUT and OUTPUT chains still use the
+    LOG target rather than ULOG.
+
+    You can work around this problem by adding two additional policies
+    before the all->all one:
+
+    	   all 		$FW	DROP	ULOG
+	   $FW		all	REJECT	ULOG
+
+    This problem was corrected in Shorewall 4.4.0.1.
+
+2)  Use of CONTINUE policies with a nested IPSEC zone was broken in
+    some cases.
+
+    This problem was corrected in Shorewall 4.4.0.1.
+
+3)  If MULTICAST=Yes in shorewall.conf, multicast traffic is
+    incorrectly exempted from ACCEPT policies.
+
+    This problem was corrected in Shorewall 4.4.0.2.
+
+4)  If a zone is defined with "nets=" in /etc/shorewall/zones, that
+    definition cannot be extended by entries in /etc/shorewall/hosts.
+
+    This problem was corrected in Shorewall 4.4.0.2.
+
+5)  Shoerwall accepts "nets=" in a multi-zone interface entry (one with
+    "-" in the ZONES column) in /etc/shorewall/interfaces.
+
+    This problem was corrected in Shorewall 4.4.0.2.
+
+6)  MULTICAST=Yes generates an incorrect rule that limits its
+    effectiveness to a small part of the multicast address space.
+
+    

Shorewall/releasenotes.txt

@@ -1,4 +1,4 @@
-Shorewall 4.4.0
+Shorewall 4.4.0 patch release 1.
 
 ----------------------------------------------------------------------------
                R E L E A S E  4 . 4  H I G H L I G H T S
@@ -13,6 +13,8 @@ Shorewall 4.4.0
     Token Bucket" queuing discipline where realtime traffic such as
     VOIP is being used.
 
+    HTB remains the default queuing discipline.
+
 3)  Support for the "flow" traffic classifier has been added. This
     classifier can help prevent multi-connection applications such as
     BitTorrent from using an unfair amount of bandwidth.
@@ -151,6 +153,39 @@ Shorewall 4.4.0
 
 10) The name 'any' is now reserved and may not be used as a zone name.
 
+----------------------------------------------------------------------------
+        P R O B L E M S   C O R R E C T E D   I N   4 . 4 . 0 . 3
+----------------------------------------------------------------------------
+
+1)  MULTICAST=Yes generates an incorrect rule that limits its
+    effectiveness to a small part of the multicast address space.
+
+----------------------------------------------------------------------------
+        P R O B L E M S   C O R R E C T E D   I N   4 . 4 . 0 . 2
+----------------------------------------------------------------------------
+
+1)  If MULTICAST=Yes in shorewall.conf, then multicast traffic was
+    excluded from ACCEPT policies.
+
+2)  If a zone was defined with nets= in /etc/shorewall/zones, that
+    definition could not be extended by entries in
+    /etc/shorewall/hosts.
+
+3)  Previously, "nets=" could be specified in a multi-zone interface
+    definition ("-" in the ZONES column) in /etc/shorewall/zones. This
+    now raises a fatal compilation error.
+
+ ----------------------------------------------------------------------------
+        P R O B L E M S   C O R R E C T E D   I N   4 . 4 . 0 . 1
+----------------------------------------------------------------------------
+
+1)  If ULOG was specified as the LOG LEVEL in the all->all policy, the
+    rules at the end of the INPUT and OUTPUT chains still used the
+    LOG target rather than ULOG.
+
+2)  Use of CONTINUE policies with a nested IPSEC zone was broken in
+    some cases.
+
 ----------------------------------------------------------------------------
           P R O B L E M S   C O R R E C T E D   I N   4 . 4 . 0
 ----------------------------------------------------------------------------
@@ -216,6 +251,8 @@ None.
                    Shorewall-perl packages. Has everything needed
                    to create an IPv4 firewall.
 
+		   Shorewall-shell is no longer available.
+
     - Shorewall6.  Requires Shorewall. Adds the components necessary to
       		   create an IPv6 firewall.
 

Shorewall/shorewall.spec

@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 4.4.0
-%define release 0base
+%define release 3
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -104,6 +104,12 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples 
 
 %changelog
+* Sat Aug 29 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-3
+* Fri Aug 28 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-2
+* Thu Aug 13 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-1
 * Sun Aug 09 2009 Tom Eastep tom@shorewall.net
 - Made Perl a dependency
 * Mon Aug 03 2009 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=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6-lite/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6-lite/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6-lite/shorewall6-lite.spec

@@ -1,6 +1,6 @@
 %define name shorewall6-lite
 %define version 4.4.0
-%define release 0base
+%define release 3
 
 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -89,6 +89,12 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sat Aug 29 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-3
+* Fri Aug 28 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-2
+* Thu Aug 13 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-1
 * Mon Aug 03 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.4.0-0base
 * Tue Jul 28 2009 Tom Eastep tom@shorewall.net

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.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.4.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

Shorewall6/shorewall6.spec

@@ -1,6 +1,6 @@
 %define name shorewall6
 %define version 4.4.0
-%define release 0base
+%define release 3
 
 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -93,6 +93,12 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
 
 %changelog
+* Sat Aug 29 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-3
+* Fri Aug 28 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-2
+* Thu Aug 13 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.4.0-1
 * Mon Aug 03 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.4.0-0base
 * Tue Jul 28 2009 Tom Eastep tom@shorewall.net

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.0
+VERSION=4.4.0.3
 
 usage() # $1 = exit status
 {

tools/build/build44

@@ -1,787 +0,0 @@
-#!/bin/sh
-#
-# Shorewall Release Processing -- (C) 2003,2004,2005 -- Tom Eastep (teastep@shorewall.net)
-#                              -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
-# Version : $Id: buildshorewall 9189 2008-12-29 19:55:18Z teastep $
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# I install this script in /usr/local/bin/makeshorewall.
-#
-# Usage:
-#
-#   makeshorewall [ -trhxclpsS ] <version> [ <previous version> ]
-#
-#      -t      Build tarball
-#      -r      Build RPM
-#      -c      Build Common
-#      -l      Build Lite
-#      -L      Build 6 Lite
-#      -6      Build 6
-#      -h      Build HTML documentation
-#      -x      Build XML documentation
-#
-# If no options are given, all options are assumed.
-#
-# If <previous version> is given, patch files reflecting the differences
-# between that version and the current version ( <version> ) are generated.
-# The directory ./shorewall-<previous version> must exist and contain the
-# version against which the patch is generated.
-################################################################################
-#                          C O N F I G U R A T I O N
-################################################################################
-#
-# XSL Stylesheet to use for XML->HTML conversion
-#
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-#
-# Directory where the build log will be placed. The log has the name
-# shorewall_build_<version>.log
-#
-LOGDIR=$PWD
-#
-# Your RPM build directory
-#
-RPMDIR=~/rpm/
-#
-# Directory where you want the release to be built -- must be fully-qualified
-#
-DIR=$PWD
-#
-# location and options for GnuPG
-#
-GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
-#
-# SVN Repository
-#
-SVN=https://shorewall.svn.sourceforge.net/svnroot/shorewall
-#
-# GIT Repository
-#
-GIT=~/shorewall/trunk/
-################################################################################
-#                               V A R I A B L E S
-################################################################################
-VERSION=
-BASEVERSION=
-OLDVERSION=
-SHOREWALLDIR=
-SHOREWALLLITEDIR=
-SOURCEDIR=
-SVNBRANCH=
-LITESVNBRANCH=
-XMLPROJ=
-RPMNAME=
-LITERPMNAME=
-TARBALL=
-LITETARBALL=
-LOGFILE=
-HTMLDIR=
-BUILDTARBALL=
-BUILDRPM=
-BUILDXML=
-BUILDHTML=
-SAMPLESTAG=
-MANPAGETAG=
-MANPAGE6TAG=
-LITEMANPAGETAG=
-LITE6MANPAGETAG=
-PERLDIR=
-PERLBRANCH=
-PERLRPMNAME=
-PERLTARBALL=
-BUILDCOMMON=
-BUILDPERL=
-BUILDLITE=
-PATCHRELEASE=
-PATCHNUM=
-BASEURL=http://www.shorewall.net
-
-SVN6BRANCH=
-SAMPLES6TAG=
-LITE6SVNBRANCH=
-SHOREWALL6DIR=
-LITE6DIR=
-BUILD6=
-BUILD6LITE=
-RPM6NAME=
-LITE6RPMNAME=
-TARBALL6=
-LITE6TARBALL=
-
-################################################################################
-#                               F U N C T I O N S
-################################################################################
-progress_message()
-{
-    echo         >>    $LOGFILE
-    echo "$@" | tee -a $LOGFILE
-    echo         >>    $LOGFILE
-}
-
-report()
-{
-    echo "$@" | tee -a $LOGFILE
-}
-
-do_or_die()
-{
-    eval $@ || { progress_message "Step \"$*\" FAILED" ; exit 2; }
-}
-
-fatal_error() {
-    progress_message "$*"
-    exit 2
-}
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-#
-# It's easy to mis-type the GPG passphrase; this function allows us additional chances to get it right
-#
-do_rpmbuild() {
-    while ! rpmbuild --target noarch-linux $@ >> $LOGFILE 2>&1; do
-	echo    "rpmbuild $@ failed" >&2
-	echo -n "Retry? Y/n " >&2
-	read response
-	case $response in
-	    Y*|y*)
-		;;
-	    *)
-		[ -n "$response" ] && return 1
-		;;
-	esac
-    done
-
-    return 0
-}
-
-do_buildanrpm() {
-    progress_message "Building ${1}..."
-
-    cd /tmp
-    rm -rf ${2}-${BASEVERSION}
-    do_or_die "cp -a $DIR/${3} ${2}-${BASEVERSION}"
-    do_or_die "tar -zcf $RPMDIR/SOURCES/${2}-${BASEVERSION}.tgz ${2}-${BASEVERSION}"
-    cd $DIR
-    do_or_die "cp ${3}/${2}.spec $RPMDIR/SPECS/"
-    do_or_die "do_rpmbuild -ba $RPMDIR/SPECS/${2}.spec"
-    do_or_die cp -a $RPMDIR/RPMS/noarch/${1} .
-}
-
-usage()
-{
-    echo "usage: $(basename $0) [ -trhxcl6L] <version> [ <old-version> ]"
-    exit 2
-}
-
-do_export()
-{
-    progress_message "Exporting $1 from Git..." && do_or_die "git --git-dir=$GIT/.git archive --format=tar HEAD $1 | tar -xf - >> $LOGFILE 2>&1"
-    [ $1 = $2 ] || do_or_die "mv -f $1 $2 >> $LOGFILE 2>&1"
-}
-
-do_manpages()
-{
-    do_export ${1} manpages
-    cd manpages
-
-    for f in *.xml; do
-	case $f in
-	    *template.xml)
-		;;
-	    *)
-		progress_message "Generating Man Page from $f..."
-		do_or_die "xmlto --skip-validation --xsltopts "--stringparam" --xsltopts "man.base.url.for.relative.links" --xsltopts $BASEURL/manpages${3}/ man $f >> $LOGFILE 2>&1"
-		case $f in
-		    *.conf.*|shorewall.xml|shorewall6.xml|shorewall-lite.xml|shorewall6-lite.xml)
-                        ;;
-		    *)
-			g=${f#shorewall${2}-}
-			h=$(ls ${g%.xml}.[58])
-			f=shorewall${2}-$h
-			mv $h $f
-			;;
-		esac
-	    
-		eval perl -p -w -i -e "'s|/manpages${3}/manpages${3}?|/manpages${3}|'" $f
-		;;
-	esac
-    done
-
-    rm -f *.xml
-    rm -f *.bak
-}
-
-################################################################################
-#                E X E C U T I O N   S T A R T S   H E R E
-################################################################################
-
-set -e
-set -u
-
-
-done=
-
-[ $# -eq 0 ] && usage
-
-case $1 in
-    -*)
-	;;
-    *)
-	BUILDTARBALL=Yes
-	BUILDRPM=Yes
-	BUILDHTML=Yes
-	BUILDXML=Yes
-	BUILDRPM=Yes
-	BUILDCOMMON=Yes
-	BUILDLITE=Yes
-	BUILD6=Yes
-	BUILD6LITE=Yes
-
-	done=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    shift
-	    option=${option#-}
-
-	    [ -z "$option" ] && done=Yes && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    t*)
-			BUILDTARBALL=Yes
-			option=${option#t}
-			;;
-		    r*)
-			BUILDTARBALL=Yes
-			BUILDRPM=Yes
-			option=${option#r}
-			;;
-		    h*)
-			BUILDHTML=Yes
-			option=${option#h}
-			;;
-		    x*)
-			BUILDXML=Yes
-			option=${option#x}
-			;;
-		    c*)
-			BUILDCOMMON=Yes
-			option=${option#c}
-			;;
-		    6*)
-			BUILD6=Yes
-			option=${option#6}
-			;;
-		    l*)
-			BUILDLITE=Yes
-			option=${option#l}
-			;;
-		    L*)
-			BUILD6LITE=Yes
-			option=${option#L}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    ;;
-	*)
-	    done=Yes
-	    ;;
-    esac
-done
-
-echo "Arguments are $*"
-
-case $# in
-    1)
-	;;
-    2)
-	OLDVERSION=$2
-	;;
-    *)
-	usage
-	;;
-esac
-
-VERSION=$1
-BASEVERSION=$1
-
-LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log
-touch $LOGFILE
-progress_message "Build of Shorewall $VERSION on $(date)"
-
-case $VERSION in
-     4.4.*)
-	XMLPROJ="docs-4.3"
-
-	SVNBRANCH="Shorewall"
-	SVN6BRANCH="Shorewall6"
-	LITESVNBRANCH="Shorewall-lite"
-	LITE6SVNBRANCH="Shorewall6-lite"
-	DOCTAG="docs"
-	SAMPLESTAG="Samples"
-	SAMPLES6TAG="Samples6"
-	MANPAGETAG=manpages
-	MANPAGE6TAG=manpages6
-	LITEMANPAGETAG=manpages-lite
-	LITE6MANPAGETAG=manpages6-lite
-	;;
-   *)
-	echo "Unsupported Version: $VERSION"
-	exit 2
-	;;
-esac
-
-[ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }
-
-progress_message "Distribution directory is $DIR"
-
-cd $DIR
-
-[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-${VERSION} || SHOREWALLDIR=shorewall
-SHOREWALL6DIR=shorewall6-${VERSION}
-SHOREWALLLITEDIR=shorewall-lite-${VERSION}
-LITE6DIR=shorewall6-lite-${VERSION}
-TARBALL=shorewall-${VERSION}.tgz
-TARBALL6=shorewall6-${VERSION}.tgz
-LITETARBALL=shorewall-lite-${VERSION}.tgz
-LITE6TARBALL=shorewall6-lite-${VERSION}.tgz
-
-case $VERSION in
-    *Beta*|*RC*)
-    	BASEVERSION=${VERSION%-*}
-	RPMNAME=shorewall-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
-	RPM6NAME=shorewall6-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
-	LITERPMNAME=shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
-	LITE6RPMNAME=shorewall6-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
-	;;
-     *)
-	#
-	# Normal Release
-	#
-	RPMNAME=shorewall-${VERSION}-0base.noarch.rpm
-	RPM6NAME=shorewall6-${VERSION}-0base.noarch.rpm
-	LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
-	LITE6RPMNAME=shorewall6-lite-${VERSION}-0base.noarch.rpm
-	;;
-esac
-
-HTMLDIR=shorewall-docs-html-$VERSION
-
-if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
-    report "Shorewall directory is $DIR/$SHOREWALLDIR"
-    report "Shorewall6 directory is $DIR/$SHOREWALL6DIR"
-    report "Shorewall Lite directory is $DIR/$SHOREWALLLITEDIR"
-    report "Shorewall6 Lite directory is $DIR/$LITE6DIR"
-    report "SVN tag is $SVNBRANCH"
-    report "Samples tag is $SAMPLESTAG"
-    report "Samples6 tag is $SAMPLES6TAG"
-    report "SVN6 tag is $SVN6BRANCH"
-    report "Lite SVN tag is $LITESVNBRANCH"
-    report "Lite6 SVN tag is $LITE6SVNBRANCH"
-	
-    if [ -n "$BUILDTARBALL" ]; then
-	report "TARBALL is $TARBALL"
-	report "TARBALL6 is $TARBALL6"
-	report "LITETARBALL is $LITETARBALL"
-	report "LITE6TARBALL is $LITE6TARBALL"
-    fi
-
-    if [ -n "$BUILDRPM" ]; then
-	report "RPM is $RPMNAME"
-	[ -n "$RPM6NAME" ] && report "RPM6 is $RPM6NAME"
-	report "LITERPM is $LITERPMNAME"
-	[ -n "LITE6RPMNAME" ] && report "LITE6RPM is $LITE6RPMNAME"
-    fi
-fi
-
-[ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR"
-
-[ -n "$RPM6NAME" ]     || BUILD6=
-[ -n "$LITE6RPMNAME" ] || BUILD6LITE=
-
-if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
-
-    rm -rf $SHOREWALLDIR
-
-    [ -n "$BUILD6" ]      && rm -rf $SHOREWALL6DIR
-    [ -n "$BUILDLITE" ]   && rm -rf $SHOREWALLLITEDIR
-    [ -n "$BUILD6LITE" ]  && rm -rf $LITE6DIR
-
-    do_export $SVNBRANCH $SHOREWALLDIR
-
-    [ -n "$BUILD6" ]      && do_export $SVN6BRANCH $SHOREWALL6DIR
- 
-    [ -n "$BUILDLITE" ]   && do_export $LITESVNBRANCH  $SHOREWALLLITEDIR
-
-    [ -n "$BUILD6LITE" ]  && do_export $LITE6SVNBRANCH  $LITE6DIR
-    	
-    if [ -n "$BUILDLITE" ]; then
-	do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	if [ -f $SHOREWALLDIR/lib.cli ]; then
-	    do_or_die "cp $SHOREWALLDIR/lib.cli $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	fi
-	if [ -f $SHOREWALLDIR/wait4ifup ]; then
-	    do_or_die "cp $SHOREWALLDIR/wait4ifup $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	fi
-    fi
-
-    if [ -n "$BUILD6LITE" ]; then
-	do_or_die "cp $SHOREWALL6DIR/modules   $LITE6DIR >> $LOGFILE 2>&1"
-	do_or_die "cp $SHOREWALL6DIR/lib.base  $LITE6DIR >> $LOGFILE 2>&1"
-	do_or_die "cp $SHOREWALL6DIR/lib.cli   $LITE6DIR >> $LOGFILE 2>&1"
-	do_or_die "cp $SHOREWALL6DIR/wait4ifup $LITE6DIR >> $LOGFILE 2>&1"
-    fi
-
-    [ -n "$BUILD6" ]      && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHOREWALL6DIR >> $LOGFILE 2>&1"
-    [ -n "$BUILDLITE" ]   && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-    [ -n "$BUILD6LITE" ]  && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $LITE6DIR >> $LOGFILE 2>&1"
-
-    if [ -n "$BUILDCOMMON" ]; then
-	fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1     || fatal_error "install.sh has wrong version"
-	fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "uninstall.sh has wrong version"
-	if [ -d $SHOREWALLDIR/Perl ]; then
-	    [ $(eval perl -e "'use lib \"$SHOREWALLDIR/Perl\"; use Shorewall::Config qw(:internal); print \"\$globals{VERSION}\n\"'") = $VERSION ] || \
-		fatal_error "Perl Config.pm has wrong version"
-	else
-	    [ $(eval perl -e "'use lib \"$SHOREWALLDIR\"; use Shorewall::Config qw(:internal); print \"\$globals{VERSION}\n\"'") = $VERSION ] || \
-		fatal_error "Perl Config.pm has wrong version"
-	fi
-    fi
-
-    if [ -n "$BUILD6" ]; then
-	fgrep VERSION=$VERSION $SHOREWALL6DIR/install.sh > /dev/null 2>&1     || fatal_error "6 install.sh has wrong version"
-	fgrep VERSION=$VERSION $SHOREWALL6DIR/uninstall.sh > /dev/null 2>&1   || fatal_error "6 uninstall.sh has wrong version"
-    fi
-
-    if [ -n "$BUILDLITE" ]; then
-	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/install.sh > /dev/null 2>&1     || fatal_error "Lite install.sh has wrong version"
-	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "Lite uninstall.sh has wrong version"
-    fi
-
-    if [ -n "$BUILD6LITE" ]; then
-	fgrep VERSION=$VERSION $LITE6DIR/install.sh > /dev/null 2>&1     || fatal_error "Lite 6 install.sh has wrong version"
-	fgrep VERSION=$VERSION $LITE6DIR/uninstall.sh > /dev/null 2>&1   || fatal_error "Lite 6 uninstall.sh has wrong version"
-    fi
-
-    if [ -n "$BUILDCOMMON" ]; then
-	cd $SHOREWALLDIR
-	do_export $SAMPLESTAG Samples
-	do_manpages $MANPAGETAG '' ''
-	cd $DIR
-    fi
-
-    if [ -n "$BUILD6" ]; then
-	cd $SHOREWALL6DIR
-	do_export $SAMPLES6TAG Samples6
-	do_manpages $MANPAGE6TAG 6 6
-	cd $DIR
-    fi
-
-    if [ -n "$BUILDLITE" ]; then
-	cd $SHOREWALLLITEDIR
-	do_manpages $LITEMANPAGETAG -lite ''
-	cd $DIR 
-    fi	
-
-    if [ -n "$BUILD6LITE" ]; then
-	cd $LITE6DIR
-	do_manpages $LITE6MANPAGETAG 6-lite 6
-	cd $DIR 
-    fi	
-
-    [ -n "$BUILDCOMMON" ] && do_or_die "rm -rf $SHOREWALLDIR/debian"
-    [ -n "$BUILD6" ]      && do_or_die "rm -rf $SHOREWALL6DIR/debian"
-    [ -n "$BUILDLITE" ]   && do_or_die "rm -rf $SHOREWALLLITEDIR/debian"
-    [ -n "$BUILD6LITE" ]  && do_or_die "rm -rf $LITE6DIR/debian"
-
-    if [ -n "$BUILDTARBALL" ]; then
-	if [ -n "$BUILDCOMMON" ]; then	
-	    progress_message "Creating $DIR/$TARBALL..."
-	    rm -f $SHOREWALLDIR/*.diff
-	    do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall-${VERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
-	fi
-
-	if [ -n "$BUILD6" ]; then	
-	    progress_message "Creating $DIR/$TARBALL6..."
-	    rm -f $SHOREWALL6DIR/*.diff
-	    do_or_die "tar -zcvf $TARBALL6 $SHOREWALL6DIR >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall6-${VERSION}.tar.bz2 $SHOREWALL6DIR >> $LOGFILE 2>&1"
-	fi
-
-	if [ -n "$BUILDLITE" ]; then	
-	    progress_message "Creating $DIR/$LITETARBALL..."
-	    rm -f $SHOREWALLLITEDIR/*.diff
-	    do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall-lite-${VERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	fi
-    	
-	if [ -n "$BUILD6LITE" ]; then	
-	    progress_message "Creating $DIR/$LITE6TARBALL..."
-	    rm -f $LITE6DIR/*.diff
-	    do_or_die "tar -zcvf $LITE6TARBALL $LITE6DIR >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall6-lite-${VERSION}.tar.bz2 $LITE6DIR >> $LOGFILE 2>&1"
-	fi    	
-    fi
-
-    if [ -n "$BUILDRPM" ]; then
-	[ -n "$BUILDCOMMON" ] && do_buildanrpm $RPMNAME      shorewall       $SHOREWALLDIR
-	[ -n "$BUILD6" ]      && do_buildanrpm $RPM6NAME     shorewall6	     $SHOREWALL6DIR
-	[ -n "$BUILDLITE" ]   && do_buildanrpm $LITERPMNAME  shorewall-lite  $SHOREWALLLITEDIR
-	[ -n "$BUILD6LITE" ]  && do_buildanrpm $LITE6RPMNAME shorewall6-lite $LITE6DIR
-    fi
-fi
-
-if [ -n "${BUILDXML}${BUILDHTML}" ]; then
-    rm -rf $XMLPROJ
-    rm -rf shorewall-docs-xml-$VERSION
-
-    do_export $DOCTAG $XMLPROJ
-    do_or_die mv $XMLPROJ shorewall-docs-xml-$VERSION
-
-    rm -f shorewall-docs-xml-$VERSION/images/*.vsd
-    rm -f shorewall-docs-xml-$VERSION/images/~*
-    rm -f shorewall-docs-xml-$VERSION/images/*.JPG
-    rm -f shorewall-docs-xml-$VERSION/images/publish
-    rm -f shorewall-docs-xml-$VERSION/images/Thumbs.db
-
-    cd shorewall-docs-xml-$VERSION
-
-    do_export $MANPAGETAG manpages
-    mv manpages manpages.save
-
-    do_export $MANPAGE6TAG manpages
-    do_or_die mv manpages manpages6.save/
-
-    do_export $LITEMANPAGETAG manpages
-    do_or_die mv manpages/* manpages.save/
-
-    do_export $LITE6MANPAGETAG manpages
-    do_or_die mv manpages/* manpages6.save/
-
-    do_or_die rm -rf manpages
-    do_or_die rm -rf manpages6
-
-    do_or_die mv manpages.save  manpages
-    do_or_die mv manpages6.save manpages6
-
-    cd $DIR
-
-    if [ -n "$BUILDXML" ]; then
-	progress_message "Creating $DIR/shorewall-docs-xml-$VERSION tarballs"
-        tar -zcvf shorewall-docs-xml-$VERSION.tgz shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1
-        tar -jcvf shorewall-docs-xml-$VERSION.tar.bz2 shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1 || true
-    fi
-
-    if [ -n "$BUILDHTML" ]; then
-	progress_message "Building $HTMLDIR ..."
-
-	rm -rf $HTMLDIR
-
-	do_or_die mkdir $HTMLDIR
-	do_or_die mkdir $HTMLDIR/images
-	#
-	# The original HTML documents were created using MS FrontPage and used
-	# the .htm suffix. The remainder use the .html suffix.
-	#
-	HTMFILES="
-	    6to4.htm
-	    blacklisting_support.htm
-	    configuration_file_basics.htm
-	    CorpNetwork.htm
-	    dhcp.htm
-	    Documentation.htm
-	    errata.htm
-	    fallback.htm
-	    FAQ.htm
-	    GnuCopyright.htm
-	    Install.htm
-	    IPIP.htm
-	    IPSEC.htm
-	    kernel.htm
-	    myfiles.htm
-	    NAT.htm
-	    ports.htm
-	    PPTP.htm
-	    ProxyARP.htm
-	    quotes.htm
-	    samba.htm
-	    shorewall_extension_scripts.htm
-	    shorewall_features.htm
-	    shorewall_mirrors.htm
-	    shorewall_prerequisites.htm
-	    shorewall_quickstart_guide.htm
-	    shorewall_setup_guide_fr.htm
-	    shorewall_setup_guide.htm
-	    Shorewall_sfindex_frame.htm
-	    standalone.htm
-	    starting_and_stopping_shorewall.htm
-	    support.htm
-	    three-interface.htm
-	    traffic_shaping.htm
-	    troubleshoot.htm
-	    two-interface.htm
-	    upgrade_issues.htm
-	    VPN.htm
-	    whitelisting_under_shorewall.htm"
-
-	NOTOC="
-            Documentation_Index.xml
-            ECN.xml
-            fallback.xml
-            GettingStarted.xml
-            IPP2P.xml
-            ping.xml
-            ProxyARP.xml
-            Shorewall_Doesnt.xml
-            shorewall_features.xml
-            shorewall_prerequisites.xml
-            SimpleBridge.xml"
-
-	for file in shorewall-docs-xml-$VERSION/*.xml; do
-	    a=$(basename $file)
-	    b=${a%.*}
-	    list_search $b.htm $HTMFILES && b=$b.htm || b=$b.html
-	    f="shorewall-docs-html-$VERSION/$b"
-	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
-
-	    case $file in
-		*_ru.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
-		    ;;
-		*_fr.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
-		    ;;
-		*)
-		    LANGUAGE=
-		    ;;
-	    esac
-
-	    report "Converting $DIR/$file from XML to HTML ($DIR/$f) ..."
-
-	    do_or_die xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC -param toc.section.depth 3 $STYLESHEET $file
-	done
-
-	for f in shorewall-docs-xml-$VERSION/manpages/*.xml shorewall-docs-xml-$VERSION/manpages6/*.xml; do
-	    case $f in
-		*template.xml)
-		    ;;
-		*)
-		    progress_message "Generating HTML from $f..."
-		    do_or_die xsltproc --output ${f%.xml}.html --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $f
-		    ;;
-	    esac
-	done
-
-	progress_message "Copying manpages to $DIR/$HTMLDIR/images ..."
-
-	do_or_die mkdir $HTMLDIR/manpages
-	do_or_die cp -a shorewall-docs-xml-$VERSION/manpages/*.html $HTMLDIR/manpages/
-	do_or_die rm -f shorewall-docs-xml-$VERSION/manpages/*.html
-
-	do_or_die mkdir $HTMLDIR/manpages6
-	do_or_die cp -a shorewall-docs-xml-$VERSION/manpages6/*.html $HTMLDIR/manpages6/
-	do_or_die rm -f shorewall-docs-xml-$VERSION/manpages6/*.html
-
-	progress_message "Copying images to $DIR/$HTMLDIR/images ..."
-
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.png $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.gif $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.jpg $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/*.css $HTMLDIR
-
-	do_or_die ln -s Documentation_Index.html shorewall-docs-html-$VERSION/index.html
-
-	progress_message "Creating $DIR/shorewall-docs-html-$VERSION tarballs ..."
-
-	do_or_die "tar -zcvf shorewall-docs-html-$VERSION.tgz shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
-	do_or_die "tar -jcvf shorewall-docs-html-$VERSION.tar.bz2 shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
-    fi
-fi
-
-progress_message "Creating md5sums and sha1sums"
-
-rm -f $VERSION.md5sums $VERSION.sha1sums
-
-#
-# The following rather awkward algorithm gets around the problem of builds that don't
-# include the RPM
-#
-case $VERSION in
-    *Beta*|*RC*)
-	if [ -n "$BUILDCOMMON" ]; then		
-	    do_or_die "md5sum shorewall-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
-	    do_or_die "sha1sum shorewall-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
-	fi
-
-	if [ -n "$BUILDLITE" ]; then		
-	    do_or_die "md5sum shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
-	    do_or_die "sha1sum shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
-	fi
-	;;
-    *.*.*.*)
-	[ -f $RPMNAME ]      && do_or_die "md5sum $RPMNAME >> $VERSION.md5sums"
-	[ -f $RPM6NAME ]     && do_or_die "md5sum $RPM6NAME >> $VERSION.md5sums"
-	[ -f $LITERPMNAME ]  && do_or_die "md5sum $LITERPMNAME >> $VERSION.md5sums"
-	[ -f $LITE6RPMNAME ] && do_or_die "md5sum $LITE6RPMNAME >> $VERSION.md5sums"
-	;;
-esac
-
-for file in *; do
-    case $file in
-	*$VERSION[-.]*tgz|*$VERSION[-.]*rpm|*$VERSION[-.]*bz2)
-	    do_or_die "md5sum $file >> $VERSION.md5sums"
-	    do_or_die "sha1sum $file >> $VERSION.sha1sums"
-	    ;;
-    esac
-done
-
-if [ -n "$OLDVERSION" ]; then
-    
-    progress_message "Creating patch-$VERSION ..."
-
-    [ -d shorewall-$VERSION ]        && diff -Naur -X $(dirname $0)/exclude.txt shorewall-$OLDVERSION shorewall-$VERSION > patch-$VERSION || true
-    [ -d shorewall6-$VERSION ]       && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-$OLDVERSION       shorewall6-$VERSION       > patch-6-$VERSION      || true
-    [ -d shorewall-lite-$VERSION ]   && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION     > patch-lite-$VERSION   || true
-    [ -d shorewall6-lite-$VERSION ]  && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-lite-$OLDVERSION shorewall6-lite-$VERSION   > patch-6-lite-$VERSION || true
-    
-fi
-
-progress_message "Shorewall $VERSION Build complete - $(date)"

tools/build/exclude.txt

@@ -1,4 +0,0 @@
-*.5
-*.8
-*.gz
-diff*

tools/build/makeshorewall

@@ -1,715 +0,0 @@
-#!/bin/sh
-#
-# Shorewall Release Processing -- (C) 2003,2004,2005 -- Tom Eastep (teastep@shorewall.net)
-#                              -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
-# Version : $Id$
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# I install this script in /usr/local/bin/makeshorewall.
-#
-# Usage:
-#
-#   makeshorewall [ -trhxl ] <version> [ <previous version> ]
-#
-#      -t      Build tarball
-#      -r      Build RPM
-#      -h      Build HTML documentation
-#      -x      Build XML documentation
-#      -s      Sign with GPG
-#      -p      Build shorewall-perl
-#
-# If no options are given, all options are assumed.
-#
-# If <previous version> is given, a patch file reflecting the differences
-# between that version and the current version ( <version> ) is
-# generated. The directory ./shorewall-<previous version> must exist and
-# contain the version against which the patch is generated.
-################################################################################
-#                          C O N F I G U R A T I O N
-################################################################################
-#
-# XSL Stylesheet to use for XML->HTML conversion
-#
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-#
-# Directory where the build log will be placed. The log has the name
-# shorewall_build_<version>.log
-#
-LOGDIR=$PWD
-#
-# Your RPM build directory
-#
-RPMDIR=~/rpm/
-#
-# Directory where you want the release to be built
-#
-DIR=$PWD
-#
-# location and options for GnuPG
-#
-GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
-#
-# SVN Repository
-#
-SVN=https://shorewall.svn.sourceforge.net/svnroot/shorewall
-#
-# Program that generates man pages from Docbook XML
-#
-DOCBOOK2MAN="docbook-to-man -C /usr/share/docbook2X/xslt/catalog.xml --utf8trans-map /usr/share/docbook2X/charmaps/roff.charmap"
-################################################################################
-#                               V A R I A B L E S
-################################################################################
-VERSION=
-OLDVERSION=
-SHOREWALLDIR=
-SHOREWALLLITEDIR=
-SOURCEDIR=
-SVNBRANCH=
-LITESVNBRANCH=
-XMLPROJ=
-RPMNAME=
-LITERPMNAME=
-TARBALL=
-LITETARBALL=
-LOGFILE=
-HTMLDIR=
-BUILDTARBALL=
-BUILDRPM=
-BUILDXML=
-BUILDHTML=
-SAMPLESTAG=
-HASLITE=
-SIGN=
-MANPAGETAG=
-LITEMANPAGETAG=
-BUILDPERL=
-PERLDIR=
-PERLBRANCH=
-PERLRPMNAME=
-PERLTARBALL=
-################################################################################
-#                               F U N C T I O N S
-################################################################################
-progress_message()
-{
-    echo         >>    $LOGFILE
-    echo "$@" | tee -a $LOGFILE
-    echo         >>    $LOGFILE
-}
-
-report()
-{
-    echo "$@" | tee -a $LOGFILE
-}
-
-do_or_die()
-{
-    eval $@ || { progress_message "Step \"$*\" FAILED" ; exit 2; }
-}
-
-fatal_error() {
-    progress_message "$*"
-    exit 2
-}
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-usage()
-{
-    echo "usage: $(basename $0) [ -trhxl] <version> [ <old-version> ]"
-    exit 2
-}
-################################################################################
-#                E X E C U T I O N   S T A R T S   H E R E
-################################################################################
-
-set -e
-set -u
-
-
-done=
-
-[ $# -eq 0 ] && usage
-
-case $1 in
-    -*)
-	;;
-    *)
-	BUILDTARBALL=Yes
-	BUILDRPM=Yes
-	BUILDHTML=Yes
-	BUILDXML=Yes
-	BUILDRPM=Yes
-	done=Yes
-	SIGN=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    option=${option#-}
-
-	    [ -z "$option" ] && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    t*)
-			BUILDTARBALL=Yes
-			option=${option#t}
-			;;
-		    r*)
-			BUILDTARBALL=Yes
-			BUILDRPM=Yes
-			option=${option#r}
-			;;
-		    h*)
-			BUILDHTML=Yes
-			option=${option#h}
-			;;
-		    x*)
-			BUILDXML=Yes
-			option=${option#x}
-			;;
-		    s*)
-			SIGN=Yes
-			option=${option#s}
-			;;
-		    p*)
-			BUILDPERL=Yes
-			option=${option#p}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    shift
-	    ;;
-	*)
-	    done=Yes
-	    ;;
-    esac
-done
-
-case $# in
-    1)
-	;;
-    2)
-	OLDVERSION=$2
-	;;
-    *)
-	usage
-	;;
-esac
-
-VERSION=$1
-LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log
-touch $LOGFILE
-progress_message "Build of Shorewall $VERSION on $(date)"
-
-case $VERSION in
-    3.2.*)
-	SVNBRANCH="branches/3.2/Shorewall"
-	LITESVNBRANCH="branches/3.2/Shorewall-lite"
-	DOCTAG="branches/3.4/docs"
-	XMLPROJ="docs-3.2"
-	SAMPLESTAG="branches/3.2/Samples"
-	HASLITE=Yes
-	;;
-     3.4.*)
-	SVNBRANCH="branches/3.4/Shorewall"
-	LITESVNBRANCH="branches/3.4/Shorewall-lite"
-	DOCTAG="branches/3.4/docs"
-	XMLPROJ="docs-3.4"
-	SAMPLESTAG="branches/3.4/Samples"
-	HASLITE=Yes
-	MANPAGETAG=branches/3.4/manpages
-	LITEMANPAGETAG=branches/3.4/manpages-lite
-	;;
-   *)
-	echo "Unsupported Version: $VERSION"
-	exit 2
-	;;
-esac
-
-[ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }
-
-progress_message "Distribution directory is $DIR"
-
-cd $DIR
-
-case $VERSION in
-    *Beta*|*RC*)
-	#
-	# Beta or Release Candidate
-	#
-	SHOREWALLDIR=shorewall-${VERSION%-*}
-	SHOREWALLLITEDIR=shorewall-lite-${VERSION%-*}
-	TARBALL=shorewall-${VERSION%-*}.tgz
-	LITETARBALL=shorewall-lite-${VERSION%-*}.tgz
-	RPMNAME=shorewall-${VERSION%-*}-0${VERSION#*-}.noarch.rpm
-	LITERPMNAME=shorewall-lite-${VERSION%-*}-0${VERSION#*-}.noarch.rpm
-	PERLRPMNAME=shorewall-perl-${VERSION%-*}-0${VERSION#*-}.noarch.rpm
-	PERLTARBALL=shorewall-perl-${VERSION%-*}.tgz
-	PERLDIR=shorewall-perl-${VERSION%-*}
-	;;
-    *)
-	#
-	# Normal Release
-	#
-	SHOREWALLDIR=shorewall-$VERSION
-	SHOREWALLLITEDIR=shorewall-lite-$VERSION
-	TARBALL=shorewall-$VERSION.tgz
-	LITETARBALL=shorewall-lite-$VERSION.tgz
-	RPMNAME=shorewall-${VERSION}-1.noarch.rpm
-	LITERPMNAME=shorewall-lite-${VERSION}-1.noarch.rpm
-	PERLRPMNAME=shorewall-perl-${VERSION}-1.noarch.rpm
-	PERLDIR=shorewall-perl-$VERSION
-	PERLTARBALL=shorewall-perl-$VERSION.tgz
-	;;
-esac
-
-HTMLDIR=shorewall-docs-html-$VERSION
-
-if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
-    report "Shorewall directory is $DIR/$SHOREWALLDIR"
-    report "Shorewall Lite directory is $DIR/$SHOREWALLLITEDIR"
-    report "SVN tag is $SVNBRANCH"
-    report "Lite SVN tag is $LITESVNBRANCH"
-    [ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL" && report "LITETARBALL is $LITETARBALL"
-    [ -n "$BUILDRPM" ]     && report "RPM is $RPMNAME" && report "LITERPM is $LITERPMNAME"
-fi
-
-[ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR"
-
-if [ -n "$BUILDPERL" ]; then
-    report "shorewall-perl directory is $DIR/$PERLDIR"
-    report "Perl SVN tag is $PERLBRANCH"
-    report "Perl RPM is $PERLRPMNAME"
-
-    rm -rf $PERLDIR
-    	
-    progress_message "Exporting $PERLBRANCH from SVN..."
-    do_or_die "svn export --non-interactive --force ${SVN}/$PERLBRANCH  $PERLDIR >> $LOGFILE 2>&1"
-
-    progress_message "Creating $DIR/$PERLTARBALL..."
-    do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1"
-    do_or_die "tar -jcvf shorewall-perl-${VERSION%-*}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1"
-
-    if [ -n "$SIGN" ]; then
-	for shoresuffix in tgz tar.bz2; do
-	    shoreball=shorewall-perl-${VERSION%-*}.${shoresuffix}
-	    report "GPG signing $DIR/$shoreball"
-	    rm -f ${shoreball}.asc
-	    do_or_die "$GPG $shoreball"
-	done
-    fi
-
-    progress_message "Building $PERLRPMNAME..."
-
-    test -n "$SIGN" && SIGN="--sign"
-    rm -rf $RPMDIR/BUILD/shorewall-perl-${VERSION%-*}*
-    do_or_die "cp shorewall-perl-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
-    do_or_die "cp $PERLDIR/shorewall-perl.spec $RPMDIR/SPECS/"
-    do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-perl.spec >> $LOGFILE 2>&1"
-    do_or_die cp -a $RPMDIR/RPMS/noarch/$PERLRPMNAME  .
-
-    > $VERSION.md5sums
-    > $VERSION.sha1sums
-
-    for file in *; do
-	case $file in
-	    *-perl-$VERSION[-.]*tgz|*-perl-$VERSION[-.]*rpm|*perl-$VERSION[-.]*bz2)
-	    do_or_die "md5sum $file >> $VERSION.md5sums"
-	    do_or_die "sha1sum $file >> $VERSION.sha1sums"
-	    ;;
-    esac
-done
-fi
-
-if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
-    progress_message "Exporting $SVNBRANCH from SVN..."
-
-    rm -rf $SHOREWALLDIR
-    rm -rf $SHOREWALLLITEDIR
-
-    do_or_die "svn export --non-interactive --force ${SVN}/$SVNBRANCH  $SHOREWALLDIR >> $LOGFILE 2>&1"
- 
-    if [ -n "$HASLITE" ]; then
-	progress_message "Exporting $LITESVNBRANCH from SVN..."
-	do_or_die "svn export --non-interactive --force ${SVN}/$LITESVNBRANCH  $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	if [ -f $SHOREWALLDIR/lib.base ]; then
-	    do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    if [ -f $SHOREWALLDIR/lib.cli ]; then
-		do_or_die "cp $SHOREWALLDIR/lib.cli $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    fi
-	    if [ -f $SHOREWALLDIR/wait4ifup ]; then
-		do_or_die "cp $SHOREWALLDIR/wait4ifup $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    fi
-	else
-	    do_or_die "cp $SHOREWALLDIR/functions $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	fi
-	do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-    fi
-
-    fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1     || fatal_error "install.sh has wrong version"
-    fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "uninstall.sh has wrong version"
-    fgrep VERSION=$VERSION $SHOREWALLDIR/fallback.sh > /dev/null 2>&1    || fatal_error "fallback.sh has wrong version"
-    if [ -n "$HASLITE" ]; then
-	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/install.sh > /dev/null 2>&1     || fatal_error "Lite install.sh has wrong version"
-	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "Lite uninstall.sh has wrong version"
-	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/fallback.sh > /dev/null 2>&1    || fatal_error "Lite fallback.sh has wrong version"
-    fi
-
-    if [ -n "$SAMPLESTAG" ]; then
-	cd $SHOREWALLDIR
-	do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLESTAG Samples >> $LOGFILE 2>&1"
-	cd $DIR
-    fi
-
-    if [ -n "$MANPAGETAG" ]; then
-	cd $SHOREWALLDIR
-	progress_message "Exporting $MANPAGETAG from SVN..."
-	do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
-	cd manpages
-	for f in *.xml; do
-	    if [ $f != shorewall-template.xml ]; then
-		progress_message "Generating Man Page from $f..."
-		$DOCBOOK2MAN $f
-	    fi
-	done
-	rm *.xml
-	perl -p -i'' -e 's/ \[.*?html\]//g' *.5 *.8
-	cd $DIR
-
-	cd $SHOREWALLLITEDIR
-
-	progress_message "Exporting $LITEMANPAGETAG from SVN..."
-	do_or_die "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
-	cd manpages
-	for f in *.xml; do
-	    if [ $f != shorewall-template.xml ]; then
-		progress_message "Generating Man Page from $f..."
-		$DOCBOOK2MAN $f
-	    fi
-	done
-	rm *.xml
-	perl -p -i'' -e 's/ \[.*?html\]//g' *.5 *.8
-	cd $DIR 
-    fi	
-
-    do_or_die "rm -rf $SHOREWALLDIR/debian"
-
-    if [ -n "$BUILDTARBALL" ]; then
-	
-	progress_message "Creating $DIR/$TARBALL..."
-	
-	do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
-        do_or_die "tar -jcvf shorewall-${VERSION%-*}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
-	if [ -n "$SIGN" ]; then
-	    for shoresuffix in tgz tar.bz2; do
-		shoreball=shorewall-${VERSION%-*}.${shoresuffix}
-		report "GPG signing $DIR/$shoreball"
-		rm -f ${shoreball}.asc
-		do_or_die "$GPG $shoreball"
-	    done
-	fi
-	if [ -n "$HASLITE" ]; then
-	    progress_message "Creating $DIR/$LITETARBALL..."
-	    do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall-lite-${VERSION%-*}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
-	    if [ -n "$SIGN" ]; then
-		for shoresuffix in tgz tar.bz2; do
-		    shoreball=shorewall-lite-${VERSION%-*}.${shoresuffix}
-		    report "GPG signing $DIR/$shoreball"
-		    rm -f ${shoreball}.asc
-		    do_or_die "$GPG $shoreball"
-		done
-	    fi
-	fi
-    fi
-
-    if [ -n "$BUILDRPM" ]; then
-	progress_message "Building $RPMNAME..."
-
-	test -n "$SIGN" && SIGN="--sign"
-	rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
-	do_or_die "cp shorewall-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
-	do_or_die "cp $SHOREWALLDIR/shorewall.spec $RPMDIR/SPECS/"
-	do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall.spec >> $LOGFILE 2>&1"
-	do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
-
-	if [ -n "$HASLITE" ]; then
-	    progress_message "Building $LITERPMNAME..."
-
-	    rm -rf $RPMDIR/BUILD/shorewall-${VERSION%-*}
-	    do_or_die "cp shorewall-lite-${VERSION%-*}.tgz $RPMDIR/SOURCES/"
-	    do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/"
-	    do_or_die "rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec >> $LOGFILE 2>&1"
-	    do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
-	fi
-    fi
-fi
-
-if [ -n "${BUILDXML}${BUILDHTML}" ]; then
-    progress_message "Exporting $XMLPROJ from SVN..."
-
-    rm -rf $XMLPROJ
-    rm -rf shorewall-docs-xml-$VERSION
-
-    do_or_die "svn export --non-interactive --force ${SVN}/$DOCTAG $XMLPROJ >> $LOGFILE 2>&1"
-    do_or_die mv $XMLPROJ shorewall-docs-xml-$VERSION
-
-    rm -f shorewall-docs-xml-$VERSION/images/*.vsd
-    rm -f shorewall-docs-xml-$VERSION/images/~*
-    rm -f shorewall-docs-xml-$VERSION/images/*.JPG
-    rm -f shorewall-docs-xml-$VERSION/images/publish
-    rm -f shorewall-docs-xml-$VERSION/images/Thumbs.db
-
-    if [ -n "$BUILDXML" ]; then
-	progress_message "Creating $DIR/shorewall-docs-xml-$VERSION tarballs"
-        do_or_die "tar -zcvf shorewall-docs-xml-$VERSION.tgz shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1"
-        do_or_die "tar -jcvf shorewall-docs-xml-$VERSION.tar.bz2 shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1"
-	if [ -n "$SIGN" ]; then
-	    for shoresuffix in tgz tar.bz2; do
-		xmlball=shorewall-docs-xml-$VERSION.${shoresuffix}
-		report "GPG signing $DIR/$xmlball tarball"
-		rm -f ${xmlball}.asc
-		do_or_die "$GPG $xmlball"
-	    done
-	fi
-    fi
-
-    if [ -n "$BUILDHTML" ]; then
-	progress_message "Building $HTMLDIR ..."
-
-	rm -rf $HTMLDIR
-
-	do_or_die mkdir $HTMLDIR
-	do_or_die mkdir $HTMLDIR/images
-	#
-	# The original HTML documents were created using MS FrontPage and used
-	# the .htm suffix. The remainder use the .html suffix.
-	#
-	HTMFILES="
-	    6to4.htm
-	    blacklisting_support.htm
-	    configuration_file_basics.htm
-	    CorpNetwork.htm
-	    dhcp.htm
-	    Documentation.htm
-	    errata.htm
-	    fallback.htm
-	    FAQ.htm
-	    GnuCopyright.htm
-	    Install.htm
-	    IPIP.htm
-	    IPSEC.htm
-	    kernel.htm
-	    myfiles.htm
-	    NAT.htm
-	    ports.htm
-	    PPTP.htm
-	    ProxyARP.htm
-	    quotes.htm
-	    samba.htm
-	    shorewall_extension_scripts.htm
-	    shorewall_features.htm
-	    shorewall_mirrors.htm
-	    shorewall_prerequisites.htm
-	    shorewall_quickstart_guide.htm
-	    shorewall_setup_guide_fr.htm
-	    shorewall_setup_guide.htm
-	    Shorewall_sfindex_frame.htm
-	    standalone.htm
-	    starting_and_stopping_shorewall.htm
-	    support.htm
-	    three-interface.htm
-	    traffic_shaping.htm
-	    troubleshoot.htm
-	    two-interface.htm
-	    upgrade_issues.htm
-	    VPN.htm
-	    whitelisting_under_shorewall.htm"
-
-	NOTOC="
-            Documentation_Index.xml
-            ECN.xml
-            fallback.xml
-            GettingStarted.xml
-            IPP2P.xml
-            ping.xml
-            ProxyARP.xml
-            Shorewall_Doesnt.xml
-            shorewall_features.xml
-            shorewall_prerequisites.xml
-            SimpleBridge.xml"
-
-	for file in shorewall-docs-xml-$VERSION/*.xml; do
-	    a=$(basename $file)
-	    b=${a%.*}
-	    list_search $b.htm $HTMFILES && b=$b.htm || b=$b.html
-	    f="shorewall-docs-html-$VERSION/$b"
-	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
-
-	    case $file in
-		*_ru.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
-		    ;;
-		*_fr.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
-		    ;;
-		*)
-		    LANGUAGE=
-		    ;;
-	    esac
-
-	    report "Converting $DIR/$file from XML to HTML ($DIR/$f) ..."
-
-	    do_or_die xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC -param toc.section.depth 3 $STYLESHEET $file
-	done
-
-	progress_message "Copying images to $DIR/$HTMLDIR/images ..."
-
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.png $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.gif $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.jpg $HTMLDIR/images
-	do_or_die cp -a shorewall-docs-xml-$VERSION/*.css $HTMLDIR
-
-	do_or_die ln -s Documentation_Index.html shorewall-docs-html-$VERSION/index.html
-
-	progress_message "Creating $DIR/shorewall-docs-html-$VERSION tarballs ..."
-
-	do_or_die "tar -zcvf shorewall-docs-html-$VERSION.tgz shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
-	do_or_die "tar -jcvf shorewall-docs-html-$VERSION.tar.bz2 shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
-	if [ -n "$SIGN" ]; then
-	    for shoresuffix in tgz tar.bz2; do
-		htmlball=shorewall-docs-html-$VERSION.${shoresuffix}
-		report "GPG signing $DIR/$htmlball tarball"
-		rm -f ${htmlball}.asc
-		do_or_die "$GPG $htmlball"
-	    done
-	fi
-    fi
-fi
-
-[ -n "$BUILDTARBALL" ] && case $VERSION in
-    *Beta*|*RC*)
-	#
-	# The original tarball created above didn't include the -Beta or -RC portion of the
-	# name in either the tarball name or the directory name. Create it here
-	#
-	progress_message "Creating $DIR/shorewall-$VERSION..."
-
-	rm -rf shorewall-$VERSION
-
-	do_or_die mv $SHOREWALLDIR shorewall-$VERSION
-
-	progress_message "Creating $DIR/shorewall-${VERSION}.tgz ..."
-
-        do_or_die "tar -zcvf shorewall-${VERSION}.tgz shorewall-$VERSION >> $LOGFILE 2>&1"
-        do_or_die "tar -jcvf shorewall-$VERSION.tar.bz2 shorewall-$VERSION >> $LOGFILE 2>&1"
-
-	if [ -n "$SIGN" ]; then
-	    for shoresuffix in tgz tar.bz2; do
-		betaball=shorewall-$VERSION.${shoresuffix}
-		report "GPG signing $DIR/$betaball tarball"
-		rm -f ${betaball}.asc
-		do_or_die "$GPG $betaball"
-	    done
-	fi
-
-
-	if [ -n "$HASLITE" ]; then
-	    progress_message "Creating $DIR/shorewall-lite-$VERSION..."
-
-	    rm -rf shorewall-lite-$VERSION
-
-	    do_or_die mv $SHOREWALLLITEDIR shorewall-lite-$VERSION
-
-
-	    progress_message "Creating $DIR/shorewall-lite-${VERSION}.tgz ..."
-
-	    do_or_die "tar -zcvf shorewall-lite-${VERSION}.tgz shorewall-lite-$VERSION >> $LOGFILE 2>&1"
-	    do_or_die "tar -jcvf shorewall-lite-$VERSION.tar.bz2 shorewall-lite-$VERSION >> $LOGFILE 2>&1"
-
-	    if [ -n "$SIGN" ]; then
-		for shoresuffix in tgz tar.bz2; do
-		    betaball=shorewall-lite-$VERSION.${shoresuffix}
-		    report "GPG signing $DIR/$betaball tarball"
-		    rm -f ${betaball}.asc
-		    do_or_die "$GPG $betaball"
-		done
-	    fi
-	fi
-	;;
-esac
-
-progress_message "Creating md5sums and sha1sums"
-
-rm -f $VERSION.md5sums $VERSION.sha1sums
-
-#
-# The following rather awkward algorithm gets around the problem of builds that don't
-# include the RPM
-#
-case $VERSION in
-    *Beta*|*RC*)
-	do_or_die "md5sum shorewall-${VERSION%-*}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
-	do_or_die "sha1sum shorewall-${VERSION%-*}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
-	if [ -n "$HASLITE" ]; then
-	    do_or_die "md5sum shorewall-lite-${VERSION%-*}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
-	    do_or_die "sha1sum shorewall-lite-${VERSION%-*}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
-	fi
-	;;
-esac
-
-for file in *; do
-    case $file in
-	*$VERSION[-.]*tgz|*$VERSION[-.]*rpm|*$VERSION[-.]*bz2)
-	    do_or_die "md5sum $file >> $VERSION.md5sums"
-	    do_or_die "sha1sum $file >> $VERSION.sha1sums"
-	    ;;
-    esac
-done
-
-if [ -n "$OLDVERSION" ]; then
-    progress_message "Creating patch-$VERSION ..."
-
-    diff -Naur -X $(dirname $0)/exclude.txt shorewall-$OLDVERSION shorewall-$VERSION > patch-$VERSION || true
-    if [ -n "$HASLITE" ]; then
-	diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION >> patch-$VERSION || true
-    fi
-fi
-
-progress_message "Shorewall $VERSION Build complete - $(date)"

tools/build/makeshorewall-debian

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Basic script to build a Debian package - should be executed from the
-# main Shorewall source directory (containing the debian/ subdirectory).
-
-set -e
-set -u
-set -x
-
-PROGNAME=`basename $0`
-MODULE=Shorewall
-PACKAGE=shorewall
-DATE=`date +%Y%m%d`
-VERSION="2.5-cvs$DATE.1"
-# This uses developer CVS - until SF.net fix the 5-hour delay between
-# developer and anonymous CVS, this is the preferred mechanism.
-ROOT=":ext:cvs.sourceforge.net:/cvsroot/shorewall"
-#ROOT=":pserver:anonymous@cvs.sourceforge.net:/cvsroot/shorewall"
-TAG=HEAD
-DIR="/tmp/$PACKAGE-$VERSION"
-# Adjust this to the location of a local repository.
-REPOSITORY=/share/src/shorewall/apt
-
-# Email address for Debian changelog entry - the email address is also
-# used by dpkg-buildpackage to look up the GPG key.
-export DEBEMAIL='Shorewall Autobuilder <autobuild@gear.dyndns.org>'
-
-# clean up first
-rm -rf $DIR
-mkdir -p $DIR
-cd $DIR
-
-# Export the source
-cvs -d "$ROOT" -q export -r HEAD $MODULE
-cd $MODULE
-
-# Create a dummy changelog entry
-debchange --newversion $VERSION "Autobuild by $PROGNAME"
-
-# Build the package
-dpkg-buildpackage -rfakeroot
-
-# move to repository
-cd ..
-mkdir -p $REPOSITORY/incoming
-mv *.dsc *.tar.gz *.changes *.deb $REPOSITORY/incoming/

tools/build/setversion

@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-#  Update the version in a set of Shorewall product directories
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       setversion <version>
-#
-[ $# -eq 1 ] || { echo "usage: setversion <version>" >&2; exit 1; }
-
-VERSION=$1
-SUFFIX=
-
-case $VERSION in
-    *.*.*.*)
-	RPMVERSION=${VERSION%.*}
-	RELEASE=${VERSION##*.}
-	SUFFIX="-$RELEASE"
-	;;
-    *-*)
-	RPMVERSION=${VERSION%-*}
-	RELEASE=0${VERSION##*-}
-	;;
-    *)
-	RPMVERSION=${VERSION}
-	RELEASE=0base
-	;;
-esac
-
-for product in "" -common 6 -lite 6-lite -shell -perl; do
-    dir=Shorewall${product}${SUFFIX}
-
-    for file in $dir/install.sh $dir/uninstall.sh $dir/fallback.sh; do
-	[ -f $file ] && eval perl -p -i -e "'s/^VERSION=.*/VERSION=${VERSION}/'" $file
-    done
-
-    file=$dir/shorewall${product}.spec
-    [ -f $file ] && eval perl -n -i -e "'s/^%define version .*/%define version ${RPMVERSION}/; \
-                                         s/^%define release .*/%define release ${RELEASE}/; \
-                                         print \$_; \
-                                         if ( /%changelog/ ) {\
-                                             print \"\* $(date +'%a %b %d %Y') Tom Eastep tom\\@shorewall.net\\n\"; \
-                                             print \"- Updated to ${RPMVERSION}-${RELEASE}\\n\"; \
-                                         }'" $file
-done
-
-file=Shorewall-perl${SUFFIX}/Shorewall/Config.pm
-[ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file
-
-file=Shorewall${SUFFIX}/Shorewall/Config.pm
-[ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file
-
-file=Shorewall${SUFFIX}/Perl/Shorewall/Config.pm
-[ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file
-
-[ -d Shorewall${SUFFIX} ] && echo "There are no known problems in Shorewall version ${VERSION}" > Shorewall${SUFFIX}/known_problems.txt
-

tools/build/stage

@@ -1,266 +0,0 @@
-#!/bin/sh
-#
-#  Stage a release on the master server
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       stage [-pclL6sxh] <version>
-#
-
-usage() {
-    echo "Usage: stage [-pclL6sxh] <version>"
-}
-
-rpm=
-rpm6=
-literpm=
-lite6rpm=
-perlrpm=
-shellrpm=
-
-DEST=
-USER="webadmin@mail.shorewall.net"
-SHOREWALL=shorewall
-COMMAND=scp
-
-UPLOADCOMMON=
-UPLOADPERL=
-UPLOADSHELL=
-UPLOADLITE=
-UPLOADXML=
-UPLOADHTML=
-UPLOAD6=
-UPLOAD6LITE=
-PARTIAL=Yes
-BASE=
-
-done=
-
-case $1 in
-    -*)
-	;;
-    *)
-	UPLOADCOMMON=Yes
-	UPLOADPERL=Yes
-	UPLOADSHELL=Yes
-	UPLOADLITE=Yes
-	UPLOADXML=Yes
-	UPLOADHTML=Yes
-
-	case $1 in
-	    4.0.*)
-		;;
-	    *)
-		UPLOAD6=Yes
-		UPLOAD6LITE=Yes
-		;;
-	esac
-
-	PARTIAL=
-	done=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    option=${option#-}
-
-	    [ -z "$option" ] && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    p*)
-			UPLOADPERL=Yes
-			option=${option#p}
-			;;
-		    c*)
-			UPLOADCOMMON=Yes
-			option=${option#c}
-			;;
-		    s*)
-			UPLOADSHELL=Yes
-			option=${option#s}
-			;;
-		    l*)
-			UPLOADLITE=Yes
-			option=${option#l}
-			;;
-		    x*)
-			UPLOADXML=Yes
-			option=${option#x}
-			;;
-		    h*)
-			UPLOADHTML=Yes
-			option=${option#h}
-			;;
-		    6*)
-			UPLOAD6=Yes
-			option=${option#6}
-			;;
-		    L*)
-			UPLOAD6LITE=Yes
-			option=${option#L}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    shift
-	    ;;
-	*)
-	    done=Yes
-            ;;
-    esac
- done
-
-
-case $1 in
-    4.*Beta*|4.*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm
-	rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
-	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
-	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
-	BASE=Yes
-	;;
-    *.*.*.*)
-	BASEVERSION=${1%.*}
-	PATCHNUM=${1##*.}
-	DEST="/srv/ftp/pub/shorewall/development/staging/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	perlrpm=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	shellrpm=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	;;
-    4.0.*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
-	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    4.[12].*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
-	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    4.3.*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
-	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    3.*[13579].*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	;;
-    *.*[13579].*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	;;
-    3.*Beta*|*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	;;
-    *.*Beta*|*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
-	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
-	;;
-    3.[2468].*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	;;
-    *.[2468].*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	literpm=shorewall-lite-${1}-1.noarch.rpm
-	perlrpm=shorewall-perl-${1}-1.noarch.rpm
-	shellrpm=shorewall-shell-${1}-1.noarch.rpm
-	;;
-    *)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
-	rpm=shorewall-${1}-1.noarch.rpm
-	;;
-esac
-
-[ $# -eq 1 ] || { echo "Usage: $(basename $0) <version>"; exit 2; }
-
-[ -d errata ] || mkdir errata
-
-[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
-
-[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ]  && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
-
-cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
-
-if [ "$HOSTNAME" = lists ]; then
-	mkdir -p $DEST
-	[ -n "$BASE" ] && mkdir $DEST/base
-	COMMAND=cp
-else
-	ssh $USER mkdir -p $DEST
-	[ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
-	DEST=${USER}:${DEST}
-fi
-
-files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
-base=
-
-[ -n "$UPLOAD6" ]      && base="shorewall6-${1}.tar.*"                && files="$files shorewall6-${1}.*          $rpm6"
-[ -n "$UPLOADPERL" ]   && base="shorewall-perl-${1}.tar.*"            && files="$files shorewall-perl-${1}.*      $perlrpm"
-[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*"    && files="$files shorewall-common-${1}.*    $rpm"
-[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*"     && files="$files shorewall-shell-${1}.*     $shellrpm"
-[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*"      && files="$files shorewall-lite-${1}.*      $literpm"
-[ -n "$UPLOAD6LITE" ]  && base="$base shorewall6-lite-${1}.tar.*"     && files="$files shorewall6-lite-${1}.*     $lite6rpm"
-[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*"  && files="$files shorewall-docs-xml-${1}.*  $literpm"
-[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
-
-[ -n "$BASE" ] && $COMMAND $base $DEST/base
-
-$COMMAND -r $files $DEST

tools/build/stage44

@@ -1,194 +0,0 @@
-#!/bin/sh
-#
-#  Stage a release to the master server
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       stage [-pclL6sxh] <version>
-#
-
-usage() {
-    echo "Usage: stage [-pclL6sxh] <version>"
-}
-
-rpm=
-rpm6=
-literpm=
-lite6rpm=
-perlrpm=
-shellrpm=
-
-DEST=
-USER="webadmin@mail.shorewall.net"
-SHOREWALL=shorewall
-COMMAND=scp
-
-STAGECOMMON=
-STAGELITE=
-STAGEXML=
-STAGEHTML=
-STAGE6=
-STAGE6LITE=
-PARTIAL=Yes
-BASE=
-
-done=
-
-case $1 in
-    -*)
-	;;
-    *)
-	STAGECOMMON=Yes
-	STAGEPERL=Yes
-	STAGESHELL=Yes
-	STAGELITE=Yes
-	STAGEXML=Yes
-	STAGEHTML=Yes
-	STAGE6=Yes
-	STAGE6LITE=Yes
-	PARTIAL=
-	done=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    option=${option#-}
-
-	    [ -z "$option" ] && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    c*)
-			STAGECOMMON=Yes
-			option=${option#c}
-			;;
-		    l*)
-			STAGELITE=Yes
-			option=${option#l}
-			;;
-		    x*)
-			STAGEXML=Yes
-			option=${option#x}
-			;;
-		    h*)
-			STAGEHTML=Yes
-			option=${option#h}
-			;;
-		    6*)
-			STAGE6=Yes
-			option=${option#6}
-			;;
-		    L*)
-			STAGE6LITE=Yes
-			option=${option#L}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    shift
-	    ;;
-	*)
-	    done=Yes
-	    ;;
-    esac
-done
-
-
-case $1 in
-    4.*Beta*|4.*RC*)
-	DEST="/srv/ftp/pub/private/development/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
-	BASE=Yes
-	;;
-    4.4.*)
-	DEST="/srv/ftp/pub/private/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall
-	rpm=shorewall-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    *)
-	echo "Unknown Version $1" >&2
-	exit 1
-	;;
-esac
-
-[ $# -eq 1 ] || { echo "Usage: $(basename $0) <version>"; exit 2; }
-
-if [ -z "$PATCHNUM" -a -d shorewall-common ]; then
-    echo "   ERROR: Paranoid to stage a base release when a patch release has been built in the current directory" >&2
-    exit 1 
-fi
-
-[ -d errata ] || mkdir errata
-
-[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
-
-[ -n "$PARTIAL" -a -z "$STAGECOMMON" ]  && SHOREWALLDIR=shorewall || SHOREWALLDIR=$SHOREWALL-${1}
-
-cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
-
-if [ "$HOSTNAME" = lists ]; then
-	mkdir -p $DEST
-	[ -n "$BASE" ] && mkdir $DEST/base
-	COMMAND=cp
-else
-	ssh $USER mkdir -p $DEST
-	[ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
-	DEST=${USER}:${DEST}
-fi
-
-files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
-base=
-
-rm -f *-${1}*.asc
-
-for f in *-${1}.tar.bz2 *-${1}.tgz; do
-    /usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key' $f
-done
-
-[ -n "$STAGE6" ]      && base="shorewall6-${1}.tar.*"                && files="$files shorewall6-${1}.*          $rpm6"
-[ -n "$STAGECOMMON" ] && base="$base shorewall-${1}.tar.*"           && files="$files shorewall-${1}.*           $rpm"
-[ -n "$STAGELITE" ]   && base="$base shorewall-lite-${1}.tar.*"      && files="$files shorewall-lite-${1}.*      $literpm"
-[ -n "$STAGE6LITE" ]  && base="$base shorewall6-lite-${1}.tar.*"     && files="$files shorewall6-lite-${1}.*     $lite6rpm"
-[ -n "$STAGEXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*"  && files="$files shorewall-docs-xml-${1}.*"
-[ -n "$STAGEHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.*"
-
-rpms=`for f in $files; do case $f in *.rpm) echo $f;; *);; esac done`
-
-[ -n "$rpms" ] && rpm --resign $rpms
-
-[ -n "$BASE" ] && $COMMAND $base $DEST/base
-
-$COMMAND -r $files $DEST

tools/build/tagrelease

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-#  Tag a release
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       tagrelease <version>
-#
-[ $# -eq 1 ] || { echo "usage: tagrelease <version>" >&2; exit 1; }
-
-VERSION=$1
-
-case $VERSION in
-    4.0.*)
-	BRANCH=~/shorewall/branches/4.0/
-	;;
-    4.1.*)
-	BRANCH=~/shorewall/trunk/
-	;;
-    *)
-	BRANCH=~/shorewall/3.4/
-	;;
-esac
-
-cd ~/shorewall/tags/
-
-svn mkdir $VERSION
-
-cd $VERSION
-
-for directory in Shorewall-common Shorewall-shell Shorewall-lite Shorewall-perl manpages manpages-lite Samples; do
-    if [ -d $BRANCH/$directory ]; then
-	rm -f $BRANCH/$directory/*~
-	[ -d $BRANCH/$directory/Shorewall ] && rm -f $BRANCH/$directory/Shorewall/*~
-	svn cp $BRANCH/$directory/ .
-    fi
-done
-
-svn commit -m "Tag version $VERSION"
-

tools/build/upload

@@ -1,231 +0,0 @@
-#!/bin/sh
-#
-#  Upload a release to the master server
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       upload [-pclL6sxh] <version>
-#
-
-usage() {
-    echo "Usage: upload [-pclL6sxh] <version>"
-}
-
-rpm=
-rpm6=
-literpm=
-lite6rpm=
-perlrpm=
-shellrpm=
-
-DEST=
-USER="webadmin@mail.shorewall.net"
-SHOREWALL=shorewall
-COMMAND=scp
-
-UPLOADCOMMON=
-UPLOADPERL=
-UPLOADSHELL=
-UPLOADLITE=
-UPLOADXML=
-UPLOADHTML=
-UPLOAD6=
-UPLOAD6LITE=
-PARTIAL=Yes
-BASE=
-
-done=
-
-case $1 in
-    -*)
-	;;
-    *)
-	UPLOADCOMMON=Yes
-	UPLOADPERL=Yes
-	UPLOADSHELL=Yes
-	UPLOADLITE=Yes
-	UPLOADXML=Yes
-	UPLOADHTML=Yes
-
-	case $1 in
-	    4.0.*)
-		;;
-	    *)
-		UPLOAD6=Yes
-		UPLOAD6LITE=Yes
-		;;
-	esac
-
-	PARTIAL=
-	done=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    option=${option#-}
-
-	    [ -z "$option" ] && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    p*)
-			UPLOADPERL=Yes
-			option=${option#p}
-			;;
-		    c*)
-			UPLOADCOMMON=Yes
-			option=${option#c}
-			;;
-		    s*)
-			UPLOADSHELL=Yes
-			option=${option#s}
-			;;
-		    l*)
-			UPLOADLITE=Yes
-			option=${option#l}
-			;;
-		    x*)
-			UPLOADXML=Yes
-			option=${option#x}
-			;;
-		    h*)
-			UPLOADHTML=Yes
-			option=${option#h}
-			;;
-		    6*)
-			UPLOAD6=Yes
-			option=${option#6}
-			;;
-		    L*)
-			UPLOAD6LITE=Yes
-			option=${option#L}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    shift
-	    ;;
-	*)
-	    done=Yes
-	    ;;
-    esac
-done
-
-
-case $1 in
-    4.*Beta*|4.*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1%-*}-0${1#*-}.noarch.rpm
-	rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
-	perlrpm=shorewall-perl-${1%-*}-0${1#*-}.noarch.rpm
-	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
-	BASE=Yes
-	;;
-    4.[02].*.*)
-	BASEVERSION=${1%.*}
-	PATCHNUM=${1##*.}
-	DEST="/srv/ftp/pub/shorewall/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	lite6rpm=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	perlrpm=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	shellrpm=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
-	;;
-    4.[02].*)
-	DEST="/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
-	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    4.3.*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall-common
-	rpm=shorewall-common-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	perlrpm=shorewall-perl-${1}-0base.noarch.rpm
-	shellrpm=shorewall-shell-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    *)
-	echo "Unknown Version $1" >&2
-	exit 1
-	;;
-esac
-
-[ $# -eq 1 ] || { echo "Usage: $(basename $0) <version>"; exit 2; }
-
-if [ -z "$PATCHNUM" -a -d shorewall-common ]; then
-    echo "   ERROR: Paranoid to upload a base release when a patch release has been built in the current directory" >&2
-    exit 1 
-fi
-
-[ -d errata ] || mkdir errata
-
-[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
-
-[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ]  && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
-
-cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
-
-if [ "$HOSTNAME" = lists ]; then
-	mkdir -p $DEST
-	[ -n "$BASE" ] && mkdir $DEST/base
-	COMMAND=cp
-else
-	ssh $USER mkdir -p $DEST
-	[ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
-	DEST=${USER}:${DEST}
-fi
-
-files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
-base=
-
-[ -n "$UPLOAD6" ]      && base="$base shorewall6-${1}.tar.*"          && files="$files shorewall6-${1}.*          $rpm6"
-[ -n "$UPLOADPERL" ]   && base="$base shorewall-perl-${1}.tar.*"      && files="$files shorewall-perl-${1}.*      $perlrpm"
-[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*"    && files="$files shorewall-common-${1}.*    $rpm"
-[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*"     && files="$files shorewall-shell-${1}.*     $shellrpm"
-[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*"      && files="$files shorewall-lite-${1}.*      $literpm"
-[ -n "$UPLOAD6LITE" ]  && base="$base shorewall6-lite-${1}.tar.*"     && files="$files shorewall6-lite-${1}.*     $lite6rpm"
-[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*"  && files="$files shorewall-docs-xml-${1}.*  $literpm"
-[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
-
-[ -n "$BASE" ] && $COMMAND $base $DEST/base
-
-$COMMAND -r $files $DEST

tools/build/upload44

@@ -1,194 +0,0 @@
-#!/bin/sh
-#
-#  Upload a release to the master server
-#
-#  (C) 2007 -- Tom Eastep (teastep@shorewall.net)
-#
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Usage:
-#
-#       upload [-pclL6sxh] <version>
-#
-
-usage() {
-    echo "Usage: upload [-pclL6sxh] <version>"
-}
-
-rpm=
-rpm6=
-literpm=
-lite6rpm=
-perlrpm=
-shellrpm=
-
-DEST=
-USER="webadmin@mail.shorewall.net"
-SHOREWALL=shorewall
-COMMAND=scp
-
-UPLOADCOMMON=
-UPLOADLITE=
-UPLOADXML=
-UPLOADHTML=
-UPLOAD6=
-UPLOAD6LITE=
-PARTIAL=Yes
-BASE=
-
-done=
-
-case $1 in
-    -*)
-	;;
-    *)
-	UPLOADCOMMON=Yes
-	UPLOADPERL=Yes
-	UPLOADSHELL=Yes
-	UPLOADLITE=Yes
-	UPLOADXML=Yes
-	UPLOADHTML=Yes
-	UPLOAD6=Yes
-	UPLOAD6LITE=Yes
-	PARTIAL=
-	done=Yes
-	;;
-esac
-
-while [ -z "$done" ]; do
-    [ $# -eq 0 ] && break
-
-    option=$1
-    case $option in
-	-*)
-	    option=${option#-}
-
-	    [ -z "$option" ] && break
-
-	    while [ -n "$option" ]; do
-		case $option in
-		    c*)
-			UPLOADCOMMON=Yes
-			option=${option#c}
-			;;
-		    l*)
-			UPLOADLITE=Yes
-			option=${option#l}
-			;;
-		    x*)
-			UPLOADXML=Yes
-			option=${option#x}
-			;;
-		    h*)
-			UPLOADHTML=Yes
-			option=${option#h}
-			;;
-		    6*)
-			UPLOAD6=Yes
-			option=${option#6}
-			;;
-		    L*)
-			UPLOAD6LITE=Yes
-			option=${option#L}
-			;;
-	    	    *)
-			usage
-			;;
-		esac
-	    done
-	    shift
-	    ;;
-	*)
-	    done=Yes
-	    ;;
-    esac
-done
-
-
-case $1 in
-    4.*Beta*|4.*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall
-	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
-	rpm6=shorewall6-${1%-*}-0${1#*-}.noarch.rpm
-	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
-	lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
-	BASE=Yes
-	;;
-    4.3.*)
-	DEST="/srv/ftp/pub/shorewall/development/${1%.*}/shorewall-$1"
-	SHOREWALL=shorewall
-	rpm=shorewall-${1}-0base.noarch.rpm
-	literpm=shorewall-lite-${1}-0base.noarch.rpm
-	rpm6=shorewall6-${1}-0base.noarch.rpm
-	lite6rpm=shorewall6-lite-${1}-0base.noarch.rpm
-	BASE=Yes
-	;;
-    *)
-	echo "Unknown Version $1" >&2
-	exit 1
-	;;
-esac
-
-[ $# -eq 1 ] || { echo "Usage: $(basename $0) <version>"; exit 2; }
-
-if [ -z "$PATCHNUM" -a -d shorewall-common ]; then
-    echo "   ERROR: Paranoid to upload a base release when a patch release has been built in the current directory" >&2
-    exit 1 
-fi
-
-[ -d errata ] || mkdir errata
-
-[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
-
-[ -n "$PARTIAL" -a -z "$UPLOADCOMMON" ]  && SHOREWALLDIR=shorewall || SHOREWALLDIR=$SHOREWALL-${1}
-
-cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
-
-if [ "$HOSTNAME" = lists ]; then
-	mkdir -p $DEST
-	[ -n "$BASE" ] && mkdir $DEST/base
-	COMMAND=cp
-else
-	ssh $USER mkdir -p $DEST
-	[ -n "$BASE" ] && ssh $USER mkdir -p $DEST/base
-	DEST=${USER}:${DEST}
-fi
-
-files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
-base=
-
-rm -f *-${1}*.asc
-
-for f in *-${1}.tar.bz2 *-${1}.tgz; do
-    /usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key' $f
-done
-
-[ -n "$UPLOAD6" ]      && base="shorewall6-${1}.tar.*"                && files="$files shorewall6-${1}.*          $rpm6"
-[ -n "$UPLOADCOMMON" ] && base="$base shorewall-${1}.tar.*"           && files="$files shorewall-${1}.*           $rpm"
-[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*"      && files="$files shorewall-lite-${1}.*      $literpm"
-[ -n "$UPLOAD6LITE" ]  && base="$base shorewall6-lite-${1}.tar.*"     && files="$files shorewall6-lite-${1}.*     $lite6rpm"
-[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*"  && files="$files shorewall-docs-xml-${1}.*"
-[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.*"
-
-rpms=`for f in $files; do case $f in *.rpm) echo $f;; *);; esac done`
-
-[ -n "$rpms" ] && rpm --resign $rpms
-
-[ -n "$BASE" ] && $COMMAND $base $DEST/base
-
-$COMMAND -r $files $DEST

tools/subversion/config

@@ -1,184 +0,0 @@
-### This file configures various client-side behaviors.
-###
-### The commented-out examples below are intended to demonstrate
-### how to use this file.
-
-### Section for authentication and authorization customizations.
-# [auth]
-### Set store-passwords to 'no' to avoid storing passwords in the
-### auth/ area of your config directory.  It defaults to 'yes'.
-### Note that this option only prevents saving of *new* passwords;
-### it doesn't invalidate existing passwords.  (To do that, remove
-### the cache files by hand as described in the Subversion book.)
-# store-passwords = no
-### Set store-auth-creds to 'no' to avoid storing any subversion
-### credentials in the auth/ area of your config directory.
-### It defaults to 'yes'.  Note that this option only prevents
-### saving of *new* credentials;  it doesn't invalidate existing
-### caches.  (To do that, remove the cache files by hand.)
-# store-auth-creds = no
-
-### Section for configuring external helper applications.
-### Set editor to the command used to invoke your text editor.
-###   This will override the environment variables that Subversion
-###   examines by default to find this information ($EDITOR,
-###   et al).
-### Set diff-cmd to the absolute path of your 'diff' program.
-###   This will override the compile-time default, which is to use
-###   Subversion's internal diff implementation.
-### Set diff3-cmd to the absolute path of your 'diff3' program.
-###   This will override the compile-time default, which is to use
-###   Subversion's internal diff3 implementation.
-### Set diff3-has-program-arg to 'true' or 'yes' if your 'diff3'
-###   program accepts the '--diff-program' option.
-
-[helpers]
-#editor-cmd = pico # (vi, emacs, notepad, etc.)
-
-#diff-cmd = /usr/bin/diff -bB
-#diff3-cmd = diff3_program (diff3, gdiff3, etc.)
-#diff3-has-program-arg = true 
-
-### Section for configuring tunnel agents.
-# [tunnels]
-### Configure svn protocol tunnel schemes here.  By default, only
-### the 'ssh' scheme is defined.  You can define other schemes to
-### be used with 'svn+scheme://hostname/path' URLs.  A scheme
-### definition is simply a command, optionally prefixed by an
-### environment variable name which can override the command if it
-### is defined.  The command (or environment variable) may contain
-### arguments, using standard shell quoting for arguments with
-### spaces.  The command will be invoked as:
-###   <command> <hostname> svnserve -t
-### (If the URL includes a username, then the hostname will be
-### passed to the tunnel agent as <user>@<hostname>.)  If the
-### built-in ssh scheme were not predefined, it could be defined
-### as:
-# ssh = $SVN_SSH ssh
-### If you wanted to define a new 'rsh' scheme, to be used with
-### 'svn+rsh:' URLs, you could do so as follows:
-# rsh = rsh
-### Or, if you wanted to specify a full path and arguments:
-# rsh = /path/to/rsh -l myusername
-### On Windows, if you are specifying a full path to a command,
-### use a forward slash (/) or a paired backslash (\\) as the
-### path separator.  A single backslash will be treated as an
-### escape for the following character.
-
-### Section for configuring miscelleneous Subversion options.
-[miscellany]
-### Set global-ignores to a set of whitespace-delimited globs
-### which Subversion will ignore in its 'status' output.
-global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store *.bak .depdb .depdblock .filemap .lock .registry .channels .tmp *.webprj *.kdevelop
-### Set log-encoding to the default encoding for log messages
-log-encoding = utf-8
-### Set use-commit-times to make checkout/update/switch/revert
-### put last-committed timestamps on every file touched.
-use-commit-times = yes
-### Set enable-auto-props to 'yes' to enable automatic properties
-### for 'svn add' and 'svn import', it defaults to 'no'.
-### Automatic properties are defined in the section 'auto-props'.
-enable-auto-props = yes
-
-### Section for configuring automatic properties.
-### The format of the entries is:
-###   file-name-pattern = propname[=value][;propname[=value]...]
-### The file-name-pattern can contain wildcards (such as '*' and
-### '?').  All entries which match will be applied to the file.
-### Note that auto-props functionality must be enabled, which
-### is typically done by setting the 'enable-auto-props' option.
-[auto-props]
-
-*.sh = svn:eol-style=native;svn:executable;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-*.php = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/x-php;charset=utf-8
-*.txt = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-*.cgi = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-*.pl = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-
-# Images
-*.gif  = svn:mime-type=image/gif
-*.png  = svn:mime-type=image/png
-*.jpg  = svn:mime-type=image/jpeg
-*.jpeg = svn:mime-type=image/jpeg
-*.ico  = svn:mime-type=image/x-icon
-
-#apache
-.htaccess = svn:eol-style=native;svn:mime-type=text/plain;charset=utf-8;svn:keywords=Id
-htaccess* = svn:eol-style=native;svn:mime-type=text/plain;charset=utf-8;svn:keywords=Id
-
-#python
-
-*.py = svn:eol-style=native;svn:executable;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-
-# Web, XML
-
-*.htm  = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/html;charset=utf-8
-*.html = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/html;charset=utf-8
-*.js   = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/javascript;charset=utf-8
-*.css  = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/css;charset=utf-8
-*.xml  = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/xml;charset=utf-8
-
-#SQL
-*.sql  = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-
-#JAVA 
-
-*.java = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-
-
-
-
-# "Hasefroch" stuff here..
-
-*.doc = svn:mime-type=application/msword
-*.vdx = svn:mime-type=application/vnd.visio.xml
-
-# adobe(tm) stuff here.
-
-*.pdf = svn:mime-type=application/pdf
-
-# other common files
-
-INSTALL* = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-README* = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-BUGS* = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-LICENSE* = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-*.conf = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-*.dist = svn:eol-style=native;svn:keywords=Id;svn:mime-type=text/plain;charset=utf-8
-
-#OpenDocuments..
-
-*.sds = svn:mime-type=application/vnd.stardivision.chart
-*.sdc = svn:mime-type=application/vnd.stardivision.calc
-*.sdw = svn:mime-type=application/vnd.stardivision.writer
-*.sgl = svn:mime-type=application/vnd.stardivision.writer-global
-*.sda = svn:mime-type=application/vnd.stardivision.draw
-*.sdd = svn:mime-type=application/vnd.stardivision.impress
-*.sdf = svn:mime-type=application/vnd.stardivision.math
-*.sxw = svn:mime-type=application/vnd.sun.xml.writer
-*.stw = svn:mime-type=application/vnd.sun.xml.writer.template
-*.sxg = svn:mime-type=application/vnd.sun.xml.writer.global
-*.sxc = svn:mime-type=application/vnd.sun.xml.calc
-*.stc = svn:mime-type=application/vnd.sun.xml.calc.template
-*.sxi = svn:mime-type=application/vnd.sun.xml.impress
-*.sti = svn:mime-type=application/vnd.sun.xml.impress.template
-*.sxd = svn:mime-type=application/vnd.sun.xml.draw
-*.std = svn:mime-type=application/vnd.sun.xml.draw.template
-*.sxm = svn:mime-type=application/vnd.sun.xml.math
-*.odt = svn:mime-type=application/vnd.oasis.opendocument.text
-*.ott = svn:mime-type=application/vnd.oasis.opendocument.text-template
-*.oth = svn:mime-type=application/vnd.oasis.opendocument.text-web
-*.odm = svn:mime-type=application/vnd.oasis.opendocument.text-master
-*.odg = svn:mime-type=application/vnd.oasis.opendocument.graphics
-*.otg = svn:mime-type=application/vnd.oasis.opendocument.graphics-template
-*.odp = svn:mime-type=application/vnd.oasis.opendocument.presentation
-*.otp = svn:mime-type=application/vnd.oasis.opendocument.presentation-template
-*.ods = svn:mime-type=application/vnd.oasis.opendocument.spreadsheet
-*.ots = svn:mime-type=application/vnd.oasis.opendocument.spreadsheet-template
-*.odc = svn:mime-type=application/vnd.oasis.opendocument.chart
-*.odf = svn:mime-type=application/vnd.oasis.opendocument.formula
-*.odb = svn:mime-type=application/vnd.oasis.opendocument.database
-*.odi = svn:mime-type=application/vnd.oasis.opendocument.image
-
-# DIA 
-*.dia = svn:mime-type=application/octet-stream

tools/subversion/servers

@@ -1,78 +0,0 @@
-### This file specifies server-specific protocol parameters,
-### including HTTP proxy information, and HTTP timeout settings.
-###
-### The currently defined server options are:
-###   http-proxy-host            Proxy host for HTTP connection
-###   http-proxy-port            Port number of proxy host service
-###   http-proxy-username        Username for auth to proxy service
-###   http-proxy-password        Password for auth to proxy service
-###   http-proxy-exceptions      List of sites that do not use proxy
-###   http-timeout               Timeout for HTTP requests in seconds
-###   http-compression           Whether to compress HTTP requests
-###   neon-debug-mask            Debug mask for Neon HTTP library
-###   ssl-authority-files        List of files, each of a trusted CAs
-###   ssl-trust-default-ca       Trust the system 'default' CAs
-###   ssl-client-cert-file       PKCS#12 format client certificate file
-###   ssl-client-cert-password   Client Key password, if needed.
-###
-### HTTP timeouts, if given, are specified in seconds.  A timeout
-### of 0, i.e. zero, causes a builtin default to be used.
-###
-### The commented-out examples below are intended only to
-### demonstrate how to use this file; any resemblance to actual
-### servers, living or dead, is entirely coincidental.
-
-### In this section, the URL of the repository you're trying to
-### access is matched against the patterns on the right.  If a
-### match is found, the server info is from the section with the
-### corresponding name.
-
-[groups]
-sourceforge = *.sourceforge.net
-# othergroup = repository.blarggitywhoomph.com
-# thirdgroup = *.example.com
-
-[sourceforge]
-http-compression = no
-
-### Information for the first group:
-# [group1]
-# http-proxy-host = proxy1.some-domain-name.com
-# http-proxy-port = 80
-# http-proxy-username = blah
-# http-proxy-password = doubleblah
-# http-timeout = 60
-# neon-debug-mask = 130
-
-### Information for the second group:
-# [othergroup]
-# http-proxy-host = proxy2.some-domain-name.com
-# http-proxy-port = 9000
-# No username and password, so use the defaults below.
-
-### You can set default parameters in the 'global' section.
-### These parameters apply if no corresponding parameter is set in
-### a specifically matched group as shown above.  Thus, if you go
-### through the same proxy server to reach every site on the
-### Internet, you probably just want to put that server's
-### information in the 'global' section and not bother with
-### 'groups' or any other sections.
-###
-### If you go through a proxy for all but a few sites, you can
-### list those exceptions under 'http-proxy-exceptions'.  This only
-### overrides defaults, not explicitly matched server names.
-###
-### 'ssl-authority-files' is a semicolon-delimited list of files,
-### each pointing to a PEM-encoded Certificate Authority (CA) 
-### SSL certificate.  See details above for overriding security 
-### due to SSL.
-[global]
-# http-proxy-exceptions = *.exception.com, www.internal-site.org
-# http-proxy-host = defaultproxy.whatever.com
-# http-proxy-port = 7000
-# http-proxy-username = defaultusername
-# http-proxy-password = defaultpassword
-http-compression = yes
-# No http-timeout, so just use the builtin default.
-# No neon-debug-mask, so neon debugging is disabled.
-# ssl-authority-files = /path/to/CAcert.pem;/path/to/CAcert2.pem

tools/testing/accepttest

@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-#     Clear an exception on one or more regression tests  -- (C) 2007, Tom Eastep (teastep@shorewall.net)
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#
-
-for directory in $*; do
-    if [ -d $directory ]; then
-	cp -f $directory/firewall $directory/firewall.last && echo "Test $directory ACCEPTED"
-    else
-	echo "   WARNING: No directory named $directory" >&2
-    fi
-done
-	
-
-  

tools/testing/regression

@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-#     Shorewall Compiler Positive Regression test driver -- (C) 2007, Tom Eastep (teastep@shorewall.net)
-#
-#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
-#
-#	This program is free software; you can redistribute it and/or modify
-#	it under the terms of Version 2 of the GNU General Public License
-#	as published by the Free Software Foundation.
-#
-#	This program is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#	GNU General Public License for more details.
-#
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-#
-
-case $(/sbin/shorewall version) in
-    4.0.*)
-	OPTIONS=vvv
-	;;
-    *)
-	OPTIONS=v2
-	;;
-esac
-
-DIRECTORIES="$*"
-
-[ -n "${DIRECTORIES:=*}" ]
-
-for directory in $DIRECTORIES; do
-    if [ -d $directory ]; then
-	existing=$(ls -l $directory/firewall 2> /dev/null);
-	if /sbin/shorewall -${OPTIONS} compile -t $directory $directory/firewall > $directory/compileroutput 2> $directory/compilererrors; then
-	    if [ "$existing" = "$(ls -l $directory/firewall)" ]; then
-		echo "Test $directory FAILED ******** No object produced"
-	    elif [ -f $directory/firewall.last ]; then
-		if diff -au $directory/firewall.last $directory/firewall > $directory/compare; then
-		    echo "Test $directory PASSED"
-		else
-		    echo "Test $directory FAILED ********* Failure data is in $directory/compare"
-		fi
-	    else
-		cp $directory/firewall $directory/firewall.last
-		echo "Test $directory INITIAL RUN"
-	    fi
-	else
-	    echo "Test $directory FAILED ********* Failure data is in $directory/compilererrors"
-	    rm -f $directory/faildata
-	fi
-    fi
-done
-
-
-  

tools/web/cronpublish.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/srv/www/html
-PROJECTS="web docs docs-fr"
-HOMEDIR=/home/judas_iscariote
-SVN_BIN=/usr/bin/svn
-
-publish() {
-    case $1 in
-	*.xml)
-	    b=${1%.*}
-
-	    if [ -f $WEBSITE/$b.htm ]; then
-		b=$b.htm
-		f="$WEBSITE/$b"
-	    else
-		b=$b.html
-		f="$WEBSITE/$b"
-	    fi
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    xmllint --valid --noout $1 && xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1
-	    chmod g+w $f
-	    ;;
-	*)
-	    cp $1 $WEBSITE/$1
-	    chmod g+w $WEBSITE/$1
-	    ;;
-    esac
-
-}
-
-for project in $PROJECTS; do
-    cd $HOMEDIR/$project
-    $SVN_BIN  update --non-interactive | while read UA file; do 
-	case $UA in
-	    U|P|G)
-		publish $file
-		;;
-	    A)
-		[ -d $file ] && mkdir $WEBSITE/$file || publish $file
-		;;
-	esac
-    done
-done

tools/web/publish

@@ -1,143 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-HTMFILES="
-    6to4.htm
-    blacklisting_support.htm
-    configuration_file_basics.htm
-    CorpNetwork.htm
-    dhcp.htm
-    Documentation.htm
-    errata.htm
-    fallback.htm
-    FAQ.htm
-    GnuCopyright.htm
-    Install.htm
-    IPIP.htm
-    IPSEC.htm
-    kernel.htm
-    myfiles.htm
-    NAT.htm
-    ports.htm
-    PPTP.htm
-    ProxyARP.htm
-    quotes.htm
-    samba.htm
-    shorewall_extension_scripts.htm
-    shorewall_features.htm
-    shorewall_mirrors.htm
-    shorewall_prerequisites.htm
-    shorewall_quickstart_guide.htm
-    shorewall_setup_guide_fr.htm
-    shorewall_setup_guide.htm
-    Shorewall_sfindex_frame.htm
-    standalone.htm
-    starting_and_stopping_shorewall.htm
-    support.htm
-    three-interface.htm
-    traffic_shaping.htm
-    troubleshoot.htm
-    two-interface.htm
-    upgrade_issues.htm
-    VPN.htm
-    whitelisting_under_shorewall.htm"
-#
-# Suppress the table of contents in these short articles
-#
-NOTOC="
-    Documentation_Index.xml
-    ECN.xml
-    fallback.xml
-    GettingStarted.xml
-    IPP2P.xml
-    ping.xml
-    ProxyARP.xml
-    Shorewall_Doesnt.xml
-    shorewall_features.xml
-    shorewall_prerequisites.xml
-    SimpleBridge.xml"
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}
-            #
-	    # The original HTML documents were created using MS FrontPage and
-	    # used the .htm suffix. The remainder use the .html suffix.
-	    #
-	    if list_search $b.htm $HTMFILES ; then
-		b=$b.htm
-		f="$WEBSITE/$b"
-	    else
-		b=$b.html
-		f="$WEBSITE/$b"
-	    fi
-
-	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
-
-	    case $1 in
-		*_ru.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
-		    ;;
-		*_fr.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
-		    ;;
-		*)
-		    LANGUAGE=
-		    ;;
-	    esac
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xmllint --valid --noout $1 && xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC $LANGUAGE --param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-3.0

@@ -1,143 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-HTMFILES="
-    6to4.htm
-    blacklisting_support.htm
-    configuration_file_basics.htm
-    CorpNetwork.htm
-    dhcp.htm
-    Documentation.htm
-    errata.htm
-    fallback.htm
-    FAQ.htm
-    GnuCopyright.htm
-    Install.htm
-    IPIP.htm
-    IPSEC.htm
-    kernel.htm
-    myfiles.htm
-    NAT.htm
-    ports.htm
-    PPTP.htm
-    ProxyARP.htm
-    quotes.htm
-    samba.htm
-    shorewall_extension_scripts.htm
-    shorewall_features.htm
-    shorewall_mirrors.htm
-    shorewall_prerequisites.htm
-    shorewall_quickstart_guide.htm
-    shorewall_setup_guide_fr.htm
-    shorewall_setup_guide.htm
-    Shorewall_sfindex_frame.htm
-    standalone.htm
-    starting_and_stopping_shorewall.htm
-    support.htm
-    three-interface.htm
-    traffic_shaping.htm
-    troubleshoot.htm
-    two-interface.htm
-    upgrade_issues.htm
-    VPN.htm
-    whitelisting_under_shorewall.htm"
-#
-# Suppress the table of contents in these short articles
-#
-NOTOC="
-    Documentation_Index.xml
-    ECN.xml
-    fallback.xml
-    GettingStarted.xml
-    IPP2P.xml
-    ping.xml
-    ProxyARP.xml
-    Shorewall_Doesnt.xml
-    shorewall_features.xml
-    shorewall_prerequisites.xml
-    SimpleBridge.xml"
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}
-            #
-	    # The original HTML documents were created using MS FrontPage and
-	    # used the .htm suffix. The remainder use the .html suffix.
-	    #
-	    if list_search $b.htm $HTMFILES ; then
-		b=$b.htm
-		f="$WEBSITE/$b"
-	    else
-		b=$b.html
-		f="$WEBSITE/$b"
-	    fi
-
-	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
-
-	    case $1 in
-		*_ru.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
-		    ;;
-		*_fr.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
-		    ;;
-		*)
-		    LANGUAGE=
-		    ;;
-	    esac
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xmllint --valid --noout $1 && xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC --param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/3.0
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-4.4

@@ -1,143 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-HTMFILES="
-    6to4.htm
-    blacklisting_support.htm
-    configuration_file_basics.htm
-    CorpNetwork.htm
-    dhcp.htm
-    Documentation.htm
-    errata.htm
-    fallback.htm
-    FAQ.htm
-    GnuCopyright.htm
-    Install.htm
-    IPIP.htm
-    IPSEC.htm
-    kernel.htm
-    myfiles.htm
-    NAT.htm
-    ports.htm
-    PPTP.htm
-    ProxyARP.htm
-    quotes.htm
-    samba.htm
-    shorewall_extension_scripts.htm
-    shorewall_features.htm
-    shorewall_mirrors.htm
-    shorewall_prerequisites.htm
-    shorewall_quickstart_guide.htm
-    shorewall_setup_guide_fr.htm
-    shorewall_setup_guide.htm
-    Shorewall_sfindex_frame.htm
-    standalone.htm
-    starting_and_stopping_shorewall.htm
-    support.htm
-    three-interface.htm
-    traffic_shaping.htm
-    troubleshoot.htm
-    two-interface.htm
-    upgrade_issues.htm
-    VPN.htm
-    whitelisting_under_shorewall.htm"
-#
-# Suppress the table of contents in these short articles
-#
-NOTOC="
-    Documentation_Index.xml
-    ECN.xml
-    fallback.xml
-    GettingStarted.xml
-    IPP2P.xml
-    ping.xml
-    ProxyARP.xml
-    Shorewall_Doesnt.xml
-    shorewall_features.xml
-    shorewall_prerequisites.xml
-    SimpleBridge.xml"
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}
-            #
-	    # The original HTML documents were created using MS FrontPage and
-	    # used the .htm suffix. The remainder use the .html suffix.
-	    #
-	    if list_search $b.htm $HTMFILES ; then
-		b=$b.htm
-		f="$WEBSITE/$b"
-	    else
-		b=$b.html
-		f="$WEBSITE/$b"
-	    fi
-
-	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
-
-	    case $1 in
-		*_ru.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
-		    ;;
-		*_fr.xml)
-		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
-		    ;;
-		*)
-		    LANGUAGE=
-		    ;;
-	    esac
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xmllint --valid --noout $1 && xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC $LANGUAGE --param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/4.4
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-image

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#	scp $@ teastep@shorewall.sourceforge.net:/home/groups/s/sh/shorewall/htdocs/images
-	scp -p  $@ webadmin@mail.shorewall.net:/srv/www/html/images
-#	cp  -pf $@ /home/teastep/Shorewall-docs
-
-

tools/web/publish-image-3.0

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#	scp $@ teastep@shorewall.sourceforge.net:/home/groups/s/sh/shorewall/htdocs/images
-	scp -p  $@ webadmin@mail:/srv/www/html/3.0/images
-#	cp  -pf $@ /home/teastep/Shorewall-docs
-
-

tools/web/publish-image-4.4

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-#	scp $@ teastep@shorewall.sourceforge.net:/home/groups/s/sh/shorewall/htdocs/images
-	scp -p  $@ webadmin@mail.shorewall.net:/srv/www/html/4.4/images
-#	cp  -pf $@ /home/teastep/Shorewall-docs
-
-

tools/web/publish-manpage

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/manpages/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-manpage-3.0

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/3.0/manpages/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-manpage-4.0

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/4.0/manpages/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-manpage-4.4

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/4.4/manpages/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-manpage6

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/manpages6/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

tools/web/publish-manpage6-4.4

@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#STYLESHEET=/home/teastep/Shorewall/docbook-xsl-1.62.4//xhtml/docbook.xsl
-STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
-WEBSITE=/home/teastep/Shorewall/Website
-
-list_search() # $1 = element to search for , $2-$n = list
-{
-    local e
-    e=$1
-
-    while [ $# -gt 1 ]; do
-	shift
-	[ "x$e" = "x$1" ] && return 0
-    done
-
-    return 1
-}
-
-if [ $# -eq 0 ]; then
-    echo "Usage: $(basename $0) <XML file> ..."
-    exit 2
-fi
-
-while [ $# -gt 0 ]; do
-
-    case $1 in
-	*.xml)
-	    b=${1%.*}.html
-
-	    f="$WEBSITE/$b"
-
-	    echo "Converting $1 from XML to HTML ($b) ..."
-
-	    if xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $1 ; then
-		filestocopy="$filestocopy $f"
-	    fi
-	    ;;
-
-	*)
-	    filestocopy="$filestocopy $1"
-	    ;;
-    esac
-
-    shift
-
-done
-
-DESTS="
-webadmin@mail.shorewall.net:/srv/www/html/4.4/manpages6/
-"
-
-if [ -n "$filestocopy" ]; then
-    for f in $filestocopy; do
-	filestoreport="$filestoreport $(basename $f)"
-    done
-
-    chmod 664 $filestocopy
-    for d in $DESTS; do
-	echo "$filestoreport -> $d"
-	scp -qp $filestocopy $d
-    done
-fi
-
-

web/Banner.html

@@ -1,65 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <title>Banner</title>
-  <meta name="author" content="Tom Eastep">
-  <base target="_top">
-</head>
-<body>
-<table id="AutoNumber3"
- style="border-collapse: collapse; background-color: rgb(255, 255, 255); width: 100%; height: 90px;"
- cellpadding="0">
-  <tbody>
-    <tr>
-      <td style="text-align: left; width: 34%; vertical-align: top;">
-      <div style="text-align: center;"> </div>
-      <div
- style="background-color: rgb(255, 255, 255); text-align: center;"> <img
- src="images/gareth-davies-logo3.png" alt="(Shorewall Logo)"
- style="width: 430px; height: 90px;" align="middle"> </div>
-      </td>
-      <td style="text-align: right; vertical-align: bottom;"> <br>
-      <table
- style="background-color: rgb(255, 255, 255); text-align: left; margin-left: auto; margin-right: 0px;"
- border="0" cellspacing="0">
-        <tbody>
-          <tr>
-            <td style="text-align: center;">
-            <form method="get" action="http://www.google.com/search"> <input
- name="ie" value="UTF-8" type="hidden"> <input name="oe" value="UTF-8"
- type="hidden"> <input name="as_sitesearch" value="www.shorewall.net"
- type="hidden">
-              <table style="background-color: rgb(255, 255, 255);"
- border="0" cellspacing="0">
-                <tbody>
-                  <tr>
-                    <td style="text-align: center;">&nbsp;<input
- name="q" size="25" maxlength="255" value="" type="text"> <input
- name="btnG" value="Site Search" type="submit"></td>
-                  </tr>
-                  <tr style="">
-                    <td style="background-color: rgb(255, 255, 255);"
- bgcolor="#3366ff">
-                    <p style="text-align: center; font-weight: bold;"><br>
-                    <a
- href="http://dir.gmane.org/gmane.comp.security.shorewall">Mailing
-List Archive Search</a></p>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </form>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>

web/Documentation.html

@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <title>Shorewall Documentation</title>
-</head>
-<body>
-<h1 style="text-align: left;">Shorewall Documentation</h1>
-<span style="font-weight: bold;"></span>
-<span style="font-weight: bold;"></span>Copyright © 2005-2009 Thomas M.
-Eastep<br>
-<p>Permission is granted to copy, distribute and/or modify this
-document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any
-later version published by the Free Software 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 “<span class="quote"><a
- href="GnuCopyright.htm" target="_self">GNU Free Documentation
-License</a></span>”.<br>
-</p>
-<p>2009-08-22<br>
-</p>
-<hr style="width: 100%; height: 2px;"> <strong></strong>
-<br>
-<table style="text-align: left; width: 100%;" border="0" cellpadding="2"
- cellspacing="0">
-  <tbody>
-    <tr style="font-weight: bold;">
-      <td style="vertical-align: top; text-align: center;">Shorewall
-4.4<br>
-(Stable)<br>
-      </td>
-      <th style="vertical-align: top; text-align: center;">Shorewall
-4.2<br>
-(Previous Stable)<br>
-      </th>
-      <th style="vertical-align: top; text-align: center;">Shorewall
-4.0<br>
-(Debian Lenny)<br>
-Note: 1<br>
-      </th>
-      <th style="vertical-align: top; text-align: center;">Shorewall
-3.x<br>
-(Obsolete)<br>
-      </th>
-      <th style="vertical-align: top; text-align: left;">Description<br>
-      </th>
-    </tr>
-    <tr>
-      <td style="vertical-align: top; text-align: center;"><a
- style="font-weight: bold;" href="4.4/Documentation_Index.html">Index</a></td>
-      <td style="vertical-align: top; text-align: center;"><span
- style="font-weight: bold;"></span><strong><a
- href="Documentation_Index.html"><strong>Index</strong></a></strong></td>
-      <td style="vertical-align: top; text-align: center;"><strong><a
- href="Documentation_Index.html"><strong>Index</strong></a></strong></td>
-      <td style="vertical-align: top; text-align: center;"><a
- style="font-weight: bold;" href="3.0/Documentation_Index.html">Index</a></td>
-      <td style="vertical-align: top;">Alphabetical index to over 70
-articles with
-topics ranging from Accounting to Xen</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top; text-align: center;"><strong></strong><strong><strong><a
- href="4.4/FAQ.htm"><strong>FAQs</strong></a></strong></strong></td>
-      <td
- style="vertical-align: top; text-align: center; font-weight: bold;"><a
- href="3.0/FAQ.htm"><strong></strong></a><strong><a href="FAQ.htm"><strong>FAQs</strong></a></strong></td>
-      <td style="vertical-align: top; text-align: center;"><a
- href="FAQ.htm"><strong>FAQs</strong></a> </td>
-      <td
- style="vertical-align: top; text-align: center; font-weight: bold;"><a
- href="3.0/FAQ.htm">FAQs</a> </td>
-      <td style="vertical-align: top;">Answers to the most commonly
-asked
-questions</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top; text-align: center;"><strong><strong></strong></strong><strong><strong><strong><a
- href="4.4/Manpages.html"><strong>IPv4 Manpages</strong></a></strong></strong></strong></td>
-      <td style="vertical-align: top; text-align: center;"><a
- href="3.0/manpages/Manpages.html"><span style="font-weight: bold;"></span></a><strong></strong><strong><strong><a
- href="Manpages.html"><strong>IPv4 Manpages</strong></a></strong></strong>
-      </td>
-      <td
- style="vertical-align: top; text-align: center; font-weight: bold;"><a
- href="../../../../../4.0/Manpages.html">Manpages</a></td>
-      <td style="vertical-align: top; text-align: center;"><a
- href="3.0/manpages/Manpages.html"><span style="font-weight: bold;">Manpages</span></a></td>
-      <td style="vertical-align: top;">Online version of the Shorewall
-and Shorewall-lite man pages</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top; text-align: center;"> <a
- href="4.4/Manpages6.html"><span style="font-weight: bold;">IPv6
-Manpages</span></a></td>
-      <td style="vertical-align: top; text-align: center;"><a
- href="Manpages6.html"><span style="font-weight: bold;">IPv6 Manpages</span></a>
-      </td>
-      <td style="vertical-align: top; text-align: center;">-<br>
-      </td>
-      <td style="vertical-align: top; text-align: center;">-<span
- style="font-weight: bold;"><br>
-      </span></td>
-      <td style="vertical-align: top;">Online version of the Shorewall6
-and Shorewall6-lite man pages<br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<br>
-<span style="font-weight: bold;">Note 1</span>: Shorewall 4.2 packages
-for Lenny are available from <a
- href="http://people.connexer.com/%7Eroberto/debian/">Roberto Sanchez's
-repository</a>. Roberto is the Debian Shorewall maintainer.<br>
-<br>
-<a href="3.0/manpages/Manpages.html"><span style="font-weight: bold;"></span></a><br>
-<a href="Documentation_Index.html"><strong></strong></a>
-<ul>
-</ul>
-</body>
-</html>

web/Manpages.html

@@ -1,74 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Shorewall 3.4 Manpages</title>
-</head>
-<body>
-<h1 style="text-align: left;">Shorewall 3.4 Manpages<br>
-</h1>
-<span style="font-weight: bold;">Tom Eastep<br>
-<br>
-</span>Copyright © 2006-2007 Thomas M. Eastep<br>
-<p>Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version
-1.2 or any later version published by the Free Software 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 “<span
- class="quote"><a href="GnuCopyright.htm" target="_self">GNU Free
-Documentation License</a></span>”.<br>
-</p>
-<p>2007-01-18<br>
-</p>
-<hr style="width: 100%; height: 2px;"> <span style="font-weight: bold;">Warning:
-</span>These manpages are for Shorewall 3.4.0 only. They describe
-features and options not available on earlier releases.<br>
-<br>
-<span style="font-weight: bold;">Note:</span> The docbook to manpage
-translation tool that we are using has some indentation issues which
-require us to choose between correct output of the <span
- style="font-weight: bold;">man</span> command and correctly-indented
-HTML. We've chosen in favor of the <span style="font-weight: bold;">man</span>
-command so some of the manpages accessed through the links below have
-indentation problems. We're working to resolve these issues and ask for
-your patience.<br>
-<h2>Section 5 - Files and Concepts<br>
-</h2>
-<div style="margin-left: 40px;"><a href="shorewall-accounting.html">accounting</a><br>
-<a href="shorewall-actions.html">actions</a><br>
-<a href="shorewall-blacklist.html">blacklist</a><br>
-<a href="shorewall-ecn.html">ecn</a><br>
-<a href="shorewall-exclusion.html">exclusion</a><br>
-<a href="shorewall-hosts.html">hosts</a><br>
-<a href="shorewall-interfaces.html">interfaces</a><br>
-<a href="shorewall-maclist.html">maclist</a><br>
-<a href="shorewall-masq.html">masq</a><br>
-<a href="shorewall-nat.html">nat</a><br>
-<a href="shorewall-nesting.html">nesting</a><br>
-<a href="shorewall-netmap.html">netmap</a><br>
-<a href="shorewall-params.html">params</a><br>
-<a href="shorewall-policy.html">policy</a><br>
-<a href="shorewall-providers.html">providers</a><br>
-<a href="shorewall-proxyarp.html">proxyarp</a><br>
-<a href="shorewall-rfc1918.html">rfc1918</a><br>
-<a href="shorewall-route_rules.html">route_rules</a><br>
-<a href="shorewall-routestopped.html">routestopped</a><br>
-<a href="shorewall-rules.html">rules</a><br>
-<a href="shorewall-tcclasses.html">tcclasses</a><br>
-<a href="shorewall-tcdevices.html">tcdevices</a><br>
-<a href="shorewall-tcrules.html">tcrules</a><br>
-<a href="shorewall-tos.html">tos</a><br>
-<a href="shorewall-tunnels.html">tunnels</a><br>
-<a href="shorewall.conf.html">shorewall.conf</a><br>
-<a href="shorewall-lite.conf.html">shorewall-lite.conf</a><br>
-<a href="shorewall-zones.html">zones</a><br>
-</div>
-<h2>Section 8 - Administrative Commands<br>
-</h2>
-<div style="margin-left: 40px;"><a href="shorewall.html">shorewall</a><br>
-<a href="shorewall-lite.html">shorewall-lite</a><br>
-</div>
-</body>
-</html>

web/Manpages6.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Shorewall 4.3 IPv6 Manpages</title>
-</head>
-<body>
-<h1 style="text-align: left;">Shorewall6 4.3 Manpages<br>
-</h1>
-<span style="font-weight: bold;">Tom Eastep<br>
-<br>
-</span>Copyright © 2008 Thomas M. Eastep<br>
-<p>Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License, Version
-1.2 or any later version published by the Free Software 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 “<span
- class="quote"><a href="GnuCopyright.htm" target="_self">GNU Free
-Documentation License</a></span>”.<br>
-</p>
-<p>2008-12-16<br>
-</p>
-<hr style="width: 100%; height: 2px;"> <span style="font-weight: bold;">Warning:
-</span>These manpages are for Shorewall 3.4.0 only. They describe
-features and options not available on earlier releases.<br>
-<br>
-<span style="font-weight: bold;">Note:</span> The docbook to manpage
-translation tool that we are using has some indentation issues which
-require us to choose between correct output of the <span
- style="font-weight: bold;">man</span> command and correctly-indented
-HTML. We've chosen in favor of the <span style="font-weight: bold;">man</span>
-command so some of the manpages accessed through the links below have
-indentation problems. We're working to resolve these issues and ask for
-your patience.<br>
-<h2>Section 5 - Files and Concepts<br>
-</h2>
-<div style="margin-left: 40px;"><a href="shorewall6-accounting.html">accounting</a><br>
-<a href="shorewall6-actions.html">actions</a><br>
-<a href="shorewall6-blacklist.html">blacklist</a><br>
-<a href="shorewall6-exclusion.html">exclusion</a><br>
-<a href="shorewall6-hosts.html">hosts</a><br>
-<a href="shorewall6-interfaces.html">interfaces</a><br>
-<a href="shorewall6-maclist.html">maclist</a><a
- href="shorewall6-masq.html"></a><br>
-<a href="shorewall6-nesting.html">nesting</a><br>
-<a href="shorewall6-params.html">params</a><br>
-<a href="shorewall6-policy.html">policy</a><br>
-<a href="shorewall6-providers.html">providers</a><br>
-<a href="shorewall6-route_rules.html">route_rules</a><br>
-<a href="shorewall6-routestopped.html">routestopped</a><br>
-<a href="shorewall6-rules.html">rules</a><br>
-<a href="shorewall6-tcclasses.html">tcclasses</a><br>
-<a href="shorewall6-tcdevices.html">tcdevices</a><br>
-<a href="shorewall6-tcrules.html">tcrules</a><br>
-<a href="shorewall6-tos.html">tos</a><br>
-<a href="shorewall6-tunnels.html">tunnels</a><br>
-<a href="shorewall6.conf.html">shorewall6.conf</a><br>
-<a href="shorewall6-lite.conf.html">shorewall6-lite.conf</a><br>
-<a href="shorewall6-zones.html">zones</a><br>
-</div>
-<h2>Section 8 - Administrative Commands<br>
-</h2>
-<div style="margin-left: 40px;"><a href="shorewall6.html">shorewall6</a><br>
-<a href="shorewall6-lite.html">shorewall6-lite</a><br>
-</div>
-</body>
-</html>

web/Notices.html

@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
-  <title>Shorewall Notices</title>
-  <base target="_self">
-  <meta name="CREATED" content="20040920;15031500">
-  <meta name="CHANGED" content="$Id$">
-</head>
-<body dir="ltr" lang="en-US">
-<hr style="width: 100%; height: 2px;">
-<table style="text-align: left; width: 100%;" border="0" cellpadding="2"
- cellspacing="0">
-  <tbody>
-    <tr style="font-weight: bold;">
-      <td style="vertical-align: top;"><a href="#Shell-EOL">Attention
-Shorwall-shell Users</a><br>
-      </td>
-      <td style="vertical-align: top;"><a href="#Perl">Attention
-Shorewall-perl 4.2 Users</a><br>
-      </td>
-      <td style="vertical-align: top;"><a href="#Notice">Attention
-Users of Shorewall's Multi-ISP Feature</a><br>
-      </td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top; font-weight: bold;"><a
- href="Notices.html#Notice1">Attention Users of BRIDGING=Yes</a></td>
-      <td style="vertical-align: top; font-weight: bold;"><a
- href="Notices.html#Kernel2.4">Attention Kernel 2.4 Users</a></td>
-      <td style="vertical-align: top;"><br>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<hr><span style="font-weight: bold;">2009-08-03<br>
-</span>
-<h2><a name="Shell-EOL"></a>End-of-life for Shorewall-shell in
-Shorewall 4.4<br>
-</h2>
-The Shorewall 4.4 release in the fall of 2009 will not include
-Shorewall-shell. Because Shorewall 4.0 is included in Debian Lenny, the
-4.0 release of Shorewall-shell will continue to be supported until
-Debian Squeeze is released. The 4.2 release of Shorewall-shell will
-continue to be supported until Shorewall 4.6 is released in 2010.<br>
-<br>
-Shorewall-shell users are encouraged to<a href="Shorewall-perl.html">
-migrate to Shorewall-perl</a> at the earliest opportunity. Users who
-run Shorewall-shell on an embedded system that is too small to support
-Perl should consider switching to <a href="CompiledPrograms.html#Lite">Shorewall-lite</a>
-with Shorewall-perl installed on an administrative system (may be a
-Windows[tm] system running <a href="http://www.cygwin.com">Cygwin</a>[tm]).<br>
-<h2><span style="font-weight: bold;"><a name="Perl"></a>Attention
-Shorewall-perl 4.2 Users</span></h2>
-<h3>Shorewall-perl 4.2.8</h3>
-Shorewall-perl 4.2.8 was dead on arrival. The compiler did not rename
-the generated script file with the result that it was removed when the
-compiler terminated. This lead to:<br>
-<ol>
-  <li>It was not possible to start Shorewall or Shorewall6 for the
-first time after installing 4.2.8</li>
-  <li>Changes to the configuration were apparently ignored.</li>
-</ol>
-This problem was corrected in Shorewall-perl-4.2.8.1.<br>
-<h3>Shorewall-perl 4.2.6 and Earlier<br>
-</h3>
-On February 28, Klemens Rutz reported a problem that affects all<span
- style="font-family: monospace;"><span style="font-family: sans-serif;">
-</span></span>Shorewall-perl 4.2 versions prior to 4.2.6.1.<br>
-<span style="font-family: monospace;"><br>
-</span>The problem:<br>
-<ol>
-  <li>Only occurs when there are multiple non-firewall zones.</li>
-  <li>Results in the following interface options not being applied to
-forwarded traffic.</li>
-</ol>
-<div style="margin-left: 40px;">blacklist<br>
-dhcp<br>
-maclist (when MACLIST_TABLE=filter)<br>
-norfc1918<br>
-nosmurfs<br>
-tcpflags<br>
-</div>
-<br>
-User are encouraged to either:<br>
-<ul>
-  <li>Upgrade to Shorewall-perl-4.2.6.1 or later; or</li>
-  <li>Apply the patch found at:</li>
-</ul>
-<div style="margin-left: 40px;"><a class="moz-txt-link-freetext"
- href="http://www.shorewall.net/pub/shorewall/4.2/forward.patch">http://www.shorewall.net/pub/shorewall/4.2/forward.patch</a><br>
-<a class="moz-txt-link-freetext"
- href="ftp://ftp.shorewall.net/pub/shorewall/4.2/forward.patch">ftp://ftp.shorewall.net/pub/shorewall/4.2/forward.patch</a></div>
-<br>
-<div style="margin-left: 40px;">To apply the patch, execute this
-command:<br>
-</div>
-<div style="margin-left: 80px;">
-<pre> patch /usr/share/shorewall-perl/Shorewall/Rules.pm &lt; forward.patch</pre>
-</div>
-<div style="margin-left: 40px;">The patch may apply with fuzz and/or an
-offset, depending on your particular version.</div>
-<h2><a name="Notice">Attention Users of Shorewall's Multi-ISP
-Feature</a></h2>
-<p>A bug in Shorewall versions 3.2.0-3.2.10, 3.4.0-3.4.6 and
-Shorewall-shell
-4.0.0-4.0.2 prevents proper handling of PREROUTING marks when
-HIGH_ROUTE_MARKS=No and the <strong>track</strong> option is
-specified.
-Patches are available to correct this problem:</p>
-<p>Shorewall version 3.2.0-3.2.10, 3.4.0-3.4.3: <a
- href="http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.10/errata/patches/Shorewall/patch-3.2.10-2.diff">http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.10/errata/patches/Shorewall/patch-3.2.10-2.diff</a></p>
-<p>Shorewall version 3.4.4-3.4.6: <a
- href="http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.6/errata/patches/Shorewall/patch-3.4.6-1.diff">http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.66/errata/patches/Shorewall/patch-3.4.6-1.diff</a></p>
-<p>Shorewall-shell version 4.0.0-4.0.2: <a
- href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff">http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff</a></p>
-<p>Note that a patch may succeed with an offset when applied to a
-release
-other than the one for which it was specifically prepared. For example,
-when
-the patch for 3.2.0-3.2.10, 3.4.0-3.4.3 (which was prepared for release
-3.2.10) is applied to release 3.4.3, the following is the result:</p>
-<pre>root@wookie:~# <strong>cd /usr/share/shorewall</strong>
-root@wookie/usr/share/shorewall#: <strong>patch &lt; ~/shorewall/tags/3.2.10/Shorewall.updated/patch-3.2.10-2.diff</strong> <br>patching file compiler<br>Hunk #1 succeeded at 958 (offset -1669 lines).<br>root@wookie:/usr/share/shorewall#</pre>
-<h3>Update -- 7 November 2007</h3>
-<p>A second bug in Shorewall versions 3.2.0-3.2.11, 3.4.0-3.4.7 and
-4.0.0-4.0.5 can cause improper handing of PREROUTING and OUTPUT marks
-when
-HIGH_ROUTE_MARKS=Yes. Patches are also available to correct this
-problem:</p>
-<p>Shorewall version 3.2.3-3.2.11: <a
- href="http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.11/errata/patches/Shorewall/patch-3.2.11-1.diff">http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.11/errata/patches/Shorewall/patch-3.2.11-1.diff</a></p>
-<p>Shorewall version 3.4.0-3.4.7: <a
- href="http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.7/errata/patches/Shorewall/patch-3.4.7-1.diff">http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.7/errata/patches/Shorewall/patch-3.4.7-1.diff</a></p>
-<p>Shorewall version 4.0.0-4.0.5: <a
- href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.5/errata/patches/Shorewall-shell/patch-shell-4.0.5-1.diff">http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.5/errata/patches/Shorewall-shell/patch-shell-4.0.5-1.diff</a>
-and <a
- href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.5/errata/patches/Shorewall-perl/patch-perl-4.0.5-4.diff">http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.5/errata/patches/Shorewall-perl/patch-perl-4.0.5-4.diff</a>.</p>
-<hr>
-<h2><a name="Notice1">Attention Users of BRIDGING=Yes</a></h2>
-<p>In Linux Kernel version 2.6.20, the Netfilter team changed Physdev
-Match
-so that it is no longer capable of supporting BRIDGING=Yes. The
-solutions
-available to users are to either:</p>
-<ol>
-  <li>Switch to using the technique described at <a
- href="http://www.shorewall.net/3.0/NewBridge.html">http://www.shorewall.net/3.0/NewBridge.html</a>;
-or<br>
-  </li>
-  <li>Upgrade to Shorewall 4.0, migrate to using Shorewall-perl, and
-follow the instructions at <a
- href="http://www1.shorewall.net/bridge-Shorewall-perl.html">http://www1.shorewall.net/bridge-Shorewall-perl.html.</a>
-  </li>
-</ol>
-<p>The first approach allows you to switch back and forth between
-kernels
-older and newer than 2.6.20. The second approach is a better long-term
-solution.</p>
-<hr style="width: 100%; height: 2px;">
-<h2><a name="Kernel2.4"></a>Attention Users of Kernel 2.4</h2>
-The Shorewall developers do not test Shorewall running on Kernel 2.4
-and we make no representation about the functionality of Shorewall on
-that Kernel. Any failure of Shorewall on Kernel 2.4 will not be
-investigated by the Shorewall team.<br>
-<hr>
-Copyright © 2001-2009 Thomas M. Eastep<br>
-<br>
-Permission is granted to copy, distribute and/or modify this
-document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any
-later version published by the Free Software 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 <span
- style="text-decoration: underline;">"</span><a href="GnuCopyright.htm"
- target="_self">GNU Free Documentation License</a>".
-</body>
-</html>

web/SeattleInTheSpring.html

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-  <meta http-equiv="Content-Type"
- content="text/html; charset=windows-1252">
-  <title>Wintertime in Seattle</title>
-  <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-  <meta name="ProgId" content="FrontPage.Editor.Document">
-</head>
-<body>
-<div style="text-align: center;"><br>
-<h1><b><span style="font-weight: bold;"></span></b></h1>
-<h1><b>Our Home</b></h1>
-<img style="width: 1057px; height: 600px;" alt="(Our House)"
- src="images/100_0269.jpg"><br>
-<br>
-</div>
-<p> </p>
-<p><font size="2">Updated 11/02/2008 - <a href="support.htm">Tom Eastep</a></font></p>
-<p><a href="copyright.htm"><font size="2">Copyright</font> <font
- size="2">2008 Thomas M. Eastep.</font></a></p>
-<br>
-<br>
-<br>
-</body>
-</html>

web/Shorewall_CA_html.html

@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-
-    <title>Shorewall Certificate Authority</title>
-    <meta http-equiv="content-type" content=
-    "text/html; charset=ISO-8859-1">
-    <meta name="author" content="Tom Eastep">
-  </head>
-
-  <body>
-    <h1 style="text-align: left;">Shorewall Certificate Authority
-    (CA) Certificate</h1>
-    <span style="font-weight: bold;">Tom Eastep<br>
-    <br>
-    </span>Copyright © 2001-2003 Thomas M. Eastep<br>
-    <br>
-    Permission is granted to copy, distribute and/or modify this
-    document under the terms of the GNU Free Documentation License,
-    Version 1.2 or any later version published by the Free Software
-    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=
-    "http://shorewall.net/GnuCopyright.htm">GNU Free Documentation
-    License</a>”.<br>
-    <br>
-    2003-12-31<br>
-    <hr style="width: 100%; height: 2px;">
-    Given that I develop and support Shorewall without asking for
-    any renumeration, I can hardly justify paying $200US+ a year to
-    a Certificate Authority such as Thawte (A Division of VeriSign)
-    for an X.509 certificate to prove that I am who I am. I have
-    therefore established my own Certificate Authority (CA) and
-    sign my own X.509 certificates. I use these certificates on my
-    list server (<a href=
-    "https://lists.shorewall.net">https://lists.shorewall.net</a>)
-    which hosts parts of this web site.<br>
-    <br>
-    X.509 certificates are the basis for the Secure Socket Layer
-    (SSL). As part of establishing an SSL session (URL
-    https://...), your browser verifies the X.509 certificate
-    supplied by the HTTPS server against the set of Certificate
-    Authority Certificates that were shipped with your browser. It
-    is expected that the server's certificate was issued by one of
-    the authorities whose identities are known to your browser.
-    <br>
-    <br>
-    This mechanism, while supposedly guaranteeing that when you
-    connect to https://www.foo.bar you are REALLY connecting to
-    www.foo.bar, means that the CAs literally have a license to
-    print money -- they are selling a string of bits (an X.509
-    certificate) for $200US+ per year!!!I <br>
-    <br>
-    I wish that I had decided to become a CA rather that designing
-    and writing Shorewall.<br>
-    <br>
-    What does this mean to you? It means that the X.509 certificate
-    that my server will present to your browser will not have been
-    signed by one of the authorities known to your browser. If you
-    try to connect to my server using SSL, your browser will frown
-    and give you a dialog box asking if you want to accept the
-    sleezy X.509 certificate being presented by my server. <br>
-    <br>
-    There are two things that you can do:<br>
-
-    <ol>
-      <li>You can accept the mail.shorewall.net certificate when
-      your browser asks -- your acceptence of the certificate can
-      be temporary (for that access only) or perminent.</li>
-
-      <li>You can download and install <a href="ca.crt">my
-      (self-signed) CA certificate.</a> This will make my
-      Certificate Authority known to your browser so that it will
-      accept any certificate signed by me.<br>
-      </li>
-    </ol>
-    What are the risks?<br>
-
-    <ol>
-      <li>If you install my CA certificate then you assume that I
-      am trustworthy and that Shorewall running on your firewall
-      won't redirect HTTPS requests intented to go to your bank's
-      server to one of my systems that will present your browser
-      with a bogus certificate claiming that my server is that of
-      your bank.</li>
-
-      <li>If you only accept my server's certificate when prompted
-      then the most that you have to loose is that when you connect
-      to https://mail.shorewall.net, the server you are connecting
-      to might not be mine.</li>
-    </ol>
-    I have my CA certificate loaded into all of my browsers but I
-    certainly won't be offended if you decline to load it into
-    yours... :-)<br>
-    <br>
-    <br>
-    <br>
-    <br>
-  </body>
-</html>
-

web/Shorewall_index_frame.htm

@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
-  <title>Shorewall</title>
-  <base target="main">
-  <meta name="author" content="Cristian Rodriguez R.">
-  <title="default" media="screen"></title="default">
-</head>
-<body>
-<h4><a target="_top" href="index.htm">Home</a><br>
-<a href="Notices.html">Important Notices</a><br>
-<a href="download.htm">Download</a><br>
-<a href="Documentation.html">Documentation</a><br>
-<a href="support.htm">Support</a><br>
-<a href="shorewall_mirrors.htm">Mirrors</a><br>
-<a href="News.htm">News</a><br>
-<a target="_top"
- href="http://wiki.shorewall.net/wiki/ContributingToDevelopment">How
-to Contribute</a><br>
-<a target="_top" href="http://wiki.shorewall.net/">Trac Wiki</a><br>
-<a href="useful_links.html">Other Links</a><big>
-<br>
-</big></h4>
-<p style="text-align: left;" class="copyright"><small><a
- href="copyright.htm">Copyright©&nbsp;2001-2009</a></small><small><a
- href="copyright.htm"><br>
-Thomas&nbsp;M.&nbsp;Eastep</a></small></p>
-<small>
-</small>
-<div style="text-align: center;"><small><br>
-</small>
-<div style="text-align: left;"><small>Please&nbsp;report&nbsp;errors
-on&nbsp;this&nbsp;site&nbsp;to <a
- href="mailto:webmaster@shorewall.net?subject=Website%20Comments">the&nbsp;Webmaster</a></small>
-<br>
-</div>
-<br>
-<a target="_top"
- href="http://wiki.shorewall.net/wiki/LogoDesignCompetition"><img
- alt="Shorweall Logo" src="images/gareth-davies-logo3_88x31.png"
- style="border: 0px solid ; width: 88px; height: 31px;" align="middle"></a><br>
-<br>
-<br>
-<br>
-<a target="_top" href="http://sourceforge.net/projects/shorewall"><img
- src="http://sflogo.sourceforge.net/sflogo.php?group_id=22587&amp;type=11"
- alt="Get Shoreline Firewall (Shorewall) at SourceForge.net. Fast, secure and Free Open Source software downloads"
- border="0" height="30" width="120"></a>
-<br>
-<div style="text-align: left;"><br>
-</div>
-</div>
-</body>
-</html>

web/copyright.htm

@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-  <meta http-equiv="Content-Language" content="en-us">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Copyright</title>
-</head>
-<body>
-<h1 style="text-align: center;">Copyright<br>
-</h1>
-<p align="left">Copyright © 2000-2009 Thomas M Eastep&nbsp; <br>
-</p>
-<p style="margin-left: 40px;" align="left">The <a target="_top"
- href="http://wiki.shorewall.net/wiki/LogoDesignCompetition">Shorewall
-Logo</a> is the work of Gareth Davies of <a target="_top"
- href="http://thusa.co.za/">Thusa</a> and is licensed under the
-Creative
-Commons
-Attribution-Share Alike 2.5 South Africa License. To view a copy of
-this
-licence, visit <a
- href="http://creativecommons.org/licenses/by-sa/2.5/za/">http://creativecommons.org/licenses/by-sa/2.5/za/
-</a>or send a
-letter to Creative Commons, 171 Second Street, Suite 300, San
-Francisco,
-California 94105, USA.<br>
-</p>
-<blockquote>
-  <p align="left">Permission is granted to copy, distribute and/or
-modify this document under the terms of the GNU Free Documentation
-License, Version 1.1 or any later version published by the Free
-Software 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">GNU Free Documentation
-License</a>".<br>
-&nbsp;</p>
-</blockquote>
-<br>
-<br>
-</body>
-</html>

web/download.htm

@@ -1,592 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=UTF-8">
-  <title>Download</title>
-  <meta name="CREATED" content="20060304;10324500">
-  <meta name="CHANGEDBY" content="Tom Eastep">
-  <meta name="CHANGED" content="20060310;20345500">
-  <meta http-equiv="Content-Language" content="en-us">
-</head>
-<body dir="ltr" lang="en-US">
-<h1 align="left">Shorewall Download<br>
-</h1>
-<hr style="width: 100%; height: 2px;">
-<table style="text-align: left; width: 100%;" border="0" cellpadding="2"
- cellspacing="0">
-  <tbody>
-    <tr>
-      <td style="vertical-align: top; font-weight: bold;"><a
- href="#Distros">Package Information</a><a href="#Distros"><br>
-      </a> </td>
-      <td style="vertical-align: top; font-weight: bold;"><a
- href="#Distros">Distribution-specific Download Sites<br>
-      </a></td>
-      <td style="vertical-align: top;"><a href="#Sites"><span
- style="font-weight: bold;">Standard Download Sites</span></a><br>
-      </td>
-      <td style="vertical-align: top;"><a href="#Updates"><span
- style="font-weight: bold;">Finding Updates that Correct Known Problems</span></a><br>
-      </td>
-      <td style="vertical-align: top;"><a href="#SVN"><span
- style="font-weight: bold;">SVN</span><br>
-      </a></td>
-      <td style="vertical-align: top;"><a href="#Git"><span
- style="font-weight: bold;">Git</span><br>
-      </a></td>
-    </tr>
-  </tbody>
-</table>
-<p> </p>
-<hr><span style="font-weight: bold;">2009-06-28</span>
-<h2><a name="Which"></a>Package Information</h2>
-<p><b>Before trying to install, we strongly urge you to read and print
-a
-copy
-of the <a href="shorewall_quickstart_guide.htm">Shorewall QuickStart
-Guide</a> for the configuration that most closely matches your own.</b>
-</p>
-<p>The documentation in both XML and HTML formats is available for
-download
-from the Download Sites listed in the<a href="#Sites"> table below</a>.</p>
-<p><font color="#ff0000"><b>NOTICE: There are three current Shorewall
-Release
-Series:</b></font></p>
-<ul>
-  <li> The STABLE release series is 4.2.
-Choose this release if you value stability and good documentation. </li>
-  <li>The prior STABLE release series is 4.0. We release updates to
-this series to correct problems but usually don't make enhancements to
-it.&nbsp;</li>
-  <li>The DEVELOPMENT release series is 4.4 Beta
-(found in the
-'development' directory). Choose this release if you&nbsp; want to help
-shake out the bugs in the next stable release. <span
- style="font-weight: bold;"></span> <strong></strong></li>
-</ul>
-For additional information, see this article about the <a
- href="ReleaseModel.html">Shorewall Release Model</a>.
-<p>In Shorewall version <span style="font-weight: bold;">4.0.*</span>,
-there are four related
-packages:</p>
-<ul>
-  <li><span style="font-weight: bold;">Shorewall-shell</span> -- the
-legacy Shorewall configuration compiler
-written in Bourne Shell. Not recommended for new installations.<br>
-  </li>
-  <li><span style="font-weight: bold;">Shorewall-perl</span> -- an
-implementation of the Shorewall
-configuration compiler written in the Perl programming language. This
-compiler is much faster than Shorewall-shell and produces a firewall
-script that runs faster. It is the preferred compiler for new Shorewall
-installations.</li>
-  <li><span style="font-weight: bold;">Shorewall-common</span> -- A
-base package required by both
-Shorewall-shell and Shorewall-perl.</li>
-  <li><span style="font-weight: bold;">Shorewall-lite</span> -- a
-light-weight Shorewall version that will run
-compiled firewall scripts generated on a system with one of the
-compiler packages installed.</li>
-</ul>
-In Shorewall version <span style="font-weight: bold;">4.2.*</span>,
-there are two additional
-packages that provide IPv6 support:<br>
-<ul>
-  <li><span style="font-weight: bold;">Shorewall6</span> -- Provides
-/sbin/shorewall6 for controlling an IPv6
-firewall. Requires Shorewall-common and Shorewall-perl,&nbsp; 4.2.4 or
-later.<br>
-  </li>
-  <li><span style="font-weight: bold;">Shorewall6-lite</span> -- a
-light-weight Shorewall6 version that will
-run compiled firewall scripts generated on a system with Shorewall6
-installed.<br>
-  </li>
-</ul>
-In Shorewall version <span style="font-weight: bold;">4.4.*</span>,
-the Shorewall-common, Shorewall-shell and
-Shorewall-perl packages are discontinued and replaced with a single <span
- style="font-weight: bold;">Shorewall</span> package which combines the
-functions of Shorewall-common and Shorewall-perl. The shell-based
-compiler is retired. So with Shorewall 4.4 onward, there are four
-packages:<br>
-<ul>
-  <li><span style="font-weight: bold;">Shorewall </span>-- Includes
-everything needed to create an IPv4 firewall.</li>
-  <li><span style="font-weight: bold;">Shorewall6 </span>-- Requires
-the Shorewall package and adds the capability to create an IPv6
-firewall.</li>
-  <li><span style="font-weight: bold;">Shorewall-lite</span> -- a
-light-weight Shorewall version that will run
-compiled firewall scripts generated on a system with one of the
-compiler packages installed.</li>
-  <li><span style="font-weight: bold;">Shorewall6-lite</span> -- a
-light-weight Shorewall6 version that will
-run compiled firewall scripts generated on a system with Shorewall6
-installed.</li>
-</ul>
-To summarize:
-<ul>
-  <li>If you are installing <span style="font-weight: bold;">Shorewall
-4.2 or earlier</span>:<br>
-  </li>
-  <ul>
-    <li>On at least one system in your network, you must install one or
-both of the compilers (Shorewall-shell and/or Shorewall-perl; <span
- style="font-weight: bold;">Shorewall-perl is highly recommended</span>),
-the
-Shorewall-common package and possibly the Shorewall6 package.</li>
-    <li>If you only have a single firewall, then that system should be
-your firewall system.</li>
-    <li>If you have more than one firewall, you may wish to install one
-or both of the compilers on a single <em>administrative</em> system
-and install Shorewall-lite and/or Shorewall6-lite on the firewalls.
-Doing so will allow for
-centralized administration and configuration of the firewalls.</li>
-    <li>When RPM is used to install Shorewall, the compiler
-(shorewall-shell
-and/or shorewall-perl) and shorewall-common must be installed in a
-single execution of the
-rpm utility.</li>
-  </ul>
-  <li>If you are installing <span style="font-weight: bold;">Shorewall
-4.4 or later</span>:</li>
-  <ul>
-    <li>On at least one system in your network, you must install the
-Shorewall package. If you need IPv6 firewalls then you must also
-install the Shorewall6 package.</li>
-    <li>If you have a single firewall, then that system should be your
-firewall system.</li>
-    <li>If you have more than one firewall, you may wish to install
-Shorewall (and possibly Shorewall6) on a single <span
- style="font-style: italic;">administrative</span>
-system and install Shorewall-lite and/or Shorewall6-lite on the
-firewalls. Doing so will allow for centralized administration and
-configuration of the firewalls.<br>
-    </li>
-  </ul>
-</ul>
-<p>Here are the <a href="Install.htm">installation instructions</a>.</p>
-<h2><a name="Distros"></a>Distribution-specific Download Sites</h2>
-<p>Once you've printed the appropriate QuickStart Guide, download the
-appropriate Packages:</p>
-<ul>
-  <li>
-    <p style="margin-bottom: 0in;">Simon Matter provides RPMs tailored
-for <b>Redhat</b> and <b>Fedora</b>. You can <a
- href="http://www.invoca.ch/pub/packages/shorewall/">download them from
-his site</a>.</p>
-  </li>
-  <li>
-    <p style="margin-bottom: 0in;">Fabio Longarai provides a package
-for <b>OpenWRT</b> (Open firmware for Linksys® WRT54G). You can <a
- href="http://openwrt.homelinux.net/">download it from his site</a>. </p>
-<!-- Seems Unavailable
-    <LI><P STYLE="margin-bottom: 0in">Marc Zonzon provides an old
-    package for <B>OpenWRT</B> (Open firmware for Linksys&reg; WRT54G).
-    You can <A HREF="http://www.iut-lannion.fr/ZONZON/memos_index.php?part=Network&amp;section=WRTMemo&amp;subsec=shorewall">download
-    it from his site</A>.</P> -->
-  </li>
-  <li>
-    <p style="margin-bottom: 0in;">jMCg provides a package for <b>Arch
-Linux.</b> You can <a
- href="http://aur.archlinux.org/packages.php?do_Details=1&amp;ID=1563&amp;O=0&amp;L=0&amp;C=0&amp;K=shorewall&amp;SB=n&amp;PP=25&amp;do_MyPackages=0">download
-it from the Arch Linux site</a>. </p>
-  </li>
-  <li>
-    <p style="margin-bottom: 0in;">If you run a <b>SUSE,</b> <b>Linux
-PPC</b>, <b>Trustix</b> or <b>TurboLinux</b> distribution with a 2.4
-or 2.6 kernel, you can use the <a href="#Sites">standard RPM version</a>
-(note: the RPM
-should also work with other distributions that store init scripts in
-/etc/init.d and that include chkconfig or insserv). If you find that it
-works in other cases, let <a href="mailto:teastep@shorewall.net">me</a>
-know so that I can mention them here (Note: the standard RPM is known
-to work on Redhat, Fedora and Mandriva with issues ranging from trivial
-(Redhat and Fedora) to moderate (Mandriva)). See the <a
- href="Install.htm">Installation Instructions</a> if you have problems
-installing the RPM.</p>
-  </li>
-  <li>
-    <p style="margin-bottom: 0in;">If you run <a
- href="http://www.debian.org/"><b>Debian</b></a> and would like a .deb
-package, Shorewall is included in the <a
- href="http://packages.debian.org/stable/net/">Debian Stable Branch</a>,
-the <a href="http://packages.debian.org/testing/net/">Debian
-Testing Branch</a> and the <a
- href="http://packages.debian.org/unstable/net/">Debian
-Unstable Branch</a>. For new installations, it is highly recommended
-that you install the shorewall-common and shorewall-perl packages
-rather than the shorewall package.<br>
-    <br>
-Additionally, packages for the current Debian
-stable release are available from the package maintainer's <a
- href="http://people.connexer.com/%7Eroberto/debian/">personal page</a>.
-Those packages are almost always more up-to-date than the ones in the
-Debian Stable Branch.<br>
-    <br>
-    </p>
-  </li>
-  <li>If you run <a style="font-weight: bold;" href="Ubuntu">Ubuntu,</a>
-Benjamin Montgomery maintains a <a
- href="https://launchpad.net/%7Ebmonty/+archive/ppa">repository for
-Hardy Heron and Jaunty Jackalope</a>.<br>
-  </li>
-  <li>
-    <p style="margin-bottom: 0in;">If you run <a
- style="font-weight: bold;" href="http://leaf.sourceforge.net/">LEAF/Bering</a>
-or one if it's
-derivatives, you can download a .lrp file from the Leaf site.<br>
-    <br>
-From the LEAF Bering-uClibc Team: <br>
-    <br>
-    </p>
-    <div style="margin-left: 40px;">We try to provide the latest stable
-version shortly after release, but we also want to do some internal
-tests before making it available. So we may be behind sometimes. But
-better be sure that the new version is running on LEAF, than being too
-fast...<br>
-    <br>
-I know it's not obvious for newbies where to find the lrp on our pages.<br>
-    <br>
-shorewall.lrp is part of the packages page:<br>
-    <br>
-    <a
- href="http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3">http://leaf.sourceforge.net/bering-uclibc/index.php?module=pagemaster&amp;PAGE_user_op=view_page&amp;PAGE_id=3&amp;MMN_position=3:3</a><br>
-    <br>
-which itself links to cvs:<br>
-    <br>
-    <a
- href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/leaf/bin/bering-uclibc/packages/shorwall.lrp?rev=HEAD&amp;content-type=application/octet-stream">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/leaf/bin/bering-uclibc/packages/shorwall.lrp?rev=HEAD&amp;content-type=application/octet-stream</a><br>
-    <br>
-    </div>
-  </li>
-  <li>Shorewall packages for <a target="_top"
- href="http://www.slackware.com/"><span style="font-weight: bold;">Slackware</span></a>
-are available at <a target="_top"
- href="http://slackbuilds.org/result/?search=shorewall&amp;sv=">http://slackbuilds.org/result/?search=shorewall&amp;sv=</a>.<br>
-    <p><span style="font-weight: bold;"></span></p>
-  </li>
-  <li>
-    <p><span style="font-weight: bold;">Otherwise</span>, download the<span
- style="font-style: italic;"> </span>appropriate
-tarballs (.tgz or tar.bz2) from one of the standard download sites
-below.<br>
-    </p>
-  </li>
-</ul>
-<p>You will probably also want to download the HTML version of the
-documentation for easy reference.</p>
-<h2><a name="Sites"></a><b>Standard Download Sites</b></h2>
-<p style="margin-left: 0.42in;">Use the sites below to download the
-<b>tarball</b>, the <b>documentation</b> and the <b>standard RPM</b>
-for
-(<b>SUSE</b>, <b>Power PPC</b>, <b>Trustix</b> and <b>TurboLinux</b>).<br>
-<br>
-Packages are GPG signed, please <b>verify the integrity of the files</b>
-using our public key <a
- href="https://lists.shorewall.net/shorewall.gpg.key">https://lists.shorewall.net/shorewall.gpg.key</a>
-</p>
-<dl>
-  <dd>
-    <table border="0" cellpadding="2" cellspacing="0">
-      <tbody>
-        <tr>
-          <td>
-          <p><b>SERVER LOCATION</b></p>
-          </td>
-          <td>
-          <p><b>DOMAIN</b></p>
-          </td>
-          <td>
-          <p><b>HTTP</b></p>
-          </td>
-          <td>
-          <p><b>FTP</b></p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <p>Slovak Republic</p>
-          </td>
-          <td>
-          <p>Shorewall.net</p>
-          </td>
-          <td>
-          <p><a href="http://slovakia.shorewall.net/pub/shorewall/">Browse</a></p>
-          </td>
-          <td>
-          <p><a href="ftp://slovakia.shorewall.net/mirror/shorewall/"
- target="_blank">Browse</a></p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <p>Seattle, Washington, USA<span style="font-weight: bold;"></span><br>
-          </p>
-          </td>
-          <td>
-          <p>Shorewall.net</p>
-          </td>
-          <td>
-          <p><a href="http://www.shorewall.net/pub/shorewall/">Browse</a></p>
-          </td>
-          <td>
-          <p><a href="ftp://ftp.shorewall.net/pub/shorewall/"
- target="_blank">Browse</a></p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <p>Frankfurt/Main, Germany</p>
-          </td>
-          <td>
-          <p>Shorewall.de</p>
-          </td>
-          <td>
-          <p><a href="http://www.shorewall.de/pub/shorewall/">Browse</a></p>
-          </td>
-          <td>
-          <p>N/A</p>
-          </td>
-        </tr>
-        <tr>
-          <td style="vertical-align: top;">Moscow, Russia<br>
-          </td>
-          <td style="vertical-align: top;">Shorewall.ru<br>
-          </td>
-          <td style="vertical-align: top;"><a
- href="http://shorewall.ru/pub/shorewall/">Browse</a><br>
-          </td>
-          <td style="vertical-align: top;"><a
- href="ftp://shorewall.ru/pub/shorewall/">Browse</a><br>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <p>Shoreline, Wa, USA</p>
-          </td>
-          <td>
-          <p>Shorewall.net</p>
-          </td>
-          <td>
-          <p><a href="http://www1.shorewall.net/pub/shorewall/">Browse</a></p>
-          </td>
-          <td>
-          <p><a href="ftp://ftp1.shorewall.net/pub/shorewall"
- target="_top">Browse</a></p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-          <p>Australia<br>
-          </p>
-          </td>
-          <td>
-          <p>Shorewall.com.au</p>
-          </td>
-          <td>
-          <p><a href="http://www.shorewall.com.au/" target="_top">Browse</a></p>
-          </td>
-          <td>
-          <p>N/A</p>
-          </td>
-        </tr>
-        <tr valign="top">
-          <td>
-          <p>Argentina</p>
-          </td>
-          <td>
-          <p>Shorewall.net</p>
-          </td>
-          <td>
-          <p><a
- href="http://argentina.shorewall.net/pub/shorewall/shorewall">Browse</a></p>
-          </td>
-          <td>
-          <p>N/A<br>
-          </p>
-          </td>
-        </tr>
-        <tr>
-          <td style="vertical-align: top;">Chicago, Illinois, USA
-(Incomplete)<br>
-          </td>
-          <td style="vertical-align: top;">Sourceforge.net<br>
-          </td>
-          <td style="vertical-align: top;"><a
- href="http://sourceforge.net/project/showfiles.php?group_id=22587">Browse</a></td>
-          <td style="vertical-align: top;">N/A</td>
-        </tr>
-      </tbody>
-    </table>
-  </dd>
-</dl>
-<h2><a name="Updates"></a>Finding Updates that Correct Known Problems</h2>
-<p>Beginning with Shorewall 4.0.6, updated packages that include fixes
-to
-known problems are made available.</p>
-<p>Example:</p>
-<blockquote>
-  <pre>ftp&gt; cd pub/shorewall/4.0/shorewall-4.0.6<br>250 OK. Current directory is /pub/shorewall/4.0/shorewall-4.0.6<br>ftp&gt; ls<br>200 PORT command successful<br>150 Connecting to port 36018<br>drwxr-sr-x    4 1006     8            4096 Dec  1 08:16 .<br>drwxr-sr-x    9 1006     8            4096 Nov 23 08:22 ..<br>-rw-r--r--    1 1006     8             194 Nov 24 07:38 4.0.6-2.md5sums<br>-rw-r--r--    1 1006     8             218 Nov 24 07:38 4.0.6-2.sha1sums<br>-rw-r--r--    1 1006     8             841 Nov 26 13:26 4.0.6.md5sums<br>-rw-r--r--    1 1006     8             945 Nov 26 13:26 4.0.6.sha1sums<br>-rw-r--r--    1 1006     8             322 Nov 26 08:35 README.txt<br>drwxr-xr-x    4 1006     8            4096 Nov 23 08:21 <strong>base</strong><br>-rw-r--r--    1 1006     8            1570 Dec  1 08:16 <span
- style="font-weight: bold;">known_problems.txt</span><br>-rw-r--r--    1 1006     8          148363 Nov 23 08:22 patch-4.0.6<br>-rw-r--r--    1 1006     8            4238 Nov 24 16:49 <span
- style="font-weight: bold;">patch-perl-4.0.6.1</span><br>-rw-r--r--    1 1006     8            5249 Nov 29 07:38 <strong>patch-perl-4.0.6.2</strong><br>...<br><br>-rw-r--r--    1 1006     8          102295 Nov 24 07:38 shorewall-perl-4.0.6<strong>-2</strong>.noarch.rpm   &lt;=========<br>-rw-r--r--    1 1006     8           99884 Nov 24 07:38 shorewall-perl-4.0.6<strong>.2</strong>.tar.bz2      &lt;=========  <br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>.2</strong>.tar.bz2.asc  &lt;=========<br>-rw-r--r--    1 1006     8          124814 Nov 24 07:38 shorewall-perl-4.0.6<strong>.2</strong>.tgz          &lt;=========<br>-rw-r--r--    1 1006     8             300 Nov 24 07:38 shorewall-perl-4.0.6<strong>.2</strong>.tgz.asc      &lt;=========<br>-rw-r--r--    1 1006     8           59124 Nov 23 08:22 shorewall-shell-4.0.6-0base.noarch.rpm<br>-rw-r--r--    1 1006     8           76500 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tar.bz2.asc<br>-rw-r--r--    1 1006     8           95193 Nov 23 08:22 shorewall-shell-4.0.6.tgz<br>-rw-r--r--    1 1006     8             300 Nov 23 08:22 shorewall-shell-4.0.6.tgz.asc<br>drwxr-sr-x    2 1006     8            4096 Nov 26 08:33 <strong>superseded</strong><br>226-Options: -a -l <br>226 41 matches total<br>ftp</pre>
-</blockquote>
-<blockquote>
-  <p>The lines flagged with &lt;====== show that the Shorewall-perl
-package has been updated to include two bug fixes (note the "-2" and
-".2" in the file names). The base tarballs for the release are found in
-the <strong>base</strong>
-directory. The unified diff files <strong>patch-4.0.6.*</strong>
-may be applied sequentially to the base (4.0.6) Shorewall-perl release
-(from the <span style="font-weight: bold;">base</span> directory) to
-produce
-4.0.6.2. The obsoleted 4.0.6 Shorewall-perl packages may be found in
-the <strong>superseded</strong>
-directory. The <strong>known_problems.txt</strong> file indicates
-which problems are fixed in each updated package.</p>
-</blockquote>
-<h2><a name="SVN"></a><b>SVN</b></h2>
-<blockquote> The <a href="https://sourceforge.net/svn/?group_id=22587"
- target="_blank">SVN&nbsp;Repository at Sourceforge</a> is used as a
-safe-store for Shorewall releases.<br>
-  <br>
-You should download and use the latest SVN version only <b>at your own
-risk</b> -- <strong>please do not attempt to install Shorewall from
-the SVN components; you will end up with an incomplete and non-working
-installation. </strong>
-  <p>If you want to build your own packages from the SVN images, use
-the build script found in tools/build/buildshorewall.</p>
-  <p>If you are looking for bug fixes for the current release, see <a
- href="#Updates">above.</a><br>
-  <br>
-The following SVN projects are currently active:<br>
-  </p>
-</blockquote>
-<ol>
-  <li>
-    <blockquote>
-      <p><span style="font-weight: bold;">branches</span></p>
-      <p>This project contains sub-projects for each of the stable
-releases.</p>
-      <p>The current <strong>stable</strong> version is branch named
-x.y where x.y is the major version. Example: 3.4. <br>
-      </p>
-      <p>You can download it using the following commands: <br>
-      <br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">svn co
-https://shorewall.svn.sourceforge.net/svnroot/shorewall/branches/x.y/Shorewall</span></p>
-    </blockquote>
-  </li>
-  <li>
-    <blockquote> <b>Shorewall<br>
-      <br>
-      </b>This project contains the Shorewall code.<br>
-      <br>
-      <br>
-You can download it using the following commands: <br>
-      <br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">svn co
-https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk/Shorewall</span><br>
-      <span style="font-weight: bold;"></span></blockquote>
-  </li>
-  <li>
-    <blockquote> <span style="font-weight: bold;">manpages<br>
-      </span><br>
-Beginning with Shorewall 3,4,0, this project contains the man pages for
-Shorewall. 'trunk' is the current development version.<br>
-      <br>
-You can download it using the following commands: <br>
-      <br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">svn co
-https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk/manpages</span></blockquote>
-  </li>
-  <li>
-    <blockquote> <span style="font-weight: bold;">manpages-lite<br>
-      </span><br>
-Beginning with Shorewall 3.4.0, this project contains the man pages for
-Shorewall Lite. 'trunk'&nbsp; is the current development version.<br>
-      <br>
-You can download it using the following commands: <br>
-      <br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">svn co
-https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk/manpages-lite</span></blockquote>
-  </li>
-  <li>
-    <blockquote> <span style="font-weight: bold;">docs</span><br>
-      <b><br>
-      </b>This project contains the Shorewall documenation.<br>
-trunk is the current development version. <br>
-      <br>
-      <br>
-You can always get the current documentation in XML Docbook format
-using the following command: <br>
-      <br>
-&nbsp;&nbsp;&nbsp; <span style="font-weight: bold;">svn co
-https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk/docs</span></blockquote>
-  </li>
-  <li>
-    <blockquote> <b>web<br>
-      <br>
-      </b>The project contains the part of this Web site not included
-in the "docs" project. </blockquote>
-  </li>
-  <li>
-    <blockquote> <b>tools<br>
-      <br>
-      </b>This project includes the tools used by the Shorewall
-developers to build Shorewall releases and to publish content to the
-web sites.</blockquote>
-  </li>
-  <li>
-    <blockquote> <b>Samples<br>
-      <br>
-      </b>This project contains the sample configurations.</blockquote>
-  </li>
-  <li>
-    <blockquote> <b>Shorewall-lite<br>
-      <br>
-      </b>This project contains Shorewall Lite -- introduced in
-Shorewall version 3.2.0 RC1.<br>
-    </blockquote>
-  </li>
-  <li>
-    <blockquote><b>Shorewall6<br>
-      <br>
-      </b>This project contains Shorewall6 -- introduced in Shorewall
-version
-4.2.4.</blockquote>
-  </li>
-  <li>
-    <blockquote><b>Shorewall6-lite<br>
-      <br>
-      </b>This project contains Shorewall6 Lite -- introduced in
-Shorewall
-version 4.2.4.</blockquote>
-  </li>
-</ol>
-<h2><a name="Git"></a>Git</h2>
-Beginning with Shorewall 4.3, the Shorewall project is migrating from
-SVN to Git. You may browse the <a
- href="http://shorewall.git.sourceforge.net/git/gitweb.cgi?p=shorewall;a=tree">Shorewall
-Git repository at Sourceforge</a>.<br>
-<br>
-To create your own copy of the repository, use this command:<br>
-<br>
-<div style="margin-left: 40px;"><span style="font-weight: bold;">git&nbsp;clone&nbsp;git://shorewall.git.sourceforge.net/gitroot/shorewall</span><br>
-<br>
-</div>
-<hr style="width: 100%; height: 2px;">Copyright ©&nbsp; 2001-2009
-Thomas M. Eastep
-<p>Permission is granted to copy, distribute and/or modify this
-document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any
-later version published by the Free Software 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>
-</body>
-</html>

web/gnu_mailman.htm

@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Language" content="en-us">
-    <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-    <meta name="ProgId" content="FrontPage.Editor.Document">
-    <meta http-equiv="Content-Type" content=
-    "text/html; charset=windows-1252">
-
-    <title>GNU Mailman</title>
-  </head>
-
-  <body>
-    <h1 style="text-align: left;">GNU Mailman/Postfix the Easy
-    Way&nbsp;</h1>
-    <span style="font-weight: bold;">Tom Eastep</span><br>
-
-    <h4><span style="font-weight: normal;">Copyright <20> 2001-2003
-    Thomas M. Eastep</span><br>
-    <br>
-    <span style="font-weight: normal;">Permission is granted to
-    copy, distribute and/or modify this document under the terms of
-    the GNU Free Documentation License, Version 1.2 or any later
-    version published by the Free Software 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 <20></span><a href=
-    "http://shorewall.net/GnuCopyright.htm" style=
-    "font-weight: normal;">GNU Free Documentation License</a><span
-    style="font-weight: normal;"><3E>.</span><br style=
-    "font-weight: normal;">
-    <br style="font-weight: normal;">
-    <span style="font-weight: normal;">2003-12-31</span></h4>
-    <hr style="width: 100%; height: 2px;">
-
-    <h4>The following was posted on the Postfix mailing list on
-    5/4/2002 by Michael Tokarev as a suggested addition to the
-    Postfix FAQ.</h4>
-
-    <p>Q: Mailman does not work with Postfix, complaining about GID
-    mismatch<br>
-    <br>
-    A: Mailman uses a setgid wrapper that is designed to be used in
-    system-wide aliases file so that rest of mailman's mail
-    handling processes will run with proper uid/gid. Postfix has an
-    ability to run a command specified in an alias as owner of that
-    alias, thus mailman's wrapper is not needed here. The best
-    method to invoke mailman's mail handling via aliases is to use
-    separate alias file especially for mailman, and made it owned
-    by mailman and group mailman. Like:<br>
-    <br>
-    alias_maps = hash:/etc/postfix/aliases,
-    hash:/var/mailman/aliases<br>
-    <br>
-    Make sure that /var/mailman/aliases.db is owned by mailman user
-    (this may be done by executing postalias as mailman
-    userid).<br>
-    <br>
-    Next, instead of using mailman-suggested aliases entries with
-    wrapper, use the following:<br>
-    <br>
-    instead of<br>
-    mailinglist: /var/mailman/mail/wrapper post mailinglist<br>
-    mailinglist-admin: /var/mailman/mail/wrapper mailowner
-    mailinglist<br>
-    mailinglist-request: /var/mailman/mail/wrapper mailcmd
-    mailinglist<br>
-    ...<br>
-    <br>
-    use<br>
-    mailinglist: /var/mailman/scripts/post mailinglist<br>
-    mailinglist-admin: /var/mailman/scripts/mailowner
-    mailinglist<br>
-    mailinglist-request: /var/mailman/scripts/mailcmd
-    mailinglist<br>
-    ...</p>
-
-    <h4>The above tip works with Mailman 2.0; Mailman 2.1 has
-    adopted something very similar so that no workaround is
-    necessary. See the README.POSTFIX file included with
-    Mailman-2.1.<br>
-    </h4>
-    <br>
-    <br>
-    <br>
-  </body>
-</html>
-