iproute2: update to 3.1.0.

This commit is contained in:
Juan RP 2012-01-05 10:38:36 +01:00
parent 953c01b477
commit 813d00b5af
2 changed files with 3 additions and 36 deletions

View File

@ -1,31 +0,0 @@
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,15 +1,13 @@
# Template file for 'iproute2'
pkgname=iproute2
version=2.6.39
version=3.1.0
patch_args="-Np1"
#distfiles="http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-$version.tar.gz"
distfiles="http://sources.buildroot.net/$pkgname-$version.tar.gz"
revision=1
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
short_desc="IP Routing Utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL-2"
checksum=939df14f3eef81f22719e4db59e3b16b89c644d2d85ce7453c069baecf21bdbf
checksum=03415855045b19606d1c7374367de3837c4045c468965450888b7ccce07c8409
long_desc="
Iproute2 is a collection of utilities for controlling TCP/IP networking
and traffic control in Linux."