diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-10 19:03:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-10 19:03:11 +0100 |
| commit | 713dc7012af249b7102faabb27e0fe88ea39be57 (patch) | |
| tree | 2626b2aa8f2ebb6e6c314ccdba45d7668ed122fd /package/iproute2/patches | |
| parent | da5c3b1c8535d8f8455b5283ddaf5c38b45d477e (diff) | |
fix make bulk on OpenADK buildserver
Diffstat (limited to 'package/iproute2/patches')
| -rw-r--r-- | package/iproute2/patches/patch-tc_m_xt_c | 28 |
1 files changed, 28 insertions, 0 deletions
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 { |