packages: iproute2/iproute2.spec, iproute2/iproute2-xt.patch (NEW) - rel 3; ...

[arekm]

Author: arekm                        Date: Sun May 29 08:06:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix build with new iptables 1.4.11

---- Files affected:
packages/iproute2:
   iproute2.spec (1.205 -> 1.206) , iproute2-xt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/iproute2/iproute2.spec
diff -u packages/iproute2/iproute2.spec:1.205 packages/iproute2/iproute2.spec:1.206
--- packages/iproute2/iproute2.spec:1.205	Fri May 27 09:43:39 2011
+++ packages/iproute2/iproute2.spec	Sun May 29 10:05:54 2011
@@ -17,7 +17,7 @@
 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
@@ -35,6 +35,7 @@
 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
@@ -134,6 +135,7 @@
 %patch13 -p0
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %{__make} \
@@ -233,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2011/05/29 08:05:54  arekm
+- rel 3; fix build with new iptables 1.4.11
+
 Revision 1.205  2011/05/27 07:43:39  arekm
 - release 2
 

================================================================
Index: packages/iproute2/iproute2-xt.patch
diff -u /dev/null packages/iproute2/iproute2-xt.patch:1.1
--- /dev/null	Sun May 29 10:06:02 2011
+++ packages/iproute2/iproute2-xt.patch	Sun May 29 10:05:54 2011
@@ -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 {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2.spec?r1=1.205&r2=1.206&f=u