Package: release.debian.org Severity: normal -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
A user has reported a bug to the upstream shorewall-users mailing list. The fix is a trivial 2-line patch. I have built and uploaded an updated version of shorewall. I would appreciate an unblock. A complete diff and diffstat are attached. Regards, - -Roberto - -- System Information: Debian Release: 5.0.7 APT prefers stable APT policy: (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.26-2-686 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iQIcBAEBCAAGBQJM8xRTAAoJECzXeF7dp7IPIJQQAJF/+lluXEqCUpuy82wB6rbM jk5/M4r+lOboMtsXfyS41U5Kt2kafgSH6cCStp2GQTWDr3cA9HB72Y+li7PUjdTi F2NQYIUDZvCbTBlS+L4VglGPkg1ojgWWqUhk3lGKnMQ5H5v2BR3tDZVG+RfugpEU cT45tHdFleSDuoJhC9P24tGode1mN8884Facfhgr3QuPFiPeBGSk6aicm0KSANbo 7bjxcC/Ave31kxx5jzP1OigmQRFdAc9kz4JDzjRj5RlgDs7aqPVZSRow1hk0npYd o0rNs6eOtcyWByWd39vPRfIOaxVTxIyylSvJdGLjyQ/bOw6KkH3/eBnFAEp4QxPY t0gLYMY65uksc6YtDFj/Y9mPkSBRlISWbLYMiEzkmLWR9krlUyt/fgVkB6uhVaXl 7W676H/L3cUdueLnSys8KiD9Y9GwFqSqBBNleKwgsiSPKLFe5SkcfypBn3onh3Eo vrOCETZXHNtdvZuOk8npWy4vAIHB/idcZVvbX1xHU/FnRAHa5D4zJP3G19y0eEVa uDQU8FmU2HkRwWLvw0DncqkgQvXTYDoYgyLxJSdj3klCJ4K3oOZmndfdq8XXfuom BY8dIKAl8dDhmAM5PvpjFP7MhOE07T0+OKKAfjMWhH34ETBzHzlmMMz0fqQ13ntO jTpiMWfcXJjuZuou+yuW =E7+K -----END PGP SIGNATURE-----
diff -Nru shorewall-4.4.11.6/debian/changelog shorewall-4.4.11.6/debian/changelog --- shorewall-4.4.11.6/debian/changelog 2010-10-28 22:24:07.000000000 -0400 +++ shorewall-4.4.11.6/debian/changelog 2010-11-28 21:36:22.000000000 -0500 @@ -1,3 +1,9 @@ +shorewall (4.4.11.6-3) unstable; urgency=low + + * Fix macro.JAP to correct nested macro call. + + -- Roberto C. Sanchez <robe...@connexer.com> Sun, 28 Nov 2010 21:34:05 -0500 + shorewall (4.4.11.6-2) unstable; urgency=low * Incorporate patch from upstream: "Fix 10+ TC Interfaces." diff -Nru shorewall-4.4.11.6/debian/patches/02_macro_JAP.patch shorewall-4.4.11.6/debian/patches/02_macro_JAP.patch --- shorewall-4.4.11.6/debian/patches/02_macro_JAP.patch 1969-12-31 19:00:00.000000000 -0500 +++ shorewall-4.4.11.6/debian/patches/02_macro_JAP.patch 2010-11-28 21:36:22.000000000 -0500 @@ -0,0 +1,12 @@ +diff --git a/Macros/macro.JAP b/Macros/macro.JAP +index 86b9848..e71c35e 100644 +--- a/Macros/macro.JAP ++++ b/Macros/macro.JAP +@@ -13,5 +13,5 @@ + PARAM - - tcp 8080 # HTTP port + PARAM - - tcp 6544 # HTTP port + PARAM - - tcp 6543 # InfoService port +-HTTPS/PARAM +-SSH/PARAM ++HTTPS ++SSH diff -Nru shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-2 shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-2 --- shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-2 2010-10-28 22:26:06.000000000 -0400 +++ shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-2 1969-12-31 19:00:00.000000000 -0500 @@ -1,105 +0,0 @@ -Description: Upstream changes introduced in version 4.4.11.6-2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - shorewall (4.4.11.6-2) unstable; urgency=low - . - * Incorporate patch from upstream: "Fix 10+ TC Interfaces." - . - The person named in the Author field signed this changelog entry. -Author: Roberto C. Sanchez <robe...@connexer.com> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- shorewall-4.4.11.6.orig/known_problems.txt -+++ shorewall-4.4.11.6/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 -+ -+ ---- shorewall-4.4.11.6.orig/releasenotes.txt -+++ shorewall-4.4.11.6/releasenotes.txt -@@ -218,6 +218,17 @@ VI. PROBLEMS CORRECTED AND NEW FEATURE - 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 ---- shorewall-4.4.11.6.orig/changelog.txt -+++ shorewall-4.4.11.6/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. ---- shorewall-4.4.11.6.orig/Perl/Shorewall/Tc.pm -+++ shorewall-4.4.11.6/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 -Nru shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-3 shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-3 --- shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-3 1969-12-31 19:00:00.000000000 -0500 +++ shorewall-4.4.11.6/debian/patches/debian-changes-4.4.11.6-3 2010-11-28 21:39:09.000000000 -0500 @@ -0,0 +1,105 @@ +Description: Upstream changes introduced in version 4.4.11.6-3 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + shorewall (4.4.11.6-3) unstable; urgency=low + . + * Fix macro.JAP to correct nested macro call. + . + The person named in the Author field signed this changelog entry. +Author: Roberto C. Sanchez <robe...@connexer.com> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- shorewall-4.4.11.6.orig/known_problems.txt ++++ shorewall-4.4.11.6/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 ++ ++ +--- shorewall-4.4.11.6.orig/releasenotes.txt ++++ shorewall-4.4.11.6/releasenotes.txt +@@ -218,6 +218,17 @@ VI. PROBLEMS CORRECTED AND NEW FEATURE + 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 +--- shorewall-4.4.11.6.orig/changelog.txt ++++ shorewall-4.4.11.6/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. +--- shorewall-4.4.11.6.orig/Perl/Shorewall/Tc.pm ++++ shorewall-4.4.11.6/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 -Nru shorewall-4.4.11.6/debian/patches/series shorewall-4.4.11.6/debian/patches/series --- shorewall-4.4.11.6/debian/patches/series 2010-10-28 22:26:06.000000000 -0400 +++ shorewall-4.4.11.6/debian/patches/series 2010-11-28 21:39:09.000000000 -0500 @@ -1,3 +1,4 @@ 01_debian_configuration.patch +02_macro_JAP.patch 99_lockfile_relocation.patch -debian-changes-4.4.11.6-2 +debian-changes-4.4.11.6-3
changelog | 6 ++ patches/02_macro_JAP.patch | 12 ++++ patches/debian-changes-4.4.11.6-2 | 105 -------------------------------------- patches/debian-changes-4.4.11.6-3 | 105 ++++++++++++++++++++++++++++++++++++++ patches/series | 3 - 5 files changed, 125 insertions(+), 106 deletions(-)
