From cbb4fe95ac9913907a43f8abb1f0e7acb677cf02 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mon, 1 Oct 2012 10:29:30 +0200
Subject: [PATCH] compile without STRIP (Metricom radio) support

---
 net-tools-1.60-STRIP.patch | 34 ----------------------------------
 net-tools-1.60-config.h    |  2 +-
 net-tools-1.60-config.make |  2 +-
 net-tools.spec             |  9 ++++-----
 4 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 net-tools-1.60-STRIP.patch

diff --git a/net-tools-1.60-STRIP.patch b/net-tools-1.60-STRIP.patch
deleted file mode 100644
index 893cf7e..0000000
--- a/net-tools-1.60-STRIP.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cb25358f5119192d14e3cf5370cd18037cc54ca8 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@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-1.60-config.h b/net-tools-1.60-config.h
index 7c1cd36..56e5367 100644
--- a/net-tools-1.60-config.h
+++ b/net-tools-1.60-config.h
@@ -50,7 +50,7 @@
 #define HAVE_HWSLIP 1
 #define HAVE_HWPPP 1
 #define HAVE_HWTUNNEL 1
-#define HAVE_HWSTRIP 1
+#define HAVE_HWSTRIP 0
 #define HAVE_HWTR 0
 #define HAVE_HWAX25 1
 #define HAVE_HWROSE 1
diff --git a/net-tools-1.60-config.make b/net-tools-1.60-config.make
index 7e8024c..11a0246 100644
--- a/net-tools-1.60-config.make
+++ b/net-tools-1.60-config.make
@@ -17,7 +17,7 @@ HAVE_HWARC=1
 HAVE_HWSLIP=1
 HAVE_HWPPP=1
 HAVE_HWTUNNEL=1
-HAVE_HWSTRIP=1
+HAVE_HWSTRIP=0
 HAVE_HWTR=0
 HAVE_HWAX25=1
 HAVE_HWROSE=1
diff --git a/net-tools.spec b/net-tools.spec
index 6df15a2..568d4f8 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -3,7 +3,7 @@
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 144.%{checkout}%{?dist}
+Release: 145.%{checkout}%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.sourceforge.net
@@ -53,9 +53,6 @@ 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
@@ -79,7 +76,6 @@ 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
@@ -167,6 +163,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Mon Oct 01 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-145.20120917git
+- compile without STRIP (Metricom radio) support
+
 * Mon Sep 17 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-144.20120917git
 - upstream git snapshot