From 0faaa5cc8ec5dc457a0e3a04e302abbc45ade9fa Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Wed, 7 Dec 2011 12:35:26 +0100
Subject: [PATCH] Update config.h and config.make

---
 net-tools-1.60-config.h      |  2 ++
 net-tools-1.60-config.make   |  1 +
 net-tools-1.60-selinux.patch | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/net-tools-1.60-config.h b/net-tools-1.60-config.h
index a739c92..92ca6ba 100644
--- a/net-tools-1.60-config.h
+++ b/net-tools-1.60-config.h
@@ -63,6 +63,7 @@
 #define HAVE_HWHDLCLAPB 1
 #define HAVE_HWIRDA 1
 #define HAVE_HWEC 1
+#define HAVE_HWEUI64 1
 #define HAVE_HWIB 1
 
 /* 
@@ -73,3 +74,4 @@
 #define HAVE_FW_MASQUERADE 1
 #define HAVE_IP_TOOLS 1
 #define HAVE_MII 1
+#define HAVE_SELINUX 1
diff --git a/net-tools-1.60-config.make b/net-tools-1.60-config.make
index e7cfc99..c947b7c 100644
--- a/net-tools-1.60-config.make
+++ b/net-tools-1.60-config.make
@@ -30,6 +30,7 @@ HAVE_HWASH=1
 HAVE_HWHDLCLAPB=1
 HAVE_HWIRDA=1
 HAVE_HWEC=1
+HAVE_HWEUI64=1
 HAVE_HWIB=1
 HAVE_FW_MASQUERADE=1
 HAVE_IP_TOOLS=1
diff --git a/net-tools-1.60-selinux.patch b/net-tools-1.60-selinux.patch
index f1f60ce..1b08d30 100644
--- a/net-tools-1.60-selinux.patch
+++ b/net-tools-1.60-selinux.patch
@@ -1,6 +1,14 @@
+diff -up net-tools-1.60/config.in.selinux net-tools-1.60/config.in
+--- net-tools-1.60/config.in.selinux	2011-11-21 02:31:57.000000000 +0100
++++ net-tools-1.60/config.in	2011-12-07 12:24:21.922245784 +0100
+@@ -91,3 +91,4 @@ bool 'InfiniBand hardware support' HAVE_
+ bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
+ bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
+ bool 'Build mii-tool' HAVE_MII y
++bool 'SELinux support' HAVE_SELINUX n
 diff -up net-tools-1.60/Makefile.selinux net-tools-1.60/Makefile
 --- net-tools-1.60/Makefile.selinux	2011-11-21 02:31:57.000000000 +0100
-+++ net-tools-1.60/Makefile	2011-12-05 15:31:48.825659529 +0100
++++ net-tools-1.60/Makefile	2011-12-07 12:23:00.078268978 +0100
 @@ -114,6 +114,12 @@ endif
  
  NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
@@ -15,8 +23,8 @@ diff -up net-tools-1.60/Makefile.selinux net-tools-1.60/Makefile
  LDFLAGS  += -L$(NET_LIB_PATH)
  
 diff -up net-tools-1.60/netstat.c.selinux net-tools-1.60/netstat.c
---- net-tools-1.60/netstat.c.selinux	2011-12-05 15:28:23.187230365 +0100
-+++ net-tools-1.60/netstat.c	2011-12-05 15:37:31.376377055 +0100
+--- net-tools-1.60/netstat.c.selinux	2011-12-07 12:23:00.040269453 +0100
++++ net-tools-1.60/netstat.c	2011-12-07 12:23:00.079268965 +0100
 @@ -89,6 +89,11 @@
  #include <net/if.h>
  #include <dirent.h>
@@ -196,7 +204,7 @@ diff -up net-tools-1.60/netstat.c.selinux net-tools-1.60/netstat.c
  	switch (i) {
  	case -1:
  	    break;
-@@ -1973,6 +2023,20 @@ int main
+@@ -1975,6 +2025,20 @@ int main
  	    if (aftrans_opt("unix"))
  		exit(1);
  	    break;
@@ -217,7 +225,7 @@ diff -up net-tools-1.60/netstat.c.selinux net-tools-1.60/netstat.c
  	case '?':
  	case 'h':
  	    usage();
-@@ -2099,6 +2163,7 @@ int main
+@@ -2101,6 +2165,7 @@ int main
  	    if (flag_exp > 1)
  		printf(_(" User       Inode     "));
  	    print_progname_banner();