Upload pre-approval for shorewall/4.4.11.6-2

[Roberto C. Sánchez <roberto@connexer.com>]

Release team,

I would like approval to upload shorewall/4.4.11.6-2.  Please see the
attached diff for all of the changes.

Regards,

-Roberto

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

diff --git a/Perl/Shorewall/Tc.pm b/Perl/Shorewall/Tc.pm
index 86808e6..fad39b7 100644
--- a/Perl/Shorewall/Tc.pm
+++ b/Perl/Shorewall/Tc.pm
@@ -1279,7 +1279,7 @@ sub setup_traffic_shaping() {
 	my $tcref    = $tcclasses{$device}{$decimalclassnum};
 	my $mark     = $tcref->{mark};
 	my $devicenumber  = in_hexp $devref->{number};
-	my $classid  = join( ':', in_hexp $devicenumber, $classnum);
+	my $classid  = join( ':', $devicenumber, $classnum);
 	my $rate     = "$tcref->{rate}kbit";
 	my $quantum  = calculate_quantum $rate, calculate_r2q( $devref->{out_bandwidth} );
 
@@ -1304,15 +1304,15 @@ sub setup_traffic_shaping() {
 	emit ( "[ \$${dev}_mtu -gt $quantum ] && quantum=\$${dev}_mtu || quantum=$quantum" );
 
 	if ( $devref->{qdisc} eq 'htb' ) {
-	    emit ( "run_tc class add dev $device parent $devref->{number}:$parent classid $classid htb rate $rate ceil $tcref->{ceiling}kbit prio $tcref->{priority} \$${dev}_mtu1 quantum \$quantum" );
+	    emit ( "run_tc class add dev $device parent $devicenumber:$parent classid $classid htb rate $rate ceil $tcref->{ceiling}kbit prio $tcref->{priority} \$${dev}_mtu1 quantum \$quantum" );
 	} else {
 	    my $dmax = $tcref->{dmax};
 
 	    if ( $dmax ) {
 		my $umax = $tcref->{umax} ? "$tcref->{umax}b" : "\${${dev}_mtu}b";
-		emit ( "run_tc class add dev $device parent $devref->{number}:$parent classid $classid hfsc sc umax $umax dmax ${dmax}ms rate $rate ul rate $tcref->{ceiling}kbit" );
+		emit ( "run_tc class add dev $device parent $devicenumber:$parent classid $classid hfsc sc umax $umax dmax ${dmax}ms rate $rate ul rate $tcref->{ceiling}kbit" );
 	    } else {
-		emit ( "run_tc class add dev $device parent $devref->{number}:$parent classid $classid hfsc sc rate $rate ul rate $tcref->{ceiling}kbit" );
+		emit ( "run_tc class add dev $device parent $devicenumber:$parent classid $classid hfsc sc rate $rate ul rate $tcref->{ceiling}kbit" );
 	    }
 	}
 
diff --git a/changelog.txt b/changelog.txt
index 5b2676f..2970dad 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+Changes post 4.4.11.6
+
+1) Fix 10+ TC Interfaces.
+
 Changes in Shorewall 4.4.11.6
 
 1)  Fix log reading in -lite packages.
diff --git a/debian/changelog b/debian/changelog
index 1ce46d8..6009942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+shorewall (4.4.11.6-2) unstable; urgency=low
+
+  * Incorporate patch from upstream: "Fix 10+ TC Interfaces."
+
+ -- Roberto C. Sanchez <roberto@connexer.com>  Thu, 28 Oct 2010 22:12:15 -0400
+
 shorewall (4.4.11.6-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/known_problems.txt b/known_problems.txt
index c3cc35a..002f4cb 100644
--- a/known_problems.txt
+++ b/known_problems.txt
@@ -147,3 +147,17 @@
     showed an empty log when issued to one of the -lite packages.
 
     Corrected in Shorewall 4.4.11.6
+
+22) If 10 or more interfaces are configured in Complex Traffic Shaping
+    (/etc/shorewall/tcdevices), the following compilation diagnostic
+    is issued:
+
+        Argument "a" isn't numeric in sprintf at
+	/usr/share/shorewall/Shorewall/Config.pm line 893.
+ 
+    and an invalid TC configuration is generated.
+
+    A fix is available at
+    http://shorewall.git.sourceforge.net/git/gitweb.cgi?p=shorewall/shorewall;a=commitdiff;h=20bb781874c739c01b798d2db31b6c1d9cfefe96
+
+
diff --git a/releasenotes.txt b/releasenotes.txt
index 43ef45e..b0671fb 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -218,6 +218,17 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
 I I 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
 ----------------------------------------------------------------------------
 
+Post-4.4.11.6
+
+1)  Previously, if 10 or more interfaces were configured in Complex
+    Traffic Shaping (/etc/shorewall/tcdevices), the following
+    compilation diagnostic was generated:
+
+        Argument "a" isn't numeric in sprintf at
+	/usr/share/shorewall/Shorewall/Config.pm line 893.
+
+    and an invalid TC configuration was generated.
+
 4.4.11.6
 
 1)  The Shorewall-lite and Shorewall6-lite Debian init scripts contained a

Attachment: signature.asc
Description: Digital signature