From 37ea283df2937e851b815df0dcd8df7894199e52 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jul 2011 17:08:03 +0200
Subject: [PATCH] iproute2: added patch to make it work newer iptables.

---
 .../iproute2/patches/iptables-1.4.11.patch    | 31 +++++++++++++++++++
 srcpkgs/iproute2/template                     |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/iproute2/patches/iptables-1.4.11.patch

diff --git a/srcpkgs/iproute2/patches/iptables-1.4.11.patch b/srcpkgs/iproute2/patches/iptables-1.4.11.patch
new file mode 100644
index 0000000000..7d8a79190e
--- /dev/null
+++ b/srcpkgs/iproute2/patches/iptables-1.4.11.patch
@@ -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 {
+
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index e34808740f..ff4072aa17 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -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