Tue Jul 2 09:40:32 2019 UTC ()
Pullup ticket #5983 - requested by kamil
net/net-snmp: build fix for PR pkg/54333

Revisions pulled up:
- net/net-snmp/distinfo                                         1.94
- net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c 1.4

---
   Module Name:    pkgsrc
   Committed By:   kamil
   Date:           Sun Jun 30 21:43:25 UTC 2019

   Modified Files:
           pkgsrc/net/net-snmp: distinfo
           pkgsrc/net/net-snmp/patches:
               patch-agent_mibgroup_host_data__access_swrun__kinfo.c

   Log Message:
   net-snmp: Fix build on NetBSD 8.99.49

   Make usage of LSDEAD conditional.


(bsiegert)
diff -r1.93 -r1.93.12.1 pkgsrc/net/net-snmp/distinfo
diff -r1.3 -r1.3.38.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
cvs diff -r1.93 -r1.93.12.1 pkgsrc/net/net-snmp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/distinfo 2018/02/28 01:52:02 1.93
+++ pkgsrc/net/net-snmp/distinfo 2019/07/02 09:40:31 1.93.12.1
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.93 2018/02/28 01:52:02 maya Exp $ 1$NetBSD: distinfo,v 1.93.12.1 2019/07/02 09:40:31 bsiegert Exp $
2 2
3SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839 3SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839
4RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2 4RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2
5SHA512 (net-snmp-5.7.3.tar.gz) = 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb 5SHA512 (net-snmp-5.7.3.tar.gz) = 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
6Size (net-snmp-5.7.3.tar.gz) = 6382428 bytes 6Size (net-snmp-5.7.3.tar.gz) = 6382428 bytes
7SHA1 (patch-ac) = fa5a32e497a7651f4804082d921bb2e91b17d098 7SHA1 (patch-ac) = fa5a32e497a7651f4804082d921bb2e91b17d098
8SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101 8SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101
9SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa 9SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
10SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4 10SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4
11SHA1 (patch-agent_mibgroup_agentx_master_admin.c) = 3c233c1e3113fbc9c1de34cb4cbacca9ef4a6fe2 11SHA1 (patch-agent_mibgroup_agentx_master_admin.c) = 3c233c1e3113fbc9c1de34cb4cbacca9ef4a6fe2
12SHA1 (patch-agent_mibgroup_at.c) = 50842f54d98b3cf7bf7028ddbb582b84b7ae682f 12SHA1 (patch-agent_mibgroup_at.c) = 50842f54d98b3cf7bf7028ddbb582b84b7ae682f
13SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = d36d2490448c2dfda0383c67deb36fdb31ff18a3 13SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = d36d2490448c2dfda0383c67deb36fdb31ff18a3
14SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f 14SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
15SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa 15SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
16SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258 16SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 39888f6489b89bd6598c453977b29519b2f7968f
17SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = 5ccec9cc26982e05607c3066e1f50763c99e7b4f 17SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = 5ccec9cc26982e05607c3066e1f50763c99e7b4f
18SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240 18SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240
19SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a 19SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
20SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5 20SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5
21SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e 21SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
22SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = d6a271145e6ba774cbc1e93caa14e3d22dc43075 22SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = d6a271145e6ba774cbc1e93caa14e3d22dc43075
23SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = f547f3fd08848803cbf7ce08a41ba463c4d02992 23SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = f547f3fd08848803cbf7ce08a41ba463c4d02992
24SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 2eb5e5c05ecb23f69cbb0d38a31e14d5b5ddc6b7 24SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 2eb5e5c05ecb23f69cbb0d38a31e14d5b5ddc6b7
25SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d 25SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
26SHA1 (patch-agent_snmp__agent.c) = 2dbfea907d0e1881f5d55c5b270984fc3a562da9 26SHA1 (patch-agent_snmp__agent.c) = 2dbfea907d0e1881f5d55c5b270984fc3a562da9
27SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8 27SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8
28SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970 28SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
29SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa 29SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
cvs diff -r1.3 -r1.3.38.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c 2014/12/31 10:06:57 1.3
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c 2019/07/02 09:40:31 1.3.38.1
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.3 2014/12/31 10:06:57 adam Exp $ 1$NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.3.38.1 2019/07/02 09:40:31 bsiegert Exp $
2 2
3--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig 2014-12-08 20:23:22.000000000 +0000 3--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig 2014-12-08 20:23:22.000000000 +0000
4+++ agent/mibgroup/host/data_access/swrun_kinfo.c 4+++ agent/mibgroup/host/data_access/swrun_kinfo.c
5@@ -5,6 +5,10 @@ 5@@ -5,6 +5,10 @@
6 * 6 *
7 * NB: later FreeBSD and OpenBSD use different kinfo_proc structures 7 * NB: later FreeBSD and OpenBSD use different kinfo_proc structures
8 */ 8 */
9+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
10+#define _KMEMUSER 10+#define _KMEMUSER
11+#endif 11+#endif
12+ 12+
13 #include <net-snmp/net-snmp-config.h> 13 #include <net-snmp/net-snmp-config.h>
14  14
15 #include <stdio.h> 15 #include <stdio.h>
 16@@ -286,7 +290,9 @@ netsnmp_arch_swrun_container_load( netsn
 17 case LSSUSPENDED:
 18 case LSSTOP: entry->hrSWRunStatus = HRSWRUNSTATUS_NOTRUNNABLE;
 19 break;
 20+#ifdef LSDEAD
 21 case LSDEAD:
 22+#endif
 23 case LSZOMB: entry->hrSWRunStatus = HRSWRUNSTATUS_INVALID;
 24 break;
 25 default: