iproute2: added patch to make it work newer iptables.

This commit is contained in:
Juan RP 2011-07-11 17:08:03 +02:00
parent be16ecfae8
commit 37ea283df2
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,31 @@
diff --git a/tc/m_xt.c b/tc/m_xt.c
index ede9913..268938b 100644
--- a/tc/m_xt.c
+++ b/tc/m_xt.c
@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
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 * f, struct rtattr *arg)
}
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 {

View File

@ -1,6 +1,7 @@
# Template file for 'iproute2'
pkgname=iproute2
version=2.6.38
revision=1
patch_args="-Np1"
distfiles="http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-$version.tar.bz2"
build_style=custom-install