diff options
| author | Max Kellermann <max@duempel.org> | 2008-03-27 20:46:53 +0000 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-03-27 20:46:53 +0000 |
| commit | a9468e011e1408e6f41c2626c4bafd7fdd0b4112 (patch) | |
| tree | 26d8db04de3b6b2ff289c474a628f3d42f5f91b0 | |
| parent | 8b5174adce0df99634562d5001eea40aca9b7a42 (diff) | |
| download | conntrack-tools-a9468e011e1408e6f41c2626c4bafd7fdd0b4112.tar.gz conntrack-tools-a9468e011e1408e6f41c2626c4bafd7fdd0b4112.zip | |
fix gcc 4.3 compilation error (Closes: #472812)
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rw-r--r-- | debian/patches/large-integer-gcc43.dpatch | 15 | ||||
| -rwxr-xr-x | debian/rules | 10 |
5 files changed, 26 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index a4548cf..a9a5b52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ conntrack (1:0.9.6-3) UNRELEASED; urgency=low - * + * fix gcc 4.3 compilation error (Closes: #472812) -- Max Kellermann <max@duempel.org> Mon, 24 Mar 2008 13:09:23 +0100 diff --git a/debian/control b/debian/control index 7df28eb..ec195a6 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: netfilter maintainers <netfilter-maintainers@ned.snow-crash.org> Uploaders: Max Kellermann <max@duempel.org>, Alexander Wirt <formorer@debian.org> Homepage: http://people.netfilter.org/pablo/conntrack-tools/ -Build-Depends: debhelper (>= 5), libnfnetlink-dev (>= 0.0.32), libnetfilter-conntrack-dev (>= 0.0.89), bison, flex +Build-Depends: debhelper (>= 5), dpatch, libnfnetlink-dev (>= 0.0.32), libnetfilter-conntrack-dev (>= 0.0.89), bison, flex Standards-Version: 3.7.3 Package: conntrack diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..066f397 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1 @@ +large-integer-gcc43.dpatch diff --git a/debian/patches/large-integer-gcc43.dpatch b/debian/patches/large-integer-gcc43.dpatch new file mode 100644 index 0000000..3aec6d7 --- /dev/null +++ b/debian/patches/large-integer-gcc43.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## DP: Fix Debian bug #472812: "conntrack.c:302: error: large integer +## DP: implicitly truncated to unsigned type" + +--- conntrack/src/conntrack.c ++++ conntrack/src/conntrack.c +@@ -299,7 +299,7 @@ + { CT_CREATE, ETIME, "conntrack has expired" }, + { EXP_CREATE, ENOENT, "master conntrack not found" }, + { EXP_CREATE, EINVAL, "invalid parameters" }, +- { ~0UL, EPERM, "sorry, you must be root or get " ++ { ~0U, EPERM, "sorry, you must be root or get " + "CAP_NET_ADMIN capability to do this"} + }; + diff --git a/debian/rules b/debian/rules index d226e6b..ee6b40a 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,14 @@ else CFLAGS += -O2 -fno-strict-aliasing endif +# fix "read_config_lex.c:4451: error: 'input' defined but not used" +CFLAGS += -DYY_NO_INPUT + +DPATCH_STAMPFN = debian/stamp-patch +include /usr/share/dpatch/dpatch.make + build: build-stamp -build-stamp: +build-stamp: patch dh_testdir # ./configure @@ -29,7 +35,7 @@ build-stamp: touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp install*-stamp |