- rel 3; fix build with new iptables 1.4.11

Changed files:
    iproute2-xt.patch -> 1.1
    iproute2.spec -> 1.206

diff --git a/iproute2-xt.patch b/iproute2-xt.patch
new file mode 100644 (file)
index 0000000..e0148f9
--- /dev/null
+++ b/iproute2-xt.patch
@@ -0,0 +1,28 @@
+--- iproute2-2.6.38/tc/m_xt.c.org      2011-05-29 10:01:12.291649868 +0200
++++ iproute2-2.6.38/tc/m_xt.c  2011-05-29 10:04:25.340555276 +0200
+@@ -162,7 +162,11 @@
+                                       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 @@
+                       }
+ 
+                       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/iproute2.spec b/iproute2.spec
index 788d55ef4171fb720545754c42ba725ee58344f0..cee42f8806dc49b87cf03ab535e41e32ff09d484 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8):    Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
 Version:       2.6.38
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://devresources.linux-foundation.org/dev/iproute2/download/%{name}-%{version}.tar.bz2
@@ -34,6 +34,7 @@ Patch12:      001-net-dev-iface-descr-0.1.diff
 Patch13:       %{name}-q_atm_c.patch
 Patch14:       %{name}-q_srr.v0.4.patch
 Patch15:       %{name}-ip_route_get.patch
+Patch16:       %{name}-xt.patch
 URL:           http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 BuildRequires: bison
 BuildRequires: db-devel
@@ -133,6 +134,7 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %{__make} \