summaryrefslogtreecommitdiff
path: root/package/iproute2/iproute2-xt-v6.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-07-21 14:54:24 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-07-21 22:49:11 +0200
commit4e7283604f584c79b928a4d90a98a8037c36f08e (patch)
treebcbb8bbc16001b066cc27ae3425324ee5a46f808 /package/iproute2/iproute2-xt-v6.patch
parent0279d9e327fba69481078fd3dbb275b8556ce8b7 (diff)
iproute2: bump to version 2.6.39
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/iproute2/iproute2-xt-v6.patch')
-rw-r--r--package/iproute2/iproute2-xt-v6.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/package/iproute2/iproute2-xt-v6.patch b/package/iproute2/iproute2-xt-v6.patch
new file mode 100644
index 000000000..4856e3609
--- /dev/null
+++ b/package/iproute2/iproute2-xt-v6.patch
@@ -0,0 +1,39 @@
+From: Andreas Henriksson <andreas@fatal.se>
+Forwarded: yes
+Subject: [PATCH] iproute2: Fix building xt module against xtables version 6
+
+
+diff --git a/tc/m_xt.c b/tc/m_xt.c
+index 651a59e..13bf19f 100644
+--- a/tc/m_xt.c
++++ b/tc/m_xt.c
+@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
+ return -1;
+ }
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
+- m->extra_opts,
+- &m->option_offset);
++ xtables_merge_options(
++#if (XTABLES_VERSION_CODE >= 6)
++ tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
++ m->extra_opts,
++ &m->option_offset);
+ } else {
+ fprintf(stderr," failed to find target %s\n\n", optarg);
+ return -1;
+@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
+ }
+
+ tcipt_globals.opts =
+- xtables_merge_options(tcipt_globals.opts,
++ xtables_merge_options(
++#if (XTABLES_VERSION_CODE >= 6)
++ tcipt_globals.orig_opts,
++#endif
++ tcipt_globals.opts,
+ m->extra_opts,
+ &m->option_offset);
+ } else {