summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-04-08 05:23:38 +0000
committerMax Kellermann <max@duempel.org>2008-04-08 05:23:38 +0000
commitc853e3fde93fca07234e51073986c057b545c217 (patch)
tree911cdcb629363c84941082f8adedb9a011bdce39
parentf4f9d9ce31df85f8ff3c8fa5671a684e656205f0 (diff)
downloadconntrack-tools-c853e3fde93fca07234e51073986c057b545c217.tar.gz
conntrack-tools-c853e3fde93fca07234e51073986c057b545c217.zip
fix #474768 ("input defined but not used")
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/00list1
-rw-r--r--debian/patches/unused-input-gcc43.dpatch14
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b325299..24cac0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ conntrack (1:0.9.6-3) UNRELEASED; urgency=low
* fix gcc 4.3 compilation errors:
- "large integer implicitly truncated to unsigned type" (Closes: #472812)
+ - "'input' defined but not used" (Closes: #474768)
-- Max Kellermann <max@duempel.org> Mon, 24 Mar 2008 13:09:23 +0100
diff --git a/debian/patches/00list b/debian/patches/00list
index 066f397..6fc810f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
large-integer-gcc43.dpatch
+unused-input-gcc43.dpatch
diff --git a/debian/patches/unused-input-gcc43.dpatch b/debian/patches/unused-input-gcc43.dpatch
new file mode 100644
index 0000000..66994d8
--- /dev/null
+++ b/debian/patches/unused-input-gcc43.dpatch
@@ -0,0 +1,14 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## DP: Fix Debian bug #474768: "read_config_lex.c:4451: error: 'input'
+## DP: defined but not used" (patch by Thiemo Seufer)
+
+--- conntrack-0.9.6.original/src/read_config_lex.l 2008-03-08 11:25:30.000000000 +0000
++++ conntrack-0.9.6/src/read_config_lex.l 2008-04-07 17:47:53.000000000 +0100
+@@ -23,6 +23,7 @@
+ %}
+
+ %option yylineno
++%option noinput
+ %option nounput
+
+ ws [ \t]+