pkg/54333: (net/net-snmpd) suffers from changes on sys/sys/lwp.h and LSDEAD no longer defined

[makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>]

>Number:         54333
>Category:       pkg
>Synopsis:       (net/net-snmpd) suffers from changes on sys/sys/lwp.h and LSDEAD no longer defined
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 30 05:20:00 +0000 2019
>Originator:     Makoto Fujiwara
>Release:        NetBSD 8.99.45
>Organization:
	
>Environment:
	
	
System: NetBSD CF-SX2 8.99.45 NetBSD 8.99.45 (GENERIC-no-SYNAPTICS) #0: Sun Jun 23 08:30:11 JST 2019 root@CF-SX3:/tmp/O/sys/arch/amd64/compile/GENERIC-no-SYNAPTICS amd64
Architecture: x86_64
Machine: amd64
>Description:
           (net/net-snmpd) suffers from changes on sys/sys/lwp.h and LSDEAD no longer defined
 +----------------
 | host/data_access/swrun_kinfo.c: In function 'netsnmp_arch_swrun_container_load':
 | host/data_access/swrun_kinfo.c:293:7: error: 'LSDEAD' undeclared (first use in this function); did you mean 'SDEAD'?
 |   case LSDEAD:
 |        ^~~~~~
 |        SDEAD
 | host/data_access/swrun_kinfo.c:293:7: note: each undeclared identifier is reported only once for each function it appears in
 | *** Error code 1
 +----------------
>How-To-Repeat:
	install NetBSD/amd 8.99.46 (or later)
	cd /usr/pkgsrc/net/net-snmpd;
	make clean && make package
	
>Fix:
Index: net/net-snmp/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/net-snmp/distinfo,v
retrieving revision 1.93
diff -u -r1.93 distinfo
--- net/net-snmp/distinfo	28 Feb 2018 01:52:02 -0000	1.93
+++ net/net-snmp/distinfo	30 Jun 2019 05:10:11 -0000
@@ -13,7 +13,7 @@
 SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = d36d2490448c2dfda0383c67deb36fdb31ff18a3
 SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
-SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258
+SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = e52c40bed8b12effd0d154015dbf7773a22fae50
 SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = 5ccec9cc26982e05607c3066e1f50763c99e7b4f
 SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240
 SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
Index: net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
===================================================================
RCS file: /cvsroot/pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v
retrieving revision 1.3
diff -u -r1.3 patch-agent_mibgroup_host_data__access_swrun__kinfo.c
--- net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c	31 Dec 2014 10:06:57 -0000	1.3
+++ net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c	30 Jun 2019 05:10:11 -0000
@@ -1,7 +1,10 @@
 $NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.3 2014/12/31 10:06:57 adam Exp $
 
---- agent/mibgroup/host/data_access/swrun_kinfo.c.orig	2014-12-08 20:23:22.000000000 +0000
-+++ agent/mibgroup/host/data_access/swrun_kinfo.c
+1. Requires _KMEMUSER and uvm/uvm_extern.h on NetBSD/current.
+2. NetBSD 8.99.46 or later does not define LSDEAD
+
+--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig	2014-12-09 05:23:22.000000000 +0900
++++ agent/mibgroup/host/data_access/swrun_kinfo.c	2019-06-30 13:40:12.117861517 +0900
 @@ -5,6 +5,10 @@
   *
   * NB: later FreeBSD and OpenBSD use different kinfo_proc structures
@@ -13,3 +16,14 @@
  #include <net-snmp/net-snmp-config.h>
  
  #include <stdio.h>
+@@ -286,7 +290,10 @@ netsnmp_arch_swrun_container_load( netsn
+ 	case LSSUSPENDED:
+         case LSSTOP:  entry->hrSWRunStatus = HRSWRUNSTATUS_NOTRUNNABLE;
+                       break;
++		      /* NetBSD 8.99.46 or later has no this MACRO defined */
++#ifdef LSDEAD
+ 	case LSDEAD:
++#endif
+         case LSZOMB:  entry->hrSWRunStatus = HRSWRUNSTATUS_INVALID;
+ 		      break;
+         default:   

>Unformatted: