From 713dc7012af249b7102faabb27e0fe88ea39be57 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 10 Nov 2011 19:03:11 +0100 Subject: fix make bulk on OpenADK buildserver --- package/iproute2/patches/patch-tc_m_xt_c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/iproute2/patches/patch-tc_m_xt_c (limited to 'package/iproute2/patches/patch-tc_m_xt_c') diff --git a/package/iproute2/patches/patch-tc_m_xt_c b/package/iproute2/patches/patch-tc_m_xt_c new file mode 100644 index 000000000..8399e779a --- /dev/null +++ b/package/iproute2/patches/patch-tc_m_xt_c @@ -0,0 +1,28 @@ +--- iproute2-2.6.38.orig/tc/m_xt.c 2011-03-17 18:05:47.000000000 +0100 ++++ iproute2-2.6.38/tc/m_xt.c 2011-11-09 16:15:44.527071563 +0100 +@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util + return -1; + } + tcipt_globals.opts = +- xtables_merge_options(tcipt_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ tcipt_globals.orig_opts, ++#endif ++ tcipt_globals.opts, + m->extra_opts, + &m->option_offset); + } else { +@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * + } + + tcipt_globals.opts = +- xtables_merge_options(tcipt_globals.opts, ++ xtables_merge_options( ++#if XTABLES_VERSION_CODE > 5 ++ tcipt_globals.orig_opts, ++#endif ++ tcipt_globals.opts, + m->extra_opts, + &m->option_offset); + } else { -- cgit v1.2.3