From e637cb0098cc9eb682b363bc226ce5ffb12d6062 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Oct 2013 15:58:22 +0000
Subject: [PATCH] packages: uob-nomad: fix compilation

fix compilation

- by integrating net-tools-1.60-STRIP.patch
 from Jiri Popelka <jpopelka@redhat.com>
- if_tr.h is no longer in kernel

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@38476 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches/005-linux_if_strip_fix.patch      | 20 +++++++++++++++++++
 .../patches/006-linux_if_tr_fix.patch         | 11 ++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 net/uob-nomad/patches/005-linux_if_strip_fix.patch
 create mode 100644 net/uob-nomad/patches/006-linux_if_tr_fix.patch

diff --git a/net/uob-nomad/patches/005-linux_if_strip_fix.patch b/net/uob-nomad/patches/005-linux_if_strip_fix.patch
new file mode 100644
index 000000000..82ffefbdc
--- /dev/null
+++ b/net/uob-nomad/patches/005-linux_if_strip_fix.patch
@@ -0,0 +1,20 @@
+--- a/Client/net-tools/lib/strip.c
++++ b/Client/net-tools/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;
+ 
diff --git a/net/uob-nomad/patches/006-linux_if_tr_fix.patch b/net/uob-nomad/patches/006-linux_if_tr_fix.patch
new file mode 100644
index 000000000..778ce38b8
--- /dev/null
+++ b/net/uob-nomad/patches/006-linux_if_tr_fix.patch
@@ -0,0 +1,11 @@
+--- a/Client/net-tools/lib/tr.c
++++ b/Client/net-tools/lib/tr.c
+@@ -20,7 +20,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <net/if_arp.h>
+-#include <linux/if_tr.h>
++#include <netinet/if_tr.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>