[net-tools] fixed building with kernel-3.6

[Jiří Popelka]

commit 9f9884fdb85957d0e7f3acb77f865aa7e0017ad9
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Aug 22 17:05:40 2012 +0200

    fixed building with kernel-3.6

 net-tools-1.60-STRIP.patch |   34 ++++++++++++++++++++++++++++++++++
 net-tools.spec             |    9 ++++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/net-tools-1.60-STRIP.patch b/net-tools-1.60-STRIP.patch
new file mode 100644
index 0000000..893cf7e
--- /dev/null
+++ b/net-tools-1.60-STRIP.patch
@@ -0,0 +1,34 @@
+From cb25358f5119192d14e3cf5370cd18037cc54ca8 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka at redhat.com>
+Date: Wed, 22 Aug 2012 16:20:46 +0200
+Subject: [PATCH] kernel 3.6 removes linux/if_strip.h
+
+---
+ lib/strip.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/strip.c b/lib/strip.c
+index ced2325..06ea990 100644
+--- a/lib/strip.c
++++ b/lib/strip.c
+@@ -21,7 +21,6 @@
+ #include <sys/socket.h>
+ #include <net/if_arp.h>
+ #include <linux/types.h>
+-#include <linux/if_strip.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+@@ -35,6 +34,9 @@
+ #include "util.h"
+ #include "intl.h"
+ 
++typedef struct {
++    __u8 c[6];
++} MetricomAddress;
+ 
+ extern struct hwtype strip_hwtype;
+ 
+-- 
+1.7.11.4
+
diff --git a/net-tools.spec b/net-tools.spec
index 590089e..e1d148e 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 140.%{checkout}%{?dist}
+Release: 141.%{checkout}%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.sourceforge.net
@@ -53,6 +53,9 @@ Patch10: net-tools-1.60-ifconfig-long-iface-crasher.patch
 # fixed tcp timers info in netstat (#466845)
 Patch11: net-tools-1.60-netstat-probe.patch
 
+# kernel 3.6 removes linux/if_strip.h
+Patch12: net-tools-1.60-STRIP.patch
+
 BuildRequires: gettext, libselinux
 BuildRequires: libselinux-devel
 BuildRequires: systemd-units
@@ -76,6 +79,7 @@ Most of them are obsolete. For replacement check iproute package.
 %patch9 -p1 -b .sctp
 %patch10 -p1 -b .long_iface
 %patch11 -p1 -b .probe
+%patch12 -p1 -b .STRIP
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -156,6 +160,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Wed Aug 22 2012 Jiri Popelka <jpopelka at redhat.com> - 1.60-141.20120702git
+- fixed building with kernel-3.6
+
 * Wed Aug 22 2012 Jiri Popelka <jpopelka at redhat.com> - 1.60-140.20120702git
 - use new systemd-rpm macros (#850225)