gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute2: bump to version 2.6.39 

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2011-07-21 14:54:24 -03:00 committed by Peter Korsgaard
parent 0279d9e327
commit 4e7283604f
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/iproute2/iproute2-xt-v6.patch Normal file
View File

@ -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 {

3
package/iproute2/iproute2.mk
View File

@ -4,8 +4,7 @@
#
#############################################################
IPROUTE2_VERSION = 2.6.38
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
IPROUTE2_VERSION = 2.6.39
IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc