CVS commit: pkgsrc/net/net-snmp

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Wed Aug 21 09:30:12 UTC 2019

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

Log Message:
net-snmp: Fix compilation on Solaris 11 and SmartOS.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/net/net-snmp/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/net-snmp/distinfo
diff -u pkgsrc/net/net-snmp/distinfo:1.94 pkgsrc/net/net-snmp/distinfo:1.95
--- pkgsrc/net/net-snmp/distinfo:1.94   Sun Jun 30 21:43:25 2019
+++ pkgsrc/net/net-snmp/distinfo        Wed Aug 21 09:30:12 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2019/06/30 21:43:25 kamil Exp $
+$NetBSD: distinfo,v 1.95 2019/08/21 09:30:12 otis Exp $
 
 SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839
 RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2
@@ -14,7 +14,7 @@ SHA1 (patch-agent_mibgroup_hardware_cpu_
 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) = 39888f6489b89bd6598c453977b29519b2f7968f
-SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = 5ccec9cc26982e05607c3066e1f50763c99e7b4f
+SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = f2faca89cf4a53ba5d2bd6ba47730f3dbf242789
 SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240
 SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
 SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5

Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c:1.1      Thu Feb  9 09:33:57 2017
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c  Wed Aug 21 09:30:12 2019
@@ -1,18 +1,15 @@
-$NetBSD: patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c,v 1.1 2017/02/09 09:33:57 maya Exp $
+$NetBSD: patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c,v 1.2 2019/08/21 09:30:12 otis Exp $
 
-Fix compilation on Solaris 11.2, from upstream commit:
-https://sourceforge.net/p/net-snmp/code/ci/e2ce8bb37819c9ae24d482ac4108772f7b2c9b8c/
+Fix compilation on Solaris 11 and also on SmartOS.
 
 --- agent/mibgroup/host/data_access/swrun_procfs_psinfo.c.orig 2014-12-08 20:23:22.000000000 +0000
 +++ agent/mibgroup/host/data_access/swrun_procfs_psinfo.c
-@@ -33,6 +33,10 @@
- #include <sys/proc.h>
+@@ -23,6 +23,8 @@
+ #include <fcntl.h>
  #endif
  
-+#include <sys/processor.h>
-+#include <sys/procset.h>
-+#include <thread.h>
++#include <sys/thread.h>
 +
- #include <net-snmp/net-snmp-includes.h>
- #include <net-snmp/agent/net-snmp-agent-includes.h>
- #include <net-snmp/library/container.h>
+ #define HAVE_SYS_PROCFS_H    /* XXX - Needs a configure check! */
+ #ifdef HAVE_SYS_PROCFS_H
+ #define _KERNEL              /* For psinfo_t */