diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rw-r--r-- | debian/patches/printf-time-long.dpatch | 17 |
3 files changed, 20 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f628e84..9875fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ conntrack (1:0.9.6-4) UNRELEASED; urgency=low - * + * fix compilation on SPARC (printf argument mismatch) - -- Max Kellermann <mk@cm4all.com> Wed, 09 Apr 2008 08:51:44 +0200 + -- Max Kellermann <max@duempel.org> Wed, 09 Apr 2008 08:56:08 +0200 conntrack (1:0.9.6-3) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 6fc810f..56317ab 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ large-integer-gcc43.dpatch unused-input-gcc43.dpatch +printf-time-long.dpatch diff --git a/debian/patches/printf-time-long.dpatch b/debian/patches/printf-time-long.dpatch new file mode 100644 index 0000000..3beea9d --- /dev/null +++ b/debian/patches/printf-time-long.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## DP: Fix compilation warning (error) on SPARC, where timeval +## DP: attributes don't seem to fit "%ld". Also format them as unsigned +## DP: numbers. + +--- conntrack-tools/src/conntrack.c ++++ conntrack-tools/src/conntrack.c +@@ -597,7 +597,8 @@ + if (!(output_mask & _O_XML)) { + struct timeval tv; + gettimeofday(&tv, NULL); +- printf("[%-8ld.%-6ld]\t", tv.tv_sec, tv.tv_usec); ++ printf("[%-8lu.%-6lu]\t", (unsigned long)tv.tv_sec, ++ (unsigned long)tv.tv_usec); + } else + output_flags |= NFCT_OF_TIME; + } |