From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 24 Jul 2018 16:20:44 +0000 (+0200)
Subject: - updated to 4.17.0
X-Git-Tag: auto/th/iproute2-4.17.0-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=33826d1b99b10db9afe2e4bd86292f0490e3608c;p=packages%2Fiproute2.git

- updated to 4.17.0
- updated ip_route_get,wrr patches
- removed outdated (probably since long time) arp patch
- added link patch (libxtables from iptables 1.8 need linking into tc)
---

diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index 9facfd2..1f9ca05 100644
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -13,7 +13,7 @@ diff -urN iproute-2.6.20-070313-orig/tc/Makefile iproute-2.6.20-070313/tc/Makefi
 diff -urN iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h
 --- iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h	2007-03-13 22:50:56.000000000 +0100
 +++ iproute-2.6.20-070313/include/uapi/linux/pkt_sched.h	2007-04-15 20:52:33.000000000 +0200
-@@ -466,4 +498,116 @@
+@@ -466,4 +498,117 @@
  #define NETEM_DIST_SCALE	8192
  #define NETEM_DIST_MAX		16384
  
@@ -21,6 +21,7 @@ diff -urN iproute-2.6.20-070313-orig/include/uapi/linux/pkt_sched.h iproute-2.6.
 +
 +/* Other includes */
 +#include <linux/if_ether.h>
++#include <sys/time.h>
 +
 +// A sub weight and of a class
 +// All numbers are represented as parts of (2^64-1).
diff --git a/iproute2-arp.patch b/iproute2-arp.patch
deleted file mode 100644
index 2d0750c..0000000
--- a/iproute2-arp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN iproute2-2.6.7.org/misc/arpd.c iproute2-2.6.7/misc/arpd.c
---- iproute2-2.6.7.org/misc/arpd.c	2004-06-09 01:43:55.298418184 +0200
-+++ iproute2-2.6.7/misc/arpd.c	2004-06-09 01:50:48.921537912 +0200
-@@ -29,6 +29,7 @@
- #include <linux/if.h>
- #include <linux/if_arp.h>
- #include <netinet/in.h>
-+#include <linux/if_ether.h>
- #include <arpa/inet.h>
- #include <linux/if_packet.h>
- #include <linux/filter.h>
diff --git a/iproute2-ip_route_get.patch b/iproute2-ip_route_get.patch
index 4e8facc..025d15d 100644
--- a/iproute2-ip_route_get.patch
+++ b/iproute2-ip_route_get.patch
@@ -1,12 +1,11 @@
-diff -ur iproute2-2.6.35.org/ip/iproute.c iproute2-2.6.35/ip/iproute.c
---- iproute2-2.6.35.org/ip/iproute.c	2010-08-04 17:45:59.000000000 +0000
-+++ iproute2-2.6.35/ip/iproute.c	2010-08-25 12:57:40.000000000 +0000
+--- iproute2-4.17.0.org/ip/iproute.c	2010-08-04 17:45:59.000000000 +0000
++++ iproute2-4.17.0/ip/iproute.c	2010-08-25 12:57:40.000000000 +0000
 @@ -160,7 +160,7 @@
  	if (r->rtm_family == AF_INET6 && table != RT_TABLE_MAIN)
  		ip6_multiple_tables = 1;
  
--	if (filter.cloned == !(r->rtm_flags&RTM_F_CLONED))
-+	if (filter.cloned && !(r->rtm_flags&RTM_F_CLONED))
+-	if (filter.cloned == !(r->rtm_flags & RTM_F_CLONED))
++	if (filter.cloned && !(r->rtm_flags & RTM_F_CLONED))
  		return 0;
  
  	if (r->rtm_family == AF_INET6 && !ip6_multiple_tables) {
diff --git a/iproute2-link.patch b/iproute2-link.patch
new file mode 100644
index 0000000..ef650fd
--- /dev/null
+++ b/iproute2-link.patch
@@ -0,0 +1,10 @@
+--- iproute2-4.17.0/tc/Makefile.orig	2018-07-24 17:16:55.547584691 +0200
++++ iproute2-4.17.0/tc/Makefile	2018-07-24 17:35:16.220905453 +0200
+@@ -84,6 +84,7 @@
+   ifeq ($(TC_CONFIG_XT),y)
+     TCSO += m_xt.so
+     TCMODULES += em_ipt.o
++    LDLIBS += $$($(PKG_CONFIG) xtables --libs)
+     ifeq ($(TC_CONFIG_IPSET),y)
+       TCMODULES += em_ipset.o
+     endif
diff --git a/iproute2.spec b/iproute2.spec
index 97cb844..72c31ca 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -14,15 +14,14 @@ Summary(es.UTF-8):	Herramientas para encaminamiento avanzado y configuración de
 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:	4.16.0
+Version:	4.17.0
 Release:	1
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5:	1f12a70d767ef77ffa2d1a0c4ce48f1a
+# Source0-md5:	6f3a87fe2d97c28214fc2faab2c257d6
 Source1:	%{name}.tmpfiles
-Patch0:		%{name}-arp.patch
-
+Patch0:		%{name}-link.patch
 Patch3:		%{name}-LDFLAGS.patch
 
 Patch5:		%{name}-build.patch
@@ -49,6 +48,8 @@ BuildRequires:	linux-atm-devel
 BuildRequires:	linux-libc-headers >= 7:2.6.12.0-15
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.673
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	iptables-libs >= 0:1.4.5
 Obsoletes:	ifstat
 Obsoletes:	iproute
@@ -125,7 +126,6 @@ Bashowe dopełnianie parametrów poleceń iproute2 (obecnie tylko tc).
 #%{__rm} -r include/linux
 
 %patch0 -p1
-
 %patch3 -p1
 
 %patch5 -p1