Fri Jun 23 16:52:45 2017 UTC ()
Correct build failure of collectd on NetBSD 8.99.1

Address <sys/user.h> removal fallout.


(kamil)
diff -r1.36 -r1.37 pkgsrc/sysutils/collectd/distinfo
diff -r1.6 -r1.7 pkgsrc/sysutils/collectd/patches/patch-src_processes.c
cvs diff -r1.36 -r1.37 pkgsrc/sysutils/collectd/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/distinfo 2017/06/14 13:42:53 1.36
+++ pkgsrc/sysutils/collectd/distinfo 2017/06/23 16:52:45 1.37
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.36 2017/06/14 13:42:53 fhajny Exp $ 1$NetBSD: distinfo,v 1.37 2017/06/23 16:52:45 kamil Exp $
2 2
3SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0 3SHA1 (collectd-5.7.2.tar.bz2) = b27074fc363d942c8aee2f05baed0395a20c86d0
4RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2 4RMD160 (collectd-5.7.2.tar.bz2) = 81860b4fba7cf05b8eca19913ffe05d06b37e1a2
5SHA512 (collectd-5.7.2.tar.bz2) = 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 5SHA512 (collectd-5.7.2.tar.bz2) = 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3
6Size (collectd-5.7.2.tar.bz2) = 1798777 bytes 6Size (collectd-5.7.2.tar.bz2) = 1798777 bytes
7SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319 7SHA1 (patch-Makefile.am) = ed45b75293a4ea2dd577d04eeb3b9017b8f47319
8SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1 8SHA1 (patch-configure.ac) = f450d6b00e5c7c37214b4d90ca057c515ed08fa1
9SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765 9SHA1 (patch-src_Makefile.am) = 1d5cc2f58ce776df04feab2afc937f12ee7b0765
10SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f 10SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
11SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66 11SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66
12SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c 12SHA1 (patch-src_daemon_Makefile.am) = e38d465faf8bdd750fd9cb7f0bd9f041fcc8f83c
13SHA1 (patch-src_df.c) = 5c6549cd9ec72efed5cdb7d8dd9297c50491426e 13SHA1 (patch-src_df.c) = 5c6549cd9ec72efed5cdb7d8dd9297c50491426e
14SHA1 (patch-src_disk.c) = 1d458db9753be9c8ad1ae5edb3468acf7419a66b 14SHA1 (patch-src_disk.c) = 1d458db9753be9c8ad1ae5edb3468acf7419a66b
15SHA1 (patch-src_entropy.c) = 293e7105866b9b7c3eb5058dc314eaa510899843 15SHA1 (patch-src_entropy.c) = 293e7105866b9b7c3eb5058dc314eaa510899843
16SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0 16SHA1 (patch-src_irq.c) = 78f1757ff2ed6db9fb1d0e773c2a01eb190d53a0
17SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e 17SHA1 (patch-src_libcollectclient_network__buffer.c) = 62924943831e6d0585b103e567888f9af5c46f9e
18SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7 18SHA1 (patch-src_memory.c) = 2934cd50e454fc14d0ec952854c88b0a830fa9a7
19SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61 19SHA1 (patch-src_netstat__udp.c) = 30cb12d25f56c60959658dbd181783212e00cc61
20SHA1 (patch-src_processes.c) = 1a75fdaa42f37eef1a968d299c3549e640fb68b2 20SHA1 (patch-src_processes.c) = 3dd8510bfd0d25051f30519f62d638536c45a6e2
21SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6 21SHA1 (patch-src_statsd.c) = 35f4349d2d2c9bddc0f4770344f969157cd012f6
22SHA1 (patch-src_swap.c) = 24da6e04e3006639311e8111f26f72e4fab4054a 22SHA1 (patch-src_swap.c) = 24da6e04e3006639311e8111f26f72e4fab4054a
23SHA1 (patch-src_tcpconns.c) = b85de1d0eb03989df12d9688b38d61733a13c028 23SHA1 (patch-src_tcpconns.c) = b85de1d0eb03989df12d9688b38d61733a13c028
24SHA1 (patch-src_utils__dns.c) = 138a3168dc109d785412ffd068edab3b4dacca36 24SHA1 (patch-src_utils__dns.c) = 138a3168dc109d785412ffd068edab3b4dacca36
25SHA1 (patch-src_utils__format__kairosdb.c) = 2f7bde47682d2b877f9bd2d2c794a21c297aa9e5 25SHA1 (patch-src_utils__format__kairosdb.c) = 2f7bde47682d2b877f9bd2d2c794a21c297aa9e5
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/collectd/patches/Attic/patch-src_processes.c (expand / switch to unified diff)

--- pkgsrc/sysutils/collectd/patches/Attic/patch-src_processes.c 2017/02/14 21:23:13 1.6
+++ pkgsrc/sysutils/collectd/patches/Attic/patch-src_processes.c 2017/06/23 16:52:45 1.7
@@ -1,79 +1,81 @@ @@ -1,79 +1,81 @@
1$NetBSD: patch-src_processes.c,v 1.6 2017/02/14 21:23:13 joerg Exp $ 1$NetBSD: patch-src_processes.c,v 1.7 2017/06/23 16:52:45 kamil Exp $
2 2
3Add a port to NetBSD. 3Add a port to NetBSD.
4 4
5--- src/processes.c.orig 2017-01-23 07:53:57.000000000 +0000 5--- src/processes.c.orig 2017-06-06 18:13:54.693164693 +0000
6+++ src/processes.c 6+++ src/processes.c
7@@ -95,14 +95,14 @@ 7@@ -95,14 +95,16 @@
8 /* #endif KERNEL_LINUX */ 8 /* #endif KERNEL_LINUX */
9  9
10 #elif HAVE_LIBKVM_GETPROCS && \ 10 #elif HAVE_LIBKVM_GETPROCS && \
11- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) 11- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
12+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) 12+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
13 #include <kvm.h> 13 #include <kvm.h>
14 #include <sys/param.h> 14 #include <sys/param.h>
15 #include <sys/proc.h> 15 #include <sys/proc.h>
16 #include <sys/sysctl.h> 16 #include <sys/sysctl.h>
 17+#if defined(__FreeBSD__) || defined(__DragonFly__)
17 #include <sys/user.h> 18 #include <sys/user.h>
 19+#endif
18 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || 20 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
19- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */ 21- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
20+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */ 22+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
21  23
22 #elif HAVE_PROCINFO_H 24 #elif HAVE_PROCINFO_H
23 #include <procinfo.h> 25 #include <procinfo.h>
24@@ -244,10 +244,15 @@ static void ps_fill_details(const procst 26@@ -244,10 +246,15 @@ static void ps_fill_details(const procst
25 /* #endif KERNEL_LINUX */ 27 /* #endif KERNEL_LINUX */
26  28
27 #elif HAVE_LIBKVM_GETPROCS && \ 29 #elif HAVE_LIBKVM_GETPROCS && \
28- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) 30- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
29+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) 31+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
30 static int pagesize; 32 static int pagesize;
31+ 33+
32+#if KERNEL_NETBSD 34+#if KERNEL_NETBSD
33+int maxslp; 35+int maxslp;
34+#endif 36+#endif
35+ 37+
36 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || 38 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
37- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */ 39- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
38+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */ 40+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
39  41
40 #elif HAVE_PROCINFO_H 42 #elif HAVE_PROCINFO_H
41 static struct procentry64 procentry[MAXPROCENTRY]; 43 static struct procentry64 procentry[MAXPROCENTRY];
42@@ -601,10 +606,21 @@ static int ps_init(void) { 44@@ -601,10 +608,21 @@ static int ps_init(void) {
43 /* #endif KERNEL_LINUX */ 45 /* #endif KERNEL_LINUX */
44  46
45 #elif HAVE_LIBKVM_GETPROCS && \ 47 #elif HAVE_LIBKVM_GETPROCS && \
46- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD) 48- (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD)
47+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) 49+ (HAVE_STRUCT_KINFO_PROC_FREEBSD || HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD)
48+#if KERNEL_NETBSD 50+#if KERNEL_NETBSD
49+ int mib[2]; 51+ int mib[2];
50+ size_t size; 52+ size_t size;
51+ 53+
52+ mib[0] = CTL_VM; 54+ mib[0] = CTL_VM;
53+ mib[1] = VM_MAXSLP; 55+ mib[1] = VM_MAXSLP;
54+ size = sizeof(maxslp); 56+ size = sizeof(maxslp);
55+ if (sysctl(mib, 2, &maxslp, &size, NULL, 0) == -1) 57+ if (sysctl(mib, 2, &maxslp, &size, NULL, 0) == -1)
56+ maxslp = 20; /* reasonable default? */ 58+ maxslp = 20; /* reasonable default? */
57+#endif 59+#endif
58+ 60+
59 pagesize = getpagesize(); 61 pagesize = getpagesize();
60 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD || 62 /* #endif HAVE_LIBKVM_GETPROCS && (HAVE_STRUCT_KINFO_PROC_FREEBSD ||
61- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */ 63- * HAVE_STRUCT_KINFO_PROC_OPENBSD) */
62+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */ 64+ * HAVE_STRUCT_KINFO_PROC_OPENBSD || HAVE_STRUCT_KINFO_PROC2_NETBSD) */
63  65
64 #elif HAVE_PROCINFO_H 66 #elif HAVE_PROCINFO_H
65 pagesize = getpagesize(); 67 pagesize = getpagesize();
66@@ -1896,6 +1912,187 @@ static int ps_read(void) { 68@@ -1896,6 +1914,187 @@ static int ps_read(void) {
67 ps_submit_proc_list(ps_ptr); 69 ps_submit_proc_list(ps_ptr);
68 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */ 70 /* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
69  71
70+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD 72+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC2_NETBSD
71+ int running = 0; 73+ int running = 0;
72+ int sleeping = 0; 74+ int sleeping = 0;
73+ int zombies = 0; 75+ int zombies = 0;
74+ int stopped = 0; 76+ int stopped = 0;
75+ int blocked = 0; 77+ int blocked = 0;
76+ int idle = 0; 78+ int idle = 0;
77+ int wait = 0; 79+ int wait = 0;
78+ 80+
79+ kvm_t *kd; 81+ kvm_t *kd;