Merge branch 'f25'

net-tools-linux48.patch

@@ -0,0 +1,12 @@
+diff -up net-tools-2.0/iptunnel.c.linux48 net-tools-2.0/iptunnel.c
+--- net-tools-2.0/iptunnel.c.linux48	2016-02-15 16:54:18.000000000 +0100
++++ net-tools-2.0/iptunnel.c	2016-10-12 09:16:57.429279406 +0200
+@@ -26,7 +26,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
++#include <linux/ip.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <net/if_arp.h>

net-tools.spec

@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 2.0
-Release: 0.39.%{checkout}%{?dist}
+Release: 0.40.%{checkout}%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/net-tools/
@@ -26,6 +26,9 @@ Patch1: net-tools-cycle.patch
 # various man page fixes merged into one patch
 Patch2: net-tools-man.patch
 
+# linux-4.8
+Patch3: net-tools-linux48.patch
+
 # use all interfaces instead of default (#1003875)
 Patch20: ether-wake-interfaces.patch
 
@@ -44,6 +47,7 @@ Most of them are obsolete. For replacement check iproute package.
 %setup -q -c
 %patch1 -p1 -b .cycle
 %patch2 -p1 -b .man
+%patch3 -p1 -b .linux48
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -127,6 +131,9 @@ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Wed Oct 12 2016 Jiri Popelka <jpopelka@redhat.com> - 2.0-0.40.20160912git
+- fix build on linux-4.8
+
 * Mon Sep 12 2016 mruprich <mruprich@redhat.com> - 2.0-0.39.20160912git
 - latest upstream snapshot