net-mgmt/etherape: Update to 0.9.16

A number of port changes were required due to the upstream migration
away from the Gnome2 libraries. Refer to the 0.9.16 release notes.

Changes this release:
  http://etherape.sourceforge.net/NEWS.html

5 files changed, 56 insertions, 31 deletions

diff --git a/net-mgmt/etherape/files/patch-src_diagram.c b/net-mgmt/etherape/files/patch-src_diagram.c
deleted file mode 100644
index 62acd31ecebc..000000000000
--- a/net-mgmt/etherape/files/patch-src_diagram.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/diagram.c.orig	2016-01-25 20:19:16 UTC
-+++ src/diagram.c
-@@ -21,7 +21,18 @@
- #include <config.h>
- #endif
- 
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+#ifdef HAVE_ARPA_INET_H
- #include <arpa/inet.h>
-+#endif
- 
- #include <gnome.h>
- #include <regex.h>
diff --git a/net-mgmt/etherape/files/patch-src_names_eth__resolv.c b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c
new file mode 100644
index 000000000000..2d49761e3fc0
--- /dev/null
+++ b/net-mgmt/etherape/files/patch-src_names_eth__resolv.c
@@ -0,0 +1,46 @@
+--- src/names/eth_resolv.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/eth_resolv.c
+@@ -26,8 +26,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/ethernet.h>
+-#include <netinet/ether.h>
+ 
+ #include <glib.h>
+ 
+@@ -48,8 +49,8 @@ static int ether_tree_cmp(gconstpointer ga, gconstpoin
+   const struct ether_addr *a = ga;
+   const struct ether_addr *b = gb;
+ 
+-  return memcmp(&a->ether_addr_octet, &b->ether_addr_octet,
+-                sizeof(a->ether_addr_octet));
++  return memcmp(&a->octet, &b->octet,
++                sizeof(a->octet));
+ }
+ 
+ static void add_ether_ent(const struct ether_addr *addr, const char *hostname)
+@@ -118,7 +119,7 @@ const char *get_ether_name(const unsigned char *addr_b
+   struct ether_ent *ent;
+   size_t addrstr_size;
+ 
+-  memcpy(&addr.ether_addr_octet, addr_bytes, sizeof(addr.ether_addr_octet));
++  memcpy(&addr.octet, addr_bytes, sizeof(addr.octet));
+ 
+   ent = g_tree_lookup(ethers, &addr);
+   if (ent)
+@@ -129,9 +130,9 @@ const char *get_ether_name(const unsigned char *addr_b
+   ent = g_malloc(sizeof(*ent) + addrstr_size);
+   ent->addr = addr;
+   snprintf(ent->hostname, addrstr_size, "%02x:%02x:%02x:%02x:%02x:%02x",
+-           addr.ether_addr_octet[0], addr.ether_addr_octet[1],
+-           addr.ether_addr_octet[2], addr.ether_addr_octet[3],
+-           addr.ether_addr_octet[4], addr.ether_addr_octet[5]);
++           addr.octet[0], addr.octet[1],
++           addr.octet[2], addr.octet[3],
++           addr.octet[4], addr.octet[5]);
+   g_tree_insert(ethers, &ent->addr, ent);
+   return ent->hostname;
+ }
diff --git a/net-mgmt/etherape/files/patch-src_names.c b/net-mgmt/etherape/files/patch-src_names_names.c
index 64b6aef2e5b8..42a45c2727b2 100644
--- a/net-mgmt/etherape/files/patch-src_names.c
+++ b/net-mgmt/etherape/files/patch-src_names_names.c
@@ -1,6 +1,6 @@
---- src/names.c.orig	2014-02-02 11:30:03 UTC
-+++ src/names.c
-@@ -21,7 +21,18 @@
+--- src/names/names.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/names.c
+@@ -19,7 +19,18 @@
  #include <config.h>
  #endif
  
diff --git a/net-mgmt/etherape/files/patch-src_thread__resolve.c b/net-mgmt/etherape/files/patch-src_names_thread__resolve.c
index bc26055be7d7..f0b5a97138be 100644
--- a/net-mgmt/etherape/files/patch-src_thread__resolve.c
+++ b/net-mgmt/etherape/files/patch-src_names_thread__resolve.c
@@ -1,6 +1,6 @@
---- src/thread_resolve.c.orig	2015-06-06 07:18:29 UTC
-+++ src/thread_resolve.c
-@@ -161,6 +161,10 @@ thread_pool_routine(void *dt)
+--- src/names/thread_resolve.c.orig	2017-03-18 16:11:42 UTC
++++ src/names/thread_resolve.c
+@@ -162,6 +162,10 @@ thread_pool_routine(void *dt)
  
        pthread_mutex_unlock(&resolvemtx);
     }
@@ -11,7 +11,7 @@
     return NULL;
  }
  
-@@ -279,9 +283,6 @@ thread_close(void)
+@@ -280,9 +284,6 @@ thread_close(void)
  {
    /* thread pool shutdown */ 
    stop_threads();
diff --git a/net-mgmt/etherape/files/patch-src_decode__proto.c b/net-mgmt/etherape/files/patch-src_stats_decode__proto.c
index 7c89891b9573..244f754f1199 100644
--- a/net-mgmt/etherape/files/patch-src_decode__proto.c
+++ b/net-mgmt/etherape/files/patch-src_stats_decode__proto.c
@@ -1,6 +1,6 @@
---- src/decode_proto.c.orig	2014-02-02 18:38:16 UTC
-+++ src/decode_proto.c
-@@ -27,6 +27,15 @@
+--- src/stats/decode_proto.c.orig	2017-03-18 16:11:42 UTC
++++ src/stats/decode_proto.c
+@@ -25,6 +25,15 @@
  #include "appdata.h"
  #include <ctype.h>
  #include <string.h>