summaryrefslogtreecommitdiff
path: root/package/iproute2
diff options
context:
space:
mode:
Diffstat (limited to 'package/iproute2')
-rw-r--r--package/iproute2/Makefile8
-rw-r--r--package/iproute2/patches/patch-tc_m_xt_c28
2 files changed, 32 insertions, 4 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 3c6ff16eb..cd5b54a3f 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -4,13 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= iproute2
-PKG_VERSION:= 2.6.37
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 9774ff9d74ebd301bf56bd8d74473786
+PKG_VERSION:= 2.6.38
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a243bfea837e71824b7ca26c3bb45fa8
PKG_DESCR:= iproute2 routing control utility
PKG_SECTION:= route
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
-PKG_SITES:= http://devresources.linuxfoundation.org/dev/iproute2/download/
+PKG_SITES:= http://distfiles.gentoo.org/distfiles/
PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS
PKGSD_TC:= iproute2 traffic control utility
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 {