For now, disable the collection of network interface statistics on

NetBSD 9.99.45 or newer.  With recent changes to network internals,
we need to come up with a new way to retrieve these statistics.

2 files changed, 18 insertions, 11 deletions

diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index c8208af2973..84e77f4e78f 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2015/11/04 01:32:42 agc Exp $
+$NetBSD: distinfo,v 1.29 2020/02/22 13:10:22 pgoyette Exp $
 
 SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e
 RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b
 SHA512 (xosview-1.8.3.tar.gz) = 196dc66f4a20c6cd9663f82e613f0039ee09cfe565867dc68e3c29b8dc6be4037ad26f10a8a7f36e9b80fb5ab406592a30254840b473861be836e44503fd94a5
 Size (xosview-1.8.3.tar.gz) = 259793 bytes
-SHA1 (patch-aa) = 4a618b50e5c852b454db84019e7fa281c4b67337
+SHA1 (patch-aa) = 7d24ba9b1caab1968bb49ba1da4d850fcf615b08
 SHA1 (patch-ab) = 2bc4ca0772c931dc208edb99158e7f7ae7261b3b
 SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede
 SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
index a025fdd9f43..1b86ed3d949 100644
--- a/sysutils/xosview/patches/patch-aa
+++ b/sysutils/xosview/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $
+$NetBSD: patch-aa,v 1.20 2020/02/22 13:10:22 pgoyette Exp $
 
---- bsd/kernel.cc.orig	2006-02-18 08:36:06.000000000 +0100
-+++ bsd/kernel.cc	2007-12-17 21:23:26.000000000 +0100
+--- bsd/kernel.cc.orig	2006-02-17 23:36:06.000000000 -0800
++++ bsd/kernel.cc	2020-02-21 13:26:06.554690464 -0800
 @@ -115,8 +115,16 @@
  // in __NetBSD_Version__ for us if needed.
  #if defined(XOSVIEW_NETBSD) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106010000)
@@ -92,30 +92,37 @@ $NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $
      char ifname[256];
  #ifdef NETBSD_OLD_IFACE
      //  In pre-1.2A, getting the interface name was more complicated.
-@@ -476,15 +488,21 @@
+@@ -476,15 +488,29 @@
      safe_kvm_read ((u_long) (((char*)ifnetp) + (&ifnet.if_xname[0] - (char*)&ifnet)), ifname, 256);
      snprintf (ifname, 256, "%s", ifname);
  #endif
 +#ifdef NET_DEBUG
      printf ("Interface name is %s\n", ifname);
++#if defined(XOSVIEW_NETBSD) && (__NetBSD_Version__ >= 999004500)
++/* Need to create new way to access interface stats */
++#else
      printf ("Ibytes: %8llu Obytes %8llu\n",
  	(unsigned long long) ifnet.if_ibytes,
  	(unsigned long long) ifnet.if_obytes);
      printf ("Ipackets:  %8llu\n", (unsigned long long) ifnet.if_ipackets);
--#endif
+ #endif
 +#endif /* NET_DEBUG */
 +      if (ifname != netIface_)
 +       goto skipif;
 +    }
 +#endif /* XOSVIEW_NETBSD */
++#if defined(XOSVIEW_NETBSD) && (__NetBSD_Version__ >= 999004500)
++/* Need to create new way to access interface stats */
++#else
      *inbytes  += ifnet.if_ibytes;
      *outbytes += ifnet.if_obytes;
++#endif
  
 +    skipif:
      //  Linked-list step taken from if.c in netstat source, line 120.
  #ifdef XOSVIEW_FREEBSD
  #if (__FreeBSD_version >= 300000) 
-@@ -773,13 +791,12 @@
+@@ -773,13 +799,12 @@
  #ifdef NETBSD_1_6A
    // Do a sysctl with a NULL data pointer to get the size that would
    // have been returned, and use that to figure out # drives.
@@ -131,7 +138,7 @@ $NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $
    return 1;
  #endif
    return ValidSymbol(DISKLIST_SYM_INDEX);
-@@ -816,19 +833,29 @@
+@@ -816,19 +841,29 @@
  #else
  #if defined(NETBSD_1_6A)
    // Use the new sysctl to do this for us.
@@ -164,7 +171,7 @@ $NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $
    }
    *bytesXferred = xferred;
  #else
-@@ -1016,7 +1043,7 @@
+@@ -1016,7 +1051,7 @@
  
      while (evptr && i < NUM_INTR) {
  
@@ -173,7 +180,7 @@ $NetBSD: patch-aa,v 1.19 2007/12/17 22:08:12 veego Exp $
  
        evptr = evcnt.ev_list.tqe_next;
  
-@@ -1024,7 +1051,7 @@
+@@ -1024,7 +1059,7 @@
        if (evcnt.ev_type != EVCNT_TYPE_INTR)
  	continue;