d/patches: add 0001-extensions-libxt_hashlimit-fix-64-bit-printf-formats.patch

Add patch by James Cowgill <jcowgill@debian.org>.

By the time of this commit, the patch has been sent upstream, but upstream
has not applied it to master yet.

Closes: #859775
Thanks: James Cowgill for the patch
Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org>

debian/patches/0001-extensions-libxt_hashlimit-fix-64-bit-printf-formats.patch

+From 99bdf88352fd8cad3d907a203d3720151d129c18 Mon Sep 17 00:00:00 2001
+From: James Cowgill <James.Cowgill@imgtec.com>
+Date: Fri, 7 Apr 2017 12:10:26 +0100
+Subject: [PATCH iptables] extensions: libxt_hashlimit: fix 64-bit printf formats
+
+hashlimit was using "%lu" in a lot of printf format specifiers to print
+64-bit integers. This is incorrect on 32-bit architectures because
+"long int" is 32-bits there. On MIPS, it was causing iptables to
+segfault when printing these integers.
+
+Fix by using the correct format specifier.
+
+Signed-off-by: James Cowgill <James.Cowgill@imgtec.com>
+---
+ extensions/libxt_hashlimit.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
+index 52fc4fa..63cf903 100644
+--- a/extensions/libxt_hashlimit.c
++++ b/extensions/libxt_hashlimit.c
+@@ -12,9 +12,9 @@
+  */
+ #define _BSD_SOURCE 1
+ #define _ISOC99_SOURCE 1
++#include <inttypes.h>
+ #include <math.h>
+ #include <stdbool.h>
+-#include <stdint.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -262,7 +262,7 @@ static uint64_t parse_burst(const char *burst, int revision)
+ 	if (v > max)
+ 		xtables_error(PARAMETER_PROBLEM, "bad value for option "
+ 			"\"--hashlimit-burst\", value \"%s\" too large "
+-				"(max %lumb).", burst, max/1024/1024);
++				"(max %" PRIu64 "mb).", burst, max/1024/1024);
+ 	return v;
+ }
+ 
+@@ -285,8 +285,8 @@ static bool parse_bytes(const char *rate, void *val, struct hashlimit_mt_udata *
+ 	tmp = (uint64_t) r * factor;
+ 	if (tmp > max)
+ 		xtables_error(PARAMETER_PROBLEM,
+-			"Rate value too large \"%llu\" (max %lu)\n",
+-					(unsigned long long)tmp, max);
++			"Rate value too large \"%" PRIu64 "\" (max %" PRIu64 ")\n",
++					tmp, max);
+ 
+ 	tmp = bytes_to_cost(tmp);
+ 	if (tmp == 0)
+@@ -557,7 +557,7 @@ static void hashlimit_mt_check_v1(struct xt_fcheck_call *cb)
+ 		if (cb->xflags & F_BURST) {
+ 			if (info->cfg.burst < cost_to_bytes(info->cfg.avg))
+ 				xtables_error(PARAMETER_PROBLEM,
+-					"burst cannot be smaller than %lub", cost_to_bytes(info->cfg.avg));
++					"burst cannot be smaller than %" PRIu64 "b", cost_to_bytes(info->cfg.avg));
+ 
+ 			burst = info->cfg.burst;
+ 			burst /= cost_to_bytes(info->cfg.avg);
+@@ -587,7 +587,7 @@ static void hashlimit_mt_check(struct xt_fcheck_call *cb)
+ 		if (cb->xflags & F_BURST) {
+ 			if (info->cfg.burst < cost_to_bytes(info->cfg.avg))
+ 				xtables_error(PARAMETER_PROBLEM,
+-					"burst cannot be smaller than %lub", cost_to_bytes(info->cfg.avg));
++					"burst cannot be smaller than %" PRIu64 "b", cost_to_bytes(info->cfg.avg));
+ 
+ 			burst = info->cfg.burst;
+ 			burst /= cost_to_bytes(info->cfg.avg);
+@@ -631,7 +631,7 @@ static uint32_t print_rate(uint32_t period, int revision)
+             || _rates[i].mult/period < _rates[i].mult%period)
+ 			break;
+ 
+-	printf(" %lu/%s", _rates[i-1].mult / period, _rates[i-1].name);
++	printf(" %" PRIu64 "/%s", _rates[i-1].mult / period, _rates[i-1].name);
+ 	/* return in msec */
+ 	return _rates[i-1].mult / scale * 1000;
+ }
+-- 
+2.11.0
+

debian/patches/series

+0001-extensions-libxt_hashlimit-fix-64-bit-printf-formats.patch
 0101-changelog.patch
 0102-add_manpages.patch
 0103-lintian_allows_to.patch