Pre-approval request for upload of shorewall-* packages

To: debian-release@lists.debian.org
Subject: Pre-approval request for upload of shorewall-* packages
From: Roberto C. Sánchez <roberto@connexer.com>
Date: Mon, 2 Jul 2012 20:49:06 -0400
Message-id: <20120703004906.GB29380@connexer.com>
Mail-followup-to: debian-release@lists.debian.org

Release Managers,

I am writing to request approval to upload [shorewall-init,
shorewall-core, shorewall, shorewall6, shorewall-lite, shorewall6-lite]
into unstable.  The upload is a point release by upstream.  The bulk of
the diff is updates to the version number in numerous places in each
package.  The reason for all 6 packages being part of the request is
that upstream maintains each Shorewall component as a separate package,
but they are all always released in sync (and they need to stay in sync
when uploaded, for example).  Please see the attached debdiff for the
proposed changes.

Regards,

-Roberto

P.S. I apologize for the poor timing of this, as I had intended to
upload prior to the freeze taking effect.  However, the recent storms
that struck the midwest US affected me and left me without electricity
for most of the weekend.

-- 
Roberto C. Sánchez
http://people.connexer.com/~roberto
http://www.connexer.com

diff -Nru shorewall-init-4.5.5.1/changelog.txt shorewall-init-4.5.5.3/changelog.txt
--- shorewall-init-4.5.5.1/changelog.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/changelog.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall-init-4.5.5.1/configure shorewall-init-4.5.5.3/configure
--- shorewall-init-4.5.5.1/configure	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/configure	2012-06-28 11:00:50.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall-init-4.5.5.1/configure.pl shorewall-init-4.5.5.3/configure.pl
--- shorewall-init-4.5.5.1/configure.pl	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/configure.pl	2012-06-28 11:00:50.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall-init-4.5.5.1/debian/changelog shorewall-init-4.5.5.3/debian/changelog
--- shorewall-init-4.5.5.1/debian/changelog	2012-06-17 14:12:20.000000000 -0400
+++ shorewall-init-4.5.5.3/debian/changelog	2012-07-02 19:26:18.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall-init (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:25:07 -0400
+
 shorewall-init (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall-init-4.5.5.1/install.sh shorewall-init-4.5.5.3/install.sh
--- shorewall-init-4.5.5.1/install.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/install.sh	2012-06-28 11:00:50.000000000 -0400
@@ -23,7 +23,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {
diff -Nru shorewall-init-4.5.5.1/releasenotes.txt shorewall-init-4.5.5.3/releasenotes.txt
--- shorewall-init-4.5.5.1/releasenotes.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/releasenotes.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall-init-4.5.5.1/shorewall-init.spec shorewall-init-4.5.5.3/shorewall-init.spec
--- shorewall-init-4.5.5.1/shorewall-init.spec	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/shorewall-init.spec	2012-06-28 11:00:50.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall-init
 %define version 4.5.5
-%define release 1
+%define release 3
 
 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
 Name: %{name}
@@ -125,6 +125,10 @@
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall-init-4.5.5.1/uninstall.sh shorewall-init-4.5.5.3/uninstall.sh
--- shorewall-init-4.5.5.1/uninstall.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/uninstall.sh	2012-06-28 11:00:50.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

diff -Nru shorewall-init-4.5.5.1/changelog.txt shorewall-init-4.5.5.3/changelog.txt
--- shorewall-init-4.5.5.1/changelog.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/changelog.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall-init-4.5.5.1/configure shorewall-init-4.5.5.3/configure
--- shorewall-init-4.5.5.1/configure	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/configure	2012-06-28 11:00:50.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall-init-4.5.5.1/configure.pl shorewall-init-4.5.5.3/configure.pl
--- shorewall-init-4.5.5.1/configure.pl	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/configure.pl	2012-06-28 11:00:50.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall-init-4.5.5.1/debian/changelog shorewall-init-4.5.5.3/debian/changelog
--- shorewall-init-4.5.5.1/debian/changelog	2012-06-17 14:12:20.000000000 -0400
+++ shorewall-init-4.5.5.3/debian/changelog	2012-07-02 19:26:18.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall-init (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:25:07 -0400
+
 shorewall-init (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall-init-4.5.5.1/install.sh shorewall-init-4.5.5.3/install.sh
--- shorewall-init-4.5.5.1/install.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/install.sh	2012-06-28 11:00:50.000000000 -0400
@@ -23,7 +23,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {
diff -Nru shorewall-init-4.5.5.1/releasenotes.txt shorewall-init-4.5.5.3/releasenotes.txt
--- shorewall-init-4.5.5.1/releasenotes.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/releasenotes.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall-init-4.5.5.1/shorewall-init.spec shorewall-init-4.5.5.3/shorewall-init.spec
--- shorewall-init-4.5.5.1/shorewall-init.spec	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/shorewall-init.spec	2012-06-28 11:00:50.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall-init
 %define version 4.5.5
-%define release 1
+%define release 3
 
 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
 Name: %{name}
@@ -125,6 +125,10 @@
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall-init-4.5.5.1/uninstall.sh shorewall-init-4.5.5.3/uninstall.sh
--- shorewall-init-4.5.5.1/uninstall.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-init-4.5.5.3/uninstall.sh	2012-06-28 11:00:50.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Chains.pm shorewall-4.5.5.3/Perl/Shorewall/Chains.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Chains.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Chains.pm	2012-06-28 11:00:50.000000000 -0400
@@ -249,7 +249,7 @@
 
 Exporter::export_ok_tags('internal');
 
-our $VERSION = '4.5_4';
+our $VERSION = '4.5_5';
 
 #
 # Chain Table
@@ -1038,6 +1038,7 @@
 
     push @{$chainref->{rules}}, $ruleref;
     $chainref->{referenced} = 1;
+    $chainref->{optflags}  |= DONT_MOVE if ( $ruleref->{target} || '' ) eq 'RETURN';
     trace( $chainref, 'A', @{$chainref->{rules}}, "-A $chainref->{name} $_[1]" ) if $debug;
 
     $ruleref;
@@ -1229,6 +1230,7 @@
     if ( $jump ) {
 	$ruleref->{jump}       = $jump;
 	$ruleref->{target}     = $target;
+	$chainref->{optflags} |= DONT_MOVE if $target eq 'RETURN';
 	$ruleref->{targetopts} = $targetopts if $targetopts;
     } else {
 	$ruleref->{target} = '';
@@ -4199,12 +4201,12 @@
 
 	if ( supplied $2 ) {
 	    $user  = $2;
-	    $user  = resolve_id( $user, 'user' ) unless $user =~ /\d+$/;
+	    $user  = resolve_id( $user, 'user' ) unless $user =~ /\d+(-\d+)?$/;
 	    $rule .= "${invert}--uid-owner $user ";
 	}
 
 	if ( $group ne '' ) {
-	    $group = resolve_id( $group, 'group' ) unless $group =~ /^\d+$/;
+	    $group = resolve_id( $group, 'group' ) unless $group =~ /^\d+(-\d+)?$/;
 	    $rule .= "${invert}--gid-owner $group ";
 	}
     } elsif ( $user =~ /^(!)?(.*)$/ ) {
@@ -4212,10 +4214,10 @@
 	$user   = $2;
 
 	fatal_error "Invalid USER/GROUP (!)" if $user eq '';
-	$user = resolve_id ($user, 'user' ) unless $user =~ /\d+$/;
+	$user = resolve_id ($user, 'user' ) unless $user =~ /\d+(-\d+)?$/;
 	$rule .= "${invert}--uid-owner $user ";
     } else {
-	$user  = resolve_id( $user, 'user' ) unless $user =~ /\d+$/;
+	$user  = resolve_id( $user, 'user' ) unless $user =~ /\d+(-\d+)?$/;
 	$rule .= "--uid-owner $user ";
     }
 
@@ -6057,7 +6059,7 @@
 	#
 	my $echain = newexclusionchain( $table );
 
-	my $echainref = new_chain $table, $echain;
+	my $echainref = dont_move new_chain $table, $echain;
 	#
 	# Use the current rule and send all possible matches to the exclusion chain
 	#
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Config.pm shorewall-4.5.5.3/Perl/Shorewall/Config.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Config.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Config.pm	2012-06-28 11:00:50.000000000 -0400
@@ -164,7 +164,7 @@
 
 Exporter::export_ok_tags('internal');
 
-our $VERSION = '4.5_4';
+our $VERSION = '4.5_5';
 
 #
 # describe the current command, it's present progressive, and it's completion.
@@ -519,7 +519,7 @@
 		    KLUDGEFREE => '',
 		    STATEMATCH => '-m state --state',
 		    UNTRACKED  => 0,
-		    VERSION    => "4.5.5.1",
+		    VERSION    => "4.5.5.3",
 		    CAPVERSION => 40504 ,
 		  );
     #
@@ -1684,11 +1684,12 @@
     if ( $keyword =~ /^IF/ ) {
 	cond_error $linenumber, "Missing IF variable" unless $rest;
 	my $invert = $rest =~ s/^!\s*//;
-
 	cond_error $linenumber, "Invalid IF variable ($rest)" unless ($rest =~ s/^\$// || $rest =~ /^__/ ) && $rest =~ /^\w+$/;
 
 	push @ifstack, [ 'IF', $omitting, $omitting, $linenumber ];
 
+	$lastomit = $omitting;
+
 	if ( $rest eq '__IPV6' ) {
 	    $omitting = $family == F_IPV4;
 	} elsif ( $rest eq '__IPV4' ) {
@@ -4185,10 +4186,10 @@
     }
 
     if ( ( my $userbits = $config{PROVIDER_OFFSET} - $config{TC_BITS} ) > 0 ) {
-
 	$globals{USER_MASK} = make_mask( $userbits ) << $config{TC_BITS};
+	$globals{USER_BITS} = $userbits;
     } else {
-	$globals{USER_MASK} = 0;
+	$globals{USER_MASK} = $globals{USER_BITS} = 0;
     }
 
     if ( supplied ( $val = $config{ZONE2ZONE} ) ) {
@@ -4606,7 +4607,7 @@
 	     $globals{TC_MASK} );
 
     dumpout( "User",
-	     $globals{USER_MASK},
+	     $globals{USER_BITS},
 	     $globals{TC_MAX} + 1,
 	     $globals{USER_MASK},
 	     $globals{USER_MASK} );
@@ -4628,6 +4629,12 @@
 	     $globals{EXCLUSION_MASK},
 	     $globals{EXCLUSION_MASK},
 	     $globals{EXCLUSION_MASK} );
+
+    dumpout( "TProxy",
+	     1,
+	     $globals{TPROXY_MARK},
+	     $globals{TPROXY_MARK},
+	     $globals{TPROXY_MARK} );
 }
 
 END {
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Misc.pm shorewall-4.5.5.3/Perl/Shorewall/Misc.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Misc.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Misc.pm	2012-06-28 11:00:50.000000000 -0400
@@ -45,7 +45,7 @@
 		  generate_matrix
 		  );
 our @EXPORT_OK = qw( initialize );
-our $VERSION = '4.5_4';
+our $VERSION = '4.5_5';
 
 my $family;
 
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Nat.pm shorewall-4.5.5.3/Perl/Shorewall/Nat.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Nat.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Nat.pm	2012-06-28 11:00:50.000000000 -0400
@@ -40,7 +40,7 @@
 
 Exporter::export_ok_tags('rules');
 
-our $VERSION = '4.5_3';
+our $VERSION = '4.5_5';
 
 my @addresses_to_add;
 my %addresses_to_add;
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Providers.pm shorewall-4.5.5.3/Perl/Shorewall/Providers.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Providers.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Providers.pm	2012-06-28 11:00:50.000000000 -0400
@@ -64,6 +64,7 @@
 my $first_default_route;
 my $first_fallback_route;
 my $maxload;
+my $tproxies;
 
 my %providers;
 
@@ -99,6 +100,7 @@
     $first_default_route    = 1;
     $first_fallback_route   = 1;
     $maxload                = 0;
+    $tproxies               = 0;
 
     %providers  = ( local   => { number => LOCAL_TABLE   , mark => 0 , optional => 0 ,routes => [], rules => [] } ,
 		    main    => { number => MAIN_TABLE    , mark => 0 , optional => 0 ,routes => [], rules => [] } ,
@@ -462,10 +464,11 @@
     }
 
     if ( $local ) {
-	fatal_error "GATEWAY not valid with 'local' provider" unless $gatewaycase eq 'none';
-	fatal_error "'track' not valid with 'local'"          if $track;
-	fatal_error "DUPLICATE not valid with 'local'"        if $duplicate ne '-';
+	fatal_error "GATEWAY not valid with 'local' provider"  unless $gatewaycase eq 'none';
+	fatal_error "'track' not valid with 'local'"           if $track;
+	fatal_error "DUPLICATE not valid with 'local'"         if $duplicate ne '-';
     } elsif ( $tproxy ) {
+	fatal_error "Only one 'tproxy' provider is allowed"    if $tproxies++;
 	fatal_error "GATEWAY not valid with 'tproxy' provider" unless $gatewaycase eq 'none';
 	fatal_error "'track' not valid with 'tproxy'"          if $track;
 	fatal_error "DUPLICATE not valid with 'tproxy'"        if $duplicate ne '-';
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Rules.pm shorewall-4.5.5.3/Perl/Shorewall/Rules.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Rules.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Rules.pm	2012-06-28 11:00:50.000000000 -0400
@@ -53,7 +53,7 @@
 	       );
 
 our @EXPORT_OK = qw( initialize );
-our $VERSION = '4.5_3';
+our $VERSION = '4.5_5';
 #
 # Globals are documented in the initialize() function
 #
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Tc.pm shorewall-4.5.5.3/Perl/Shorewall/Tc.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Tc.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Tc.pm	2012-06-28 11:00:50.000000000 -0400
@@ -1642,7 +1642,7 @@
 			);
 
 	    add_ijump( $mangle_table->{tcpost} ,
-		       j    => 'CONNMARK --save-mark --ctmask '    . in_hex( $globals{TC_MASK} ),
+		       j    => 'CONNMARK --save-mark --mask '    . in_hex( $globals{TC_MASK} ),
 		       mark => '! --mark 0/' . in_hex( $globals{TC_MASK} )
 		     );
 	}
@@ -1765,7 +1765,7 @@
 		my $rate     = "$tcref->{rate}kbit";
 		my $quantum  = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} );
 
-		$classids{$classid}=$device;
+		$classids{$classid}=$devname;
 
 		my $priority = $tcref->{priority} << 8;
 		my $parent   = in_hexp $tcref->{parent};
@@ -1856,7 +1856,7 @@
 		my $devicenumber  = in_hexp $devref->{number};
 		my $classid  = join( ':', $devicenumber, $classnum);
 
-		$classids{$classid}=$device;
+		$classids{$classid}=$devname;
 	    }
 	}
     }
diff -Nru shorewall-4.5.5.1/Perl/Shorewall/Zones.pm shorewall-4.5.5.3/Perl/Shorewall/Zones.pm
--- shorewall-4.5.5.1/Perl/Shorewall/Zones.pm	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/Perl/Shorewall/Zones.pm	2012-06-28 11:00:50.000000000 -0400
@@ -93,7 +93,7 @@
 		 );
 
 our @EXPORT_OK = qw( initialize );
-our $VERSION = '4.5_4';
+our $VERSION = '4.5_5';
 
 #
 # IPSEC Option types
diff -Nru shorewall-4.5.5.1/changelog.txt shorewall-4.5.5.3/changelog.txt
--- shorewall-4.5.5.1/changelog.txt	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/changelog.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall-4.5.5.1/configfiles/providers.annotated shorewall-4.5.5.3/configfiles/providers.annotated
--- shorewall-4.5.5.1/configfiles/providers.annotated	2012-06-14 16:14:33.000000000 -0400
+++ shorewall-4.5.5.3/configfiles/providers.annotated	2012-06-28 11:02:35.000000000 -0400
@@ -151,7 +151,7 @@
 #         shorewall-tcrules(5). See http://www.shorewall.net/
 #         Shorewall_Squid_Usage.html. When specified, the MARK, DUPLICATE and
 #         GATEWAY columns should be empty, INTERFACE should be set to 'lo' and
-#         tproxy should be the only OPTION.
+#         tproxy should be the only OPTION. Only one tproxy provider is allowed.
 # 
 # COPY - [{none|interface[,interface]...}]
 # 
diff -Nru shorewall-4.5.5.1/configure shorewall-4.5.5.3/configure
--- shorewall-4.5.5.1/configure	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/configure	2012-06-28 11:00:50.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall-4.5.5.1/configure.pl shorewall-4.5.5.3/configure.pl
--- shorewall-4.5.5.1/configure.pl	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/configure.pl	2012-06-28 11:00:50.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall-4.5.5.1/debian/changelog shorewall-4.5.5.3/debian/changelog
--- shorewall-4.5.5.1/debian/changelog	2012-06-17 14:13:22.000000000 -0400
+++ shorewall-4.5.5.3/debian/changelog	2012-07-02 19:27:01.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:26:52 -0400
+
 shorewall (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall-4.5.5.1/install.sh shorewall-4.5.5.3/install.sh
--- shorewall-4.5.5.1/install.sh	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/install.sh	2012-06-28 11:00:50.000000000 -0400
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 #
 # Change to the directory containing this script
diff -Nru shorewall-4.5.5.1/known_problems.txt shorewall-4.5.5.3/known_problems.txt
--- shorewall-4.5.5.1/known_problems.txt	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/known_problems.txt	2012-06-28 11:00:50.000000000 -0400
@@ -16,3 +16,53 @@
     failure.
 
     Corrected in Shorewall 4.5.5.1.
+
+4)  When ipp2p is used in the /etc/shorewall/tcpri file, the generated
+    code for saving the packet mark is clearing the connection marks
+    fields not having to do with traffic shaping.
+
+    Corrected in Shorewall 4.5.5.2.
+
+5)  Shorewall 4.4.11 allows UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented feature
+    is not present in Shorewall 4.5.
+
+    Corrected in Shorewall 4.5.5.2.
+
+6)  The special TPROXY mark value is not shown in the output of
+    'shorewall show marks'.
+
+    Corrected in Shorewall 4.5.5.2.
+
+7)  Assuming that A = 0 and B = 1, the following conditionals produce
+    incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> is included when it should be omitted.
+
+    Corrected in Shorewall 4.5.5.2.
+
+8)  When logical interface names are used, an entry in tcrules that
+    includes a classid can result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+    Workarounds:
+
+    a: Use only physical names for interfaces appearing in the
+       tcrules file when classids are needed.
+
+    b: Follow classids in the rules file with ':T' (e.g., 1:4:T).
+
+    Corrected in Shorewall 4.5.5.3.
+
+
+
diff -Nru shorewall-4.5.5.1/manpages/shorewall-accounting.5 shorewall-4.5.5.3/manpages/shorewall-accounting.5
--- shorewall-4.5.5.1/manpages/shorewall-accounting.5	2012-06-14 16:12:51.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-accounting.5	2012-06-28 11:00:53.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-accounting
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ACCOUNTIN" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ACCOUNTIN" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-actions.5 shorewall-4.5.5.3/manpages/shorewall-actions.5
--- shorewall-4.5.5.1/manpages/shorewall-actions.5	2012-06-14 16:12:53.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-actions.5	2012-06-28 11:00:55.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-actions
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ACTIONS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ACTIONS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-blacklist.5 shorewall-4.5.5.3/manpages/shorewall-blacklist.5
--- shorewall-4.5.5.1/manpages/shorewall-blacklist.5	2012-06-14 16:12:55.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-blacklist.5	2012-06-28 11:00:57.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-blacklist
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-BLACKLIST" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-BLACKLIST" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-blrules.5 shorewall-4.5.5.3/manpages/shorewall-blrules.5
--- shorewall-4.5.5.1/manpages/shorewall-blrules.5	2012-06-14 16:12:57.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-blrules.5	2012-06-28 11:00:59.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-blrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-BLRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-BLRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-ecn.5 shorewall-4.5.5.3/manpages/shorewall-ecn.5
--- shorewall-4.5.5.1/manpages/shorewall-ecn.5	2012-06-14 16:13:03.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-ecn.5	2012-06-28 11:01:05.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-ecn
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ECN" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ECN" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-exclusion.5 shorewall-4.5.5.3/manpages/shorewall-exclusion.5
--- shorewall-4.5.5.1/manpages/shorewall-exclusion.5	2012-06-14 16:13:05.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-exclusion.5	2012-06-28 11:01:07.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-exclusion
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-EXCLUSION" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-EXCLUSION" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-hosts.5 shorewall-4.5.5.3/manpages/shorewall-hosts.5
--- shorewall-4.5.5.1/manpages/shorewall-hosts.5	2012-06-14 16:13:07.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-hosts.5	2012-06-28 11:01:09.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-hosts
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-HOSTS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-HOSTS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-init.8 shorewall-4.5.5.3/manpages/shorewall-init.8
--- shorewall-4.5.5.1/manpages/shorewall-init.8	2012-06-14 16:13:09.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-init.8	2012-06-28 11:01:11.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-init
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-INIT" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-INIT" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-interfaces.5 shorewall-4.5.5.3/manpages/shorewall-interfaces.5
--- shorewall-4.5.5.1/manpages/shorewall-interfaces.5	2012-06-14 16:13:11.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-interfaces.5	2012-06-28 11:01:14.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-interfaces
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-INTERFACE" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-INTERFACE" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-ipsets.5 shorewall-4.5.5.3/manpages/shorewall-ipsets.5
--- shorewall-4.5.5.1/manpages/shorewall-ipsets.5	2012-06-14 16:13:13.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-ipsets.5	2012-06-28 11:01:16.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-ipsets
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-IPSETS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-IPSETS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-maclist.5 shorewall-4.5.5.3/manpages/shorewall-maclist.5
--- shorewall-4.5.5.1/manpages/shorewall-maclist.5	2012-06-14 16:13:16.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-maclist.5	2012-06-28 11:01:18.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-maclist
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-MACLIST" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MACLIST" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-masq.5 shorewall-4.5.5.3/manpages/shorewall-masq.5
--- shorewall-4.5.5.1/manpages/shorewall-masq.5	2012-06-14 16:13:18.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-masq.5	2012-06-28 11:01:20.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-masq
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-MASQ" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MASQ" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-modules.5 shorewall-4.5.5.3/manpages/shorewall-modules.5
--- shorewall-4.5.5.1/manpages/shorewall-modules.5	2012-06-14 16:13:20.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-modules.5	2012-06-28 11:01:22.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-modules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-MODULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-MODULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-nat.5 shorewall-4.5.5.3/manpages/shorewall-nat.5
--- shorewall-4.5.5.1/manpages/shorewall-nat.5	2012-06-14 16:13:22.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-nat.5	2012-06-28 11:01:24.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-nat
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-NAT" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NAT" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-nesting.5 shorewall-4.5.5.3/manpages/shorewall-nesting.5
--- shorewall-4.5.5.1/manpages/shorewall-nesting.5	2012-06-14 16:13:24.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-nesting.5	2012-06-28 11:01:26.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-nesting
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-NESTING" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NESTING" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-netmap.5 shorewall-4.5.5.3/manpages/shorewall-netmap.5
--- shorewall-4.5.5.1/manpages/shorewall-netmap.5	2012-06-14 16:13:26.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-netmap.5	2012-06-28 11:01:28.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-netmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-NETMAP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-NETMAP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-notrack.5 shorewall-4.5.5.3/manpages/shorewall-notrack.5
--- shorewall-4.5.5.1/manpages/shorewall-notrack.5	2012-06-14 16:13:28.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-notrack.5	2012-06-28 11:01:30.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-notrack
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-NOTRACK" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-NOTRACK" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-params.5 shorewall-4.5.5.3/manpages/shorewall-params.5
--- shorewall-4.5.5.1/manpages/shorewall-params.5	2012-06-14 16:13:30.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-params.5	2012-06-28 11:01:32.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-params
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-PARAMS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PARAMS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-policy.5 shorewall-4.5.5.3/manpages/shorewall-policy.5
--- shorewall-4.5.5.1/manpages/shorewall-policy.5	2012-06-14 16:13:32.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-policy.5	2012-06-28 11:01:34.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-policy
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-POLICY" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-POLICY" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-providers.5 shorewall-4.5.5.3/manpages/shorewall-providers.5
--- shorewall-4.5.5.1/manpages/shorewall-providers.5	2012-06-14 16:13:34.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-providers.5	2012-06-28 11:01:36.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-providers
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-PROVIDERS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PROVIDERS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -218,7 +218,9 @@
 Added in Shorewall 4\&.5\&.4\&. Used for supporting the TPROXY action in shorewall\-tcrules(5)\&. See
 \m[blue]\fBhttp://www\&.shorewall\&.net/Shorewall_Squid_Usage\&.html\fR\m[]\&;. When specified, the MARK, DUPLICATE and GATEWAY columns should be empty, INTERFACE should be set to \*(Aqlo\*(Aq and
 \fBtproxy\fR
-should be the only OPTION\&.
+should be the only OPTION\&. Only one
+\fBtproxy\fR
+provider is allowed\&.
 .RE
 .RE
 .PP
diff -Nru shorewall-4.5.5.1/manpages/shorewall-proxyarp.5 shorewall-4.5.5.3/manpages/shorewall-proxyarp.5
--- shorewall-4.5.5.1/manpages/shorewall-proxyarp.5	2012-06-14 16:13:36.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-proxyarp.5	2012-06-28 11:01:38.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-proxyarp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-PROXYARP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-PROXYARP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-routes.5 shorewall-4.5.5.3/manpages/shorewall-routes.5
--- shorewall-4.5.5.1/manpages/shorewall-routes.5	2012-06-14 16:13:40.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-routes.5	2012-06-28 11:01:42.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-routes
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ROUTES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ROUTES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-routestopped.5 shorewall-4.5.5.3/manpages/shorewall-routestopped.5
--- shorewall-4.5.5.1/manpages/shorewall-routestopped.5	2012-06-14 16:13:38.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-routestopped.5	2012-06-28 11:01:40.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-routestopped
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ROUTESTOP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ROUTESTOP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-rtrules.5 shorewall-4.5.5.3/manpages/shorewall-rtrules.5
--- shorewall-4.5.5.1/manpages/shorewall-rtrules.5	2012-06-14 16:13:42.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-rtrules.5	2012-06-28 11:01:44.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-rtrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-RTRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-RTRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-rules.5 shorewall-4.5.5.3/manpages/shorewall-rules.5
--- shorewall-4.5.5.1/manpages/shorewall-rules.5	2012-06-14 16:13:45.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-rules.5	2012-06-28 11:01:47.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-rules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-RULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-RULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-secmarks.5 shorewall-4.5.5.3/manpages/shorewall-secmarks.5
--- shorewall-4.5.5.1/manpages/shorewall-secmarks.5	2012-06-14 16:13:47.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-secmarks.5	2012-06-28 11:01:49.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-secmarks
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-SECMARKS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-SECMARKS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcclasses.5 shorewall-4.5.5.3/manpages/shorewall-tcclasses.5
--- shorewall-4.5.5.1/manpages/shorewall-tcclasses.5	2012-06-14 16:13:49.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcclasses.5	2012-06-28 11:01:51.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcclasses
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCCLASSES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCCLASSES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcdevices.5 shorewall-4.5.5.3/manpages/shorewall-tcdevices.5
--- shorewall-4.5.5.1/manpages/shorewall-tcdevices.5	2012-06-14 16:13:51.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcdevices.5	2012-06-28 11:01:53.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcdevices
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCDEVICES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCDEVICES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcfilters.5 shorewall-4.5.5.3/manpages/shorewall-tcfilters.5
--- shorewall-4.5.5.1/manpages/shorewall-tcfilters.5	2012-06-14 16:13:53.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcfilters.5	2012-06-28 11:01:56.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcfilters
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCFILTERS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCFILTERS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcinterfaces.5 shorewall-4.5.5.3/manpages/shorewall-tcinterfaces.5
--- shorewall-4.5.5.1/manpages/shorewall-tcinterfaces.5	2012-06-14 16:13:56.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcinterfaces.5	2012-06-28 11:01:58.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcinterfaces
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCINTERFA" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCINTERFA" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcpri.5 shorewall-4.5.5.3/manpages/shorewall-tcpri.5
--- shorewall-4.5.5.1/manpages/shorewall-tcpri.5	2012-06-14 16:13:58.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcpri.5	2012-06-28 11:02:00.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcpri
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCPRI" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCPRI" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tcrules.5 shorewall-4.5.5.3/manpages/shorewall-tcrules.5
--- shorewall-4.5.5.1/manpages/shorewall-tcrules.5	2012-06-14 16:14:00.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tcrules.5	2012-06-28 11:02:02.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tcrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TCRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TCRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tos.5 shorewall-4.5.5.3/manpages/shorewall-tos.5
--- shorewall-4.5.5.1/manpages/shorewall-tos.5	2012-06-14 16:14:02.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tos.5	2012-06-28 11:02:04.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tos
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TOS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TOS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-tunnels.5 shorewall-4.5.5.3/manpages/shorewall-tunnels.5
--- shorewall-4.5.5.1/manpages/shorewall-tunnels.5	2012-06-14 16:14:04.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-tunnels.5	2012-06-28 11:02:06.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-tunnels
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-TUNNELS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-TUNNELS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-vardir.5 shorewall-4.5.5.3/manpages/shorewall-vardir.5
--- shorewall-4.5.5.1/manpages/shorewall-vardir.5	2012-06-14 16:14:06.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-vardir.5	2012-06-28 11:02:08.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-vardir
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-VARDIR" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-VARDIR" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall-zones.5 shorewall-4.5.5.3/manpages/shorewall-zones.5
--- shorewall-4.5.5.1/manpages/shorewall-zones.5	2012-06-14 16:14:11.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall-zones.5	2012-06-28 11:02:13.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-zones
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-ZONES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-ZONES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall.8 shorewall-4.5.5.3/manpages/shorewall.8
--- shorewall-4.5.5.1/manpages/shorewall.8	2012-06-14 16:14:09.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall.8	2012-06-28 11:02:11.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/manpages/shorewall.conf.5 shorewall-4.5.5.3/manpages/shorewall.conf.5
--- shorewall-4.5.5.1/manpages/shorewall.conf.5	2012-06-14 16:13:01.000000000 -0400
+++ shorewall-4.5.5.3/manpages/shorewall.conf.5	2012-06-28 11:01:03.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\&.CONF" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\&.CONF" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-4.5.5.1/releasenotes.txt shorewall-4.5.5.3/releasenotes.txt
--- shorewall-4.5.5.1/releasenotes.txt	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/releasenotes.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall-4.5.5.1/shorewall.spec shorewall-4.5.5.3/shorewall.spec
--- shorewall-4.5.5.1/shorewall.spec	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/shorewall.spec	2012-06-28 11:00:50.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 4.5.5
-%define release 1
+%define release 3
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -118,6 +118,10 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall-4.5.5.1/uninstall.sh shorewall-4.5.5.3/uninstall.sh
--- shorewall-4.5.5.1/uninstall.sh	2012-06-14 16:12:48.000000000 -0400
+++ shorewall-4.5.5.3/uninstall.sh	2012-06-28 11:00:50.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

diff -Nru shorewall6-4.5.5.1/changelog.txt shorewall6-4.5.5.3/changelog.txt
--- shorewall6-4.5.5.1/changelog.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/changelog.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall6-4.5.5.1/configfiles/providers.annotated shorewall6-4.5.5.3/configfiles/providers.annotated
--- shorewall6-4.5.5.1/configfiles/providers.annotated	2012-06-14 09:43:44.000000000 -0400
+++ shorewall6-4.5.5.3/configfiles/providers.annotated	2012-06-28 11:05:13.000000000 -0400
@@ -136,7 +136,7 @@
 #         shorewall-tcrules(5). See http://www.shorewall.net/
 #         Shorewall_Squid_Usage.html. When specified, the MARK, DUPLICATE and
 #         GATEWAY columns should be empty, INTERFACE should be set to 'lo' and
-#         tproxy should be the only OPTION.
+#         tproxy should be the only OPTION. Only one tproxy provider is allowed.
 # 
 # COPY - [{none|interface[,interface]...}]
 # 
diff -Nru shorewall6-4.5.5.1/configfiles/tcfilters.annotated shorewall6-4.5.5.3/configfiles/tcfilters.annotated
--- shorewall6-4.5.5.1/configfiles/tcfilters.annotated	2012-06-14 09:44:00.000000000 -0400
+++ shorewall6-4.5.5.3/configfiles/tcfilters.annotated	2012-06-28 11:05:28.000000000 -0400
@@ -15,7 +15,7 @@
 # 
 # IPV4
 # 
-#     Following entriess apply to IPv4.
+#     Following entries apply to IPv4.
 # 
 # IPV6
 # 
diff -Nru shorewall6-4.5.5.1/configure shorewall6-4.5.5.3/configure
--- shorewall6-4.5.5.1/configure	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/configure	2012-06-28 11:00:50.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall6-4.5.5.1/configure.pl shorewall6-4.5.5.3/configure.pl
--- shorewall6-4.5.5.1/configure.pl	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/configure.pl	2012-06-28 11:00:50.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall6-4.5.5.1/debian/changelog shorewall6-4.5.5.3/debian/changelog
--- shorewall6-4.5.5.1/debian/changelog	2012-06-17 14:13:56.000000000 -0400
+++ shorewall6-4.5.5.3/debian/changelog	2012-07-02 19:27:19.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall6 (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:27:10 -0400
+
 shorewall6 (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall6-4.5.5.1/install.sh shorewall6-4.5.5.3/install.sh
--- shorewall6-4.5.5.1/install.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/install.sh	2012-06-28 11:00:50.000000000 -0400
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 #
 # Change to the directory containing this script
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-accounting.5 shorewall6-4.5.5.3/manpages/shorewall6-accounting.5
--- shorewall6-4.5.5.1/manpages/shorewall6-accounting.5	2012-06-14 09:42:18.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-accounting.5	2012-06-28 11:03:46.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-accounting
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-ACCOUNTI" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-ACCOUNTI" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-actions.5 shorewall6-4.5.5.3/manpages/shorewall6-actions.5
--- shorewall6-4.5.5.1/manpages/shorewall6-actions.5	2012-06-14 09:42:20.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-actions.5	2012-06-28 11:03:48.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-actions
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-ACTIONS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-ACTIONS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-blacklist.5 shorewall6-4.5.5.3/manpages/shorewall6-blacklist.5
--- shorewall6-4.5.5.1/manpages/shorewall6-blacklist.5	2012-06-14 09:42:22.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-blacklist.5	2012-06-28 11:03:50.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-blacklist
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-BLACKLIS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-BLACKLIS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-blrules.5 shorewall6-4.5.5.3/manpages/shorewall6-blrules.5
--- shorewall6-4.5.5.1/manpages/shorewall6-blrules.5	2012-06-14 09:42:24.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-blrules.5	2012-06-28 11:03:53.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-blrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-BLRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-BLRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-exclusion.5 shorewall6-4.5.5.3/manpages/shorewall6-exclusion.5
--- shorewall6-4.5.5.1/manpages/shorewall6-exclusion.5	2012-06-14 09:42:30.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-exclusion.5	2012-06-28 11:03:58.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-exclusion
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-EXCLUSIO" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-EXCLUSIO" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-hosts.5 shorewall6-4.5.5.3/manpages/shorewall6-hosts.5
--- shorewall6-4.5.5.1/manpages/shorewall6-hosts.5	2012-06-14 09:42:32.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-hosts.5	2012-06-28 11:04:00.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-hosts
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-HOSTS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-HOSTS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-interfaces.5 shorewall6-4.5.5.3/manpages/shorewall6-interfaces.5
--- shorewall6-4.5.5.1/manpages/shorewall6-interfaces.5	2012-06-14 09:42:34.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-interfaces.5	2012-06-28 11:04:02.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-interfaces
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-INTERFAC" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-INTERFAC" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-ipsets.5 shorewall6-4.5.5.3/manpages/shorewall6-ipsets.5
--- shorewall6-4.5.5.1/manpages/shorewall6-ipsets.5	2012-06-14 09:42:36.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-ipsets.5	2012-06-28 11:04:04.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-ipsets
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-IPSETS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-IPSETS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-maclist.5 shorewall6-4.5.5.3/manpages/shorewall6-maclist.5
--- shorewall6-4.5.5.1/manpages/shorewall6-maclist.5	2012-06-14 09:42:38.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-maclist.5	2012-06-28 11:04:06.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-maclist
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-MACLIST" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-MACLIST" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-modules.5 shorewall6-4.5.5.3/manpages/shorewall6-modules.5
--- shorewall6-4.5.5.1/manpages/shorewall6-modules.5	2012-06-14 09:42:40.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-modules.5	2012-06-28 11:04:08.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-modules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-MODULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-MODULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-nesting.5 shorewall6-4.5.5.3/manpages/shorewall6-nesting.5
--- shorewall6-4.5.5.1/manpages/shorewall6-nesting.5	2012-06-14 09:42:42.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-nesting.5	2012-06-28 11:04:11.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-nesting
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-NESTING" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-NESTING" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-netmap.5 shorewall6-4.5.5.3/manpages/shorewall6-netmap.5
--- shorewall6-4.5.5.1/manpages/shorewall6-netmap.5	2012-06-14 09:42:44.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-netmap.5	2012-06-28 11:04:13.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-netmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-NETMAP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-NETMAP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-notrack.5 shorewall6-4.5.5.3/manpages/shorewall6-notrack.5
--- shorewall6-4.5.5.1/manpages/shorewall6-notrack.5	2012-06-14 09:42:46.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-notrack.5	2012-06-28 11:04:15.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-notrack
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-NOTRACK" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-NOTRACK" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-params.5 shorewall6-4.5.5.3/manpages/shorewall6-params.5
--- shorewall6-4.5.5.1/manpages/shorewall6-params.5	2012-06-14 09:42:48.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-params.5	2012-06-28 11:04:17.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shoewall6-netmap(5),shorewall6-params
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOEWALL6\-NETMAP(5)" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOEWALL6\-NETMAP(5)" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-policy.5 shorewall6-4.5.5.3/manpages/shorewall6-policy.5
--- shorewall6-4.5.5.1/manpages/shorewall6-policy.5	2012-06-14 09:42:50.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-policy.5	2012-06-28 11:04:19.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-policy
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-POLICY" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-POLICY" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-providers.5 shorewall6-4.5.5.3/manpages/shorewall6-providers.5
--- shorewall6-4.5.5.1/manpages/shorewall6-providers.5	2012-06-14 09:42:52.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-providers.5	2012-06-28 11:04:21.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-providers
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-PROVIDER" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-PROVIDER" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -198,7 +198,9 @@
 Added in Shorewall 4\&.5\&.4\&. Used for supporting the TPROXY action in shorewall\-tcrules(5)\&. See
 \m[blue]\fBhttp://www\&.shorewall\&.net/Shorewall_Squid_Usage\&.html\fR\m[]\&;. When specified, the MARK, DUPLICATE and GATEWAY columns should be empty, INTERFACE should be set to \*(Aqlo\*(Aq and
 \fBtproxy\fR
-should be the only OPTION\&.
+should be the only OPTION\&. Only one
+\fBtproxy\fR
+provider is allowed\&.
 .RE
 .RE
 .PP
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-proxyndp.5 shorewall6-4.5.5.3/manpages/shorewall6-proxyndp.5
--- shorewall6-4.5.5.1/manpages/shorewall6-proxyndp.5	2012-06-14 09:42:54.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-proxyndp.5	2012-06-28 11:04:23.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-proxyndp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-PROXYNDP" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-PROXYNDP" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-routes.5 shorewall6-4.5.5.3/manpages/shorewall6-routes.5
--- shorewall6-4.5.5.1/manpages/shorewall6-routes.5	2012-06-14 09:42:58.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-routes.5	2012-06-28 11:04:27.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-routes
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-ROUTES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-ROUTES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-routestopped.5 shorewall6-4.5.5.3/manpages/shorewall6-routestopped.5
--- shorewall6-4.5.5.1/manpages/shorewall6-routestopped.5	2012-06-14 09:42:56.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-routestopped.5	2012-06-28 11:04:25.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-routestopped
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-ROUTESTO" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-ROUTESTO" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-rtrules.5 shorewall6-4.5.5.3/manpages/shorewall6-rtrules.5
--- shorewall6-4.5.5.1/manpages/shorewall6-rtrules.5	2012-06-14 09:43:00.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-rtrules.5	2012-06-28 11:04:29.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-rtrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-RTRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-RTRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-rules.5 shorewall6-4.5.5.3/manpages/shorewall6-rules.5
--- shorewall6-4.5.5.1/manpages/shorewall6-rules.5	2012-06-14 09:43:03.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-rules.5	2012-06-28 11:04:31.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-rules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-RULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-RULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-secmarks.5 shorewall6-4.5.5.3/manpages/shorewall6-secmarks.5
--- shorewall6-4.5.5.1/manpages/shorewall6-secmarks.5	2012-06-14 09:43:05.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-secmarks.5	2012-06-28 11:04:33.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-secmarks
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-SECMARKS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-SECMARKS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcclasses.5 shorewall6-4.5.5.3/manpages/shorewall6-tcclasses.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcclasses.5	2012-06-14 09:43:07.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcclasses.5	2012-06-28 11:04:35.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcclasses
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCCLASSE" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCCLASSE" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcdevices.5 shorewall6-4.5.5.3/manpages/shorewall6-tcdevices.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcdevices.5	2012-06-14 09:43:09.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcdevices.5	2012-06-28 11:04:38.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcdevices
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCDEVICE" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCDEVICE" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcfilters.5 shorewall6-4.5.5.3/manpages/shorewall6-tcfilters.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcfilters.5	2012-06-14 09:43:11.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcfilters.5	2012-06-28 11:04:40.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcfilters
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCFILTER" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCFILTER" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 .PP
 IPV4
 .RS 4
-Following entriess apply to IPv4\&.
+Following entries apply to IPv4\&.
 .RE
 .PP
 IPV6
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcinterfaces.5 shorewall6-4.5.5.3/manpages/shorewall6-tcinterfaces.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcinterfaces.5	2012-06-14 09:43:13.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcinterfaces.5	2012-06-28 11:04:42.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcinterfaces
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCINTERF" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCINTERF" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcpri.5 shorewall6-4.5.5.3/manpages/shorewall6-tcpri.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcpri.5	2012-06-14 09:43:15.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcpri.5	2012-06-28 11:04:44.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcpri
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCPRI" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCPRI" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tcrules.5 shorewall6-4.5.5.3/manpages/shorewall6-tcrules.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tcrules.5	2012-06-14 09:43:17.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tcrules.5	2012-06-28 11:04:46.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tcrules
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TCRULES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TCRULES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tos.5 shorewall6-4.5.5.3/manpages/shorewall6-tos.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tos.5	2012-06-14 09:43:19.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tos.5	2012-06-28 11:04:48.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tos
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TOS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TOS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-tunnels.5 shorewall6-4.5.5.3/manpages/shorewall6-tunnels.5
--- shorewall6-4.5.5.1/manpages/shorewall6-tunnels.5	2012-06-14 09:43:21.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-tunnels.5	2012-06-28 11:04:50.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-tunnels
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-TUNNELS" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-TUNNELS" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-vardir.5 shorewall6-4.5.5.3/manpages/shorewall6-vardir.5
--- shorewall6-4.5.5.1/manpages/shorewall6-vardir.5	2012-06-14 09:43:23.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-vardir.5	2012-06-28 11:04:52.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-vardir
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-VARDIR" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-VARDIR" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6-zones.5 shorewall6-4.5.5.3/manpages/shorewall6-zones.5
--- shorewall6-4.5.5.1/manpages/shorewall6-zones.5	2012-06-14 09:43:28.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6-zones.5	2012-06-28 11:04:57.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-zones
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-ZONES" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-ZONES" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6.8 shorewall6-4.5.5.3/manpages/shorewall6.8
--- shorewall6-4.5.5.1/manpages/shorewall6.8	2012-06-14 09:43:26.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6.8	2012-06-28 11:04:54.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/manpages/shorewall6.conf.5 shorewall6-4.5.5.3/manpages/shorewall6.conf.5
--- shorewall6-4.5.5.1/manpages/shorewall6.conf.5	2012-06-14 09:42:27.000000000 -0400
+++ shorewall6-4.5.5.3/manpages/shorewall6.conf.5	2012-06-28 11:03:56.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\&.CONF" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\&.CONF" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-4.5.5.1/releasenotes.txt shorewall6-4.5.5.3/releasenotes.txt
--- shorewall6-4.5.5.1/releasenotes.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/releasenotes.txt	2012-06-28 11:00:50.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall6-4.5.5.1/shorewall6.spec shorewall6-4.5.5.3/shorewall6.spec
--- shorewall6-4.5.5.1/shorewall6.spec	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/shorewall6.spec	2012-06-28 11:00:50.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall6
 %define version 4.5.5
-%define release 1
+%define release 3
 
 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -107,6 +107,10 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall6-4.5.5.1/uninstall.sh shorewall6-4.5.5.3/uninstall.sh
--- shorewall6-4.5.5.1/uninstall.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-4.5.5.3/uninstall.sh	2012-06-28 11:00:50.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

diff -Nru shorewall-lite-4.5.5.1/changelog.txt shorewall-lite-4.5.5.3/changelog.txt
--- shorewall-lite-4.5.5.1/changelog.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/changelog.txt	2012-06-28 11:00:51.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall-lite-4.5.5.1/configure shorewall-lite-4.5.5.3/configure
--- shorewall-lite-4.5.5.1/configure	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/configure	2012-06-28 11:00:51.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall-lite-4.5.5.1/configure.pl shorewall-lite-4.5.5.3/configure.pl
--- shorewall-lite-4.5.5.1/configure.pl	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/configure.pl	2012-06-28 11:00:51.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall-lite-4.5.5.1/debian/changelog shorewall-lite-4.5.5.3/debian/changelog
--- shorewall-lite-4.5.5.1/debian/changelog	2012-06-17 14:14:17.000000000 -0400
+++ shorewall-lite-4.5.5.3/debian/changelog	2012-07-02 19:27:39.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall-lite (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:27:27 -0400
+
 shorewall-lite (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall-lite-4.5.5.1/install.sh shorewall-lite-4.5.5.3/install.sh
--- shorewall-lite-4.5.5.1/install.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/install.sh	2012-06-28 11:00:51.000000000 -0400
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {
diff -Nru shorewall-lite-4.5.5.1/manpages/shorewall-lite-vardir.5 shorewall-lite-4.5.5.3/manpages/shorewall-lite-vardir.5
--- shorewall-lite-4.5.5.1/manpages/shorewall-lite-vardir.5	2012-06-14 09:44:51.000000000 -0400
+++ shorewall-lite-4.5.5.3/manpages/shorewall-lite-vardir.5	2012-06-28 11:06:20.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-lite-vardir
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-LITE\-VAR" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE\-VAR" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-lite-4.5.5.1/manpages/shorewall-lite.8 shorewall-lite-4.5.5.3/manpages/shorewall-lite.8
--- shorewall-lite-4.5.5.1/manpages/shorewall-lite.8	2012-06-14 09:44:53.000000000 -0400
+++ shorewall-lite-4.5.5.3/manpages/shorewall-lite.8	2012-06-28 11:06:22.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-lite
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-LITE" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-lite-4.5.5.1/manpages/shorewall-lite.conf.5 shorewall-lite-4.5.5.3/manpages/shorewall-lite.conf.5
--- shorewall-lite-4.5.5.1/manpages/shorewall-lite.conf.5	2012-06-14 09:44:48.000000000 -0400
+++ shorewall-lite-4.5.5.3/manpages/shorewall-lite.conf.5	2012-06-28 11:06:17.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall-lite.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL\-LITE\&.CO" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL\-LITE\&.CO" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall-lite-4.5.5.1/releasenotes.txt shorewall-lite-4.5.5.3/releasenotes.txt
--- shorewall-lite-4.5.5.1/releasenotes.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/releasenotes.txt	2012-06-28 11:00:51.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall-lite-4.5.5.1/shorewall-lite.spec shorewall-lite-4.5.5.3/shorewall-lite.spec
--- shorewall-lite-4.5.5.1/shorewall-lite.spec	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/shorewall-lite.spec	2012-06-28 11:00:51.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.5.5
-%define release 1
+%define release 3
 %define initdir /etc/init.d
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -105,6 +105,10 @@
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall-lite-4.5.5.1/uninstall.sh shorewall-lite-4.5.5.3/uninstall.sh
--- shorewall-lite-4.5.5.1/uninstall.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall-lite-4.5.5.3/uninstall.sh	2012-06-28 11:00:51.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

diff -Nru shorewall6-lite-4.5.5.1/changelog.txt shorewall6-lite-4.5.5.3/changelog.txt
--- shorewall6-lite-4.5.5.1/changelog.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/changelog.txt	2012-06-28 11:00:51.000000000 -0400
@@ -1,3 +1,33 @@
+Changes in 4.5.5.3
+
+1)  Correct a Perl trap caused by using logical names with 'classify'.
+
+2)  Ensure that exclusion chains always have the 'DONT_MOVE' flag set.
+
+Changes in 4.5.5.2
+
+1)  Allow UID/GID ranges in the USER/GROUP column (undocumented)
+
+2)  Don't use '--ctmark' when saving marks.
+
+3)  Display PROXY_MARK in 'show marks'.
+
+4)  Another fix for nested ?IFs
+
+Changes in 4.5.5.1
+
+1)  Fix handling of multiple fallback providers.
+
+2)  Allow logical device names in the REDIRECTED column.
+
+Changes in 4.5.5 Final
+
+1)  Restore fix to configure script.
+
+2)  Fix installer's handling of SYSCONFDIR
+
+3)  Add DIGEST support.
+
 Changes in 4.5.5 RC 1
 
 1)  Change in 'ignore' behavior.
diff -Nru shorewall6-lite-4.5.5.1/configure shorewall6-lite-4.5.5.3/configure
--- shorewall6-lite-4.5.5.1/configure	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/configure	2012-06-28 11:00:51.000000000 -0400
@@ -28,7 +28,7 @@
 #
 # Build updates this
 #
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 case "$BASH_VERSION" in
     [4-9].*)
diff -Nru shorewall6-lite-4.5.5.1/configure.pl shorewall6-lite-4.5.5.3/configure.pl
--- shorewall6-lite-4.5.5.1/configure.pl	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/configure.pl	2012-06-28 11:00:51.000000000 -0400
@@ -31,7 +31,7 @@
 # Build updates this
 #
 use constant {
-    VERSION => '4.5.5.1'
+    VERSION => '4.5.5.3'
 };
 
 my %params;
diff -Nru shorewall6-lite-4.5.5.1/debian/changelog shorewall6-lite-4.5.5.3/debian/changelog
--- shorewall6-lite-4.5.5.1/debian/changelog	2012-06-17 14:14:59.000000000 -0400
+++ shorewall6-lite-4.5.5.3/debian/changelog	2012-07-02 19:28:00.000000000 -0400
@@ -1,3 +1,9 @@
+shorewall6-lite (4.5.5.3-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Mon, 02 Jul 2012 19:27:53 -0400
+
 shorewall6-lite (4.5.5.1-1) unstable; urgency=low
 
   * New Upstream Version
diff -Nru shorewall6-lite-4.5.5.1/install.sh shorewall6-lite-4.5.5.3/install.sh
--- shorewall6-lite-4.5.5.1/install.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/install.sh	2012-06-28 11:00:51.000000000 -0400
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {
diff -Nru shorewall6-lite-4.5.5.1/manpages/shorewall6-lite-vardir.5 shorewall6-lite-4.5.5.3/manpages/shorewall6-lite-vardir.5
--- shorewall6-lite-4.5.5.1/manpages/shorewall6-lite-vardir.5	2012-06-14 09:44:57.000000000 -0400
+++ shorewall6-lite-4.5.5.3/manpages/shorewall6-lite-vardir.5	2012-06-28 11:06:26.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-lite-vardir
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-LITE\-VA" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-LITE\-VA" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-lite-4.5.5.1/manpages/shorewall6-lite.8 shorewall6-lite-4.5.5.3/manpages/shorewall6-lite.8
--- shorewall6-lite-4.5.5.1/manpages/shorewall6-lite.8	2012-06-14 09:44:59.000000000 -0400
+++ shorewall6-lite-4.5.5.3/manpages/shorewall6-lite.8	2012-06-28 11:06:28.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-lite
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-LITE" "8" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-LITE" "8" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-lite-4.5.5.1/manpages/shorewall6-lite.conf.5 shorewall6-lite-4.5.5.3/manpages/shorewall6-lite.conf.5
--- shorewall6-lite-4.5.5.1/manpages/shorewall6-lite.conf.5	2012-06-14 09:44:55.000000000 -0400
+++ shorewall6-lite-4.5.5.3/manpages/shorewall6-lite.conf.5	2012-06-28 11:06:24.000000000 -0400
@@ -2,12 +2,12 @@
 .\"     Title: shorewall6-lite.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2012
+.\"      Date: 06/28/2012
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: English
 .\"
-.TH "SHOREWALL6\-LITE\&.C" "5" "06/14/2012" "[FIXME: source]" "[FIXME: manual]"
+.TH "SHOREWALL6\-LITE\&.C" "5" "06/28/2012" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru shorewall6-lite-4.5.5.1/releasenotes.txt shorewall6-lite-4.5.5.3/releasenotes.txt
--- shorewall6-lite-4.5.5.1/releasenotes.txt	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/releasenotes.txt	2012-06-28 11:00:51.000000000 -0400
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------------
-		     S H O R E W A L L  4 . 5 . 5 . 1
+		     S H O R E W A L L  4 . 5 . 5 . 3
                    ------------------------------------
-                           J u n e  1 7 ,  2 0 1 2
+                           J u n e  2 8 ,  2 0 1 2
 ----------------------------------------------------------------------------
 
 I.    PROBLEMS CORRECTED IN THIS RELEASE
@@ -15,6 +15,42 @@
   I.  P R O B L E M S   C O R R E C T E D   I N   T H I S  R E L E A S E
 ----------------------------------------------------------------------------
 
+4.5.5.3
+
+1)  When logical interface names were used, an entry in tcrules that
+    included a classid could result in the compiler failing with this
+    Perl diagnostic:
+
+      Can't use an undefined value as an ARRAY reference at
+      /usr/share/shorewall/Shorewall/Tc.pm line nnn, <$currentfile>
+      line 20.
+
+4.5.5.2
+
+1)  Previously, when ipp2p was used in the /etc/shorewall/tcpri file,
+    the generated code for saving the packet mark was clearing the
+    connection marks fields not having to do with traffic shaping. It
+    now only alters the traffic-shaping part of the connection mark.
+
+2)  Shorewall 4.4.11 allowed UID and GID ranges to be specified in the
+    USER:GROUP column of the rules file. That undocumented capability
+    has been restored for the benefit of Debian users upgrading from
+    Squeeze to Wheezy.
+
+3)  The special TPROXY mark value is now shown in the output of
+    'shorewall show marks'.
+
+4)  Assuming that A = 0 and B = 1, the following conditionals
+    previously produced incorrect results:
+
+      ?IF $A
+      ?IF $B
+      <text>
+      ?ENDIF
+      ?ENDIF
+
+    The <text> was included when it should have been omitted.
+
 4.5.5.1
 
 1)  The change in Shorewall 4.5.4 that cleared the 'default' table if
@@ -28,7 +64,7 @@
 
 2)  When a logical device name was specified in the REDIRECTED
     INTERFACES column of /etc/shorewall/tcdevices, that name was used
-    in the generated script rather than the devices's physical
+    in the generated script rather than the device's physical
     name. Unless the two were the same, this caused start/restart
     failure. Shorewall now uses the physical name.
 
diff -Nru shorewall6-lite-4.5.5.1/shorewall6-lite.spec shorewall6-lite-4.5.5.3/shorewall6-lite.spec
--- shorewall6-lite-4.5.5.1/shorewall6-lite.spec	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/shorewall6-lite.spec	2012-06-28 11:00:51.000000000 -0400
@@ -1,6 +1,6 @@
 %define name shorewall6-lite
 %define version 4.5.5
-%define release 1
+%define release 3
 
 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
 Name: %{name}
@@ -95,6 +95,10 @@
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Thu Jun 28 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-3
+* Fri Jun 22 2012 Tom Eastep tom@shorewall.net
+- Updated to 4.5.5-2
 * Tue Jun 12 2012 Tom Eastep tom@shorewall.net
 - Updated to 4.5.5-1
 * Sat Jun 09 2012 Tom Eastep tom@shorewall.net
diff -Nru shorewall6-lite-4.5.5.1/uninstall.sh shorewall6-lite-4.5.5.3/uninstall.sh
--- shorewall6-lite-4.5.5.1/uninstall.sh	2012-06-14 09:39:22.000000000 -0400
+++ shorewall6-lite-4.5.5.3/uninstall.sh	2012-06-28 11:00:51.000000000 -0400
@@ -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.5.5.1
+VERSION=4.5.5.3
 
 usage() # $1 = exit status
 {

Attachment: signature.asc
Description: Digital signature

Reply to:

Follow-Ups:
- Re: Pre-approval request for upload of shorewall-* packages
  - From: Mehdi Dogguy <mehdi@dogguy.org>

Prev by Date: Bug#680024: unblock: xli/1.17.0+20061110-4
Next by Date: Requesting freeze exception for alpine
Previous by thread: Bug#680024: marked as done (unblock: xli/1.17.0+20061110-4)
Next by thread: Re: Pre-approval request for upload of shorewall-* packages
Index(es):
- Date
- Thread