Fri Jan 11 13:34:47 2013 UTC ()
Requires _KMEMUSER and uvm/uvm_extern.h on NetBSD/current.


(joerg)
diff -r1.66 -r1.67 pkgsrc/net/net-snmp/distinfo
diff -r0 -r1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-fd
cvs diff -r1.66 -r1.67 pkgsrc/net/net-snmp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/distinfo 2012/05/17 14:37:07 1.66
+++ pkgsrc/net/net-snmp/distinfo 2013/01/11 13:34:46 1.67
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.66 2012/05/17 14:37:07 marino Exp $ 1$NetBSD: distinfo,v 1.67 2013/01/11 13:34:46 joerg Exp $
2 2
3SHA1 (net-snmp-5.6.1.1.tar.gz) = ec88ba3e0dff4d1b3d342ccebb48ea84c9fa6fa9 3SHA1 (net-snmp-5.6.1.1.tar.gz) = ec88ba3e0dff4d1b3d342ccebb48ea84c9fa6fa9
4RMD160 (net-snmp-5.6.1.1.tar.gz) = 9a4a83f7fe9431a0694b5fee33866ccea80fcab4 4RMD160 (net-snmp-5.6.1.1.tar.gz) = 9a4a83f7fe9431a0694b5fee33866ccea80fcab4
5Size (net-snmp-5.6.1.1.tar.gz) = 5937279 bytes 5Size (net-snmp-5.6.1.1.tar.gz) = 5937279 bytes
6SHA1 (patch-aa) = 699f6a6770c51c8976d8ec352ad213893e749032 6SHA1 (patch-aa) = 699f6a6770c51c8976d8ec352ad213893e749032
7SHA1 (patch-ab) = d23ddbce52b54462ea2f7c695533a41eaf0046ee 7SHA1 (patch-ab) = d23ddbce52b54462ea2f7c695533a41eaf0046ee
8SHA1 (patch-ac) = f947f2fb88cee7bf92b5aa8cfe94ade079df1a66 8SHA1 (patch-ac) = f947f2fb88cee7bf92b5aa8cfe94ade079df1a66
9SHA1 (patch-ae) = 54541bffecdbf4c526280bc82ffd370a59963d88 9SHA1 (patch-ae) = 54541bffecdbf4c526280bc82ffd370a59963d88
10SHA1 (patch-af) = d7641e502fd0a2969fa838fc67244cdfc6995369 10SHA1 (patch-af) = d7641e502fd0a2969fa838fc67244cdfc6995369
11SHA1 (patch-ag) = 8f9dedcf741c4b0ea2c0150c8b0a22747ca8a313 11SHA1 (patch-ag) = 8f9dedcf741c4b0ea2c0150c8b0a22747ca8a313
12SHA1 (patch-agent_mibgroup_agent_extend.c) = b3b04c51e7059426963fdb4712a711e2da053a28 12SHA1 (patch-agent_mibgroup_agent_extend.c) = b3b04c51e7059426963fdb4712a711e2da053a28
 13SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = ef82011e34f61e0bd606ee497647a605d9c81d23
13SHA1 (patch-ah) = 7cea4194c858d7a8a9093eaf4426404e9202c3f1 14SHA1 (patch-ah) = 7cea4194c858d7a8a9093eaf4426404e9202c3f1
14SHA1 (patch-ai) = 1eb3b72dcfff90c8e973590265bdb1c07b717eaa 15SHA1 (patch-ai) = 1eb3b72dcfff90c8e973590265bdb1c07b717eaa
15SHA1 (patch-aj) = e3337d01e96cc0739dbf3b1c7bde44d1126c32ae 16SHA1 (patch-aj) = e3337d01e96cc0739dbf3b1c7bde44d1126c32ae
16SHA1 (patch-ak) = 8a7b26b29dcce292355c8239d6b5a2b9fe0b3253 17SHA1 (patch-ak) = 8a7b26b29dcce292355c8239d6b5a2b9fe0b3253
17SHA1 (patch-al) = 468394dc540329449c074a6f19ab3e0287041607 18SHA1 (patch-al) = 468394dc540329449c074a6f19ab3e0287041607
18SHA1 (patch-am) = db771145f72a043beeb589e450617e42ca5d5c00 19SHA1 (patch-am) = db771145f72a043beeb589e450617e42ca5d5c00
19SHA1 (patch-an) = 6f47b44697f22d322e35b83d47aa5f7383a8c7cd 20SHA1 (patch-an) = 6f47b44697f22d322e35b83d47aa5f7383a8c7cd
20SHA1 (patch-ao) = 989b410de3a28c37a50581a6f8d109f448b2b421 21SHA1 (patch-ao) = 989b410de3a28c37a50581a6f8d109f448b2b421
21SHA1 (patch-ap) = 36032fefe04671a0a5f7db765bdd2115963d01f1 22SHA1 (patch-ap) = 36032fefe04671a0a5f7db765bdd2115963d01f1
22SHA1 (patch-aq) = b639bceac59a987ec779fe472fa4e97aa7b24204 23SHA1 (patch-aq) = b639bceac59a987ec779fe472fa4e97aa7b24204
23SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1 24SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
24SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582 25SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
25SHA1 (patch-dc) = f84beba7fae731bb0e38b9635dd2f7009c3659aa 26SHA1 (patch-dc) = f84beba7fae731bb0e38b9635dd2f7009c3659aa
@@ -41,14 +42,14 @@ SHA1 (patch-dt) = f2a45e4fc2653d7b8c38c6 @@ -41,14 +42,14 @@ SHA1 (patch-dt) = f2a45e4fc2653d7b8c38c6
41SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba 42SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba
42SHA1 (patch-el) = f32d387045854686d9fc036de7d884cf889134ae 43SHA1 (patch-el) = f32d387045854686d9fc036de7d884cf889134ae
43SHA1 (patch-es) = 222de078a45ae2e80a3903342916783aec43cc43 44SHA1 (patch-es) = 222de078a45ae2e80a3903342916783aec43cc43
44SHA1 (patch-et) = 5cb3d9c96e78b9f3e85ef3c5af96059cca865762 45SHA1 (patch-et) = 5cb3d9c96e78b9f3e85ef3c5af96059cca865762
45SHA1 (patch-eu) = 606d9952dc9a994d8058004d5ba411c3c9dddcec 46SHA1 (patch-eu) = 606d9952dc9a994d8058004d5ba411c3c9dddcec
46SHA1 (patch-ev) = 966e9686d826e530323baad5a10e6bd251a08526 47SHA1 (patch-ev) = 966e9686d826e530323baad5a10e6bd251a08526
47SHA1 (patch-ew) = 503c4db9c3e784a16854a6b5aa40a79798f2e381 48SHA1 (patch-ew) = 503c4db9c3e784a16854a6b5aa40a79798f2e381
48SHA1 (patch-ex) = 911c5ca0186ef806f0ffb9e7cfbc0e14f79d9e62 49SHA1 (patch-ex) = 911c5ca0186ef806f0ffb9e7cfbc0e14f79d9e62
49SHA1 (patch-ey) = b96fd2f4abb53bc1233753623128fe2e7f99089c 50SHA1 (patch-ey) = b96fd2f4abb53bc1233753623128fe2e7f99089c
50SHA1 (patch-ez) = a2d8ed3f0895b1f5908b8f311ad86dd79a7ffe04 51SHA1 (patch-ez) = a2d8ed3f0895b1f5908b8f311ad86dd79a7ffe04
51SHA1 (patch-fa) = f0102bf99b003b143fa3279e2187616b89e3b678 52SHA1 (patch-fa) = f0102bf99b003b143fa3279e2187616b89e3b678
52SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb 53SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb
53SHA1 (patch-fc) = 4e0b9841cbff0da02748efc9105096ffcbe58e81 54SHA1 (patch-fc) = 4e0b9841cbff0da02748efc9105096ffcbe58e81
54SHA1 (patch-fd) = 6411ba28f0e9a9b66e22f3fbc71ca207cfd6bdd7 55SHA1 (patch-fd) = efab8fe5cb1e6bdc7799dbdfd27e88d734d843ad
File Added: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__kinfo.c
$NetBSD: patch-agent_mibgroup_host_data__access_swrun__kinfo.c,v 1.1 2013/01/11 13:34:46 joerg Exp $

--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig	2013-01-11 11:01:25.000000000 +0000
+++ agent/mibgroup/host/data_access/swrun_kinfo.c
@@ -5,6 +5,10 @@
  *
  * NB: later FreeBSD uses a different kinfo_proc structure
  */
+#ifdef __NetBSD__
+#define _KMEMUSER
+#endif
+
 #include <net-snmp/net-snmp-config.h>
 
 #include <stdio.h>
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-fd (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-fd 2010/12/26 09:23:49 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-fd 2013/01/11 13:34:46 1.2
@@ -1,30 +1,40 @@ @@ -1,30 +1,40 @@
1$NetBSD: patch-fd,v 1.1 2010/12/26 09:23:49 sekiya Exp $ 1$NetBSD: patch-fd,v 1.2 2013/01/11 13:34:46 joerg Exp $
2 2
3--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2010-12-26 16:45:27.000000000 +0900 3--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2010-06-12 21:33:30.000000000 +0000
4+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2010-12-26 17:14:36.000000000 +0900 4+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c
5@@ -49,7 +49,11 @@ 5@@ -19,6 +19,9 @@
 6 #else
 7 #include <sys/sched.h>
 8 #endif
 9+#if defined(__NetBSD__)
 10+#include <uvm/uvm_extern.h>
 11+#endif
 12
 13 #include <sys/param.h>
 14 #include <sys/sysctl.h>
 15@@ -49,7 +52,11 @@ void init_cpu_sysctl( void ) {
6 if ( n <= 0 ) 16 if ( n <= 0 )
7 n = 1; /* Single CPU system */ 17 n = 1; /* Single CPU system */
8 i = sizeof(descr); 18 i = sizeof(descr);
9+#if defined(__NetBSD__) && ( defined(__i386__) || defined(__x86_64__) ) 19+#if defined(__NetBSD__) && ( defined(__i386__) || defined(__x86_64__) )
10+ sysctlbyname("machdep.cpu_brand", descr, (void *)&i, NULL, 0); 20+ sysctlbyname("machdep.cpu_brand", descr, (void *)&i, NULL, 0);
11+#else 21+#else
12 sysctl(model_mib, 2, descr, (void *)&i, NULL, 0); 22 sysctl(model_mib, 2, descr, (void *)&i, NULL, 0);
13+#endif 23+#endif
14 for ( i = 0; i < n; i++ ) { 24 for ( i = 0; i < n; i++ ) {
15 cpu = netsnmp_cpu_get_byIdx( i, 1 ); 25 cpu = netsnmp_cpu_get_byIdx( i, 1 );
16 cpu->status = 2; /* running */ 26 cpu->status = 2; /* running */
17@@ -59,26 +63,22 @@ 27@@ -59,26 +66,22 @@ void init_cpu_sysctl( void ) {
18 cpu_num = n; 28 cpu_num = n;
19 } 29 }
20  30
21- 31-
22+#if defined(__NetBSD__) 32+#if defined(__NetBSD__)
23+#define NETSNMP_CPU_STATS uint64_t 33+#define NETSNMP_CPU_STATS uint64_t
24+#define NETSNMP_KERN_CPU KERN_CP_TIME 34+#define NETSNMP_KERN_CPU KERN_CP_TIME
25+#else 35+#else
26 #define NETSNMP_CPU_STATS long 36 #define NETSNMP_CPU_STATS long
27 #if defined(KERN_CPUSTATS) /* BSDi */ 37 #if defined(KERN_CPUSTATS) /* BSDi */
28 #define NETSNMP_KERN_CPU KERN_CPUSTATS 38 #define NETSNMP_KERN_CPU KERN_CPUSTATS
29 #elif defined(KERN_CPTIME) /* OpenBSD */ 39 #elif defined(KERN_CPTIME) /* OpenBSD */
30 #define NETSNMP_KERN_CPU KERN_CPTIME 40 #define NETSNMP_KERN_CPU KERN_CPTIME
@@ -36,22 +46,22 @@ $NetBSD: patch-fd,v 1.1 2010/12/26 09:23 @@ -36,22 +46,22 @@ $NetBSD: patch-fd,v 1.1 2010/12/26 09:23
36-#define NETSNMP_CPU_STATS uint64_t 46-#define NETSNMP_CPU_STATS uint64_t
37-#endif 47-#endif
38- 48-
39 #elif defined(__FreeBSD__) 49 #elif defined(__FreeBSD__)
40 #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */ 50 #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */
41  51
42 #else 52 #else
43 #error "No CPU statistics sysctl token" 53 #error "No CPU statistics sysctl token"
44 #endif 54 #endif
45+#endif 55+#endif
46  56
47 /* 57 /*
48 Need to check details before enabling this! 58 Need to check details before enabling this!
49@@ -159,7 +159,7 @@ 59@@ -159,7 +162,7 @@ int netsnmp_cpu_arch_load( netsnmp_cache
50 size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE); 60 size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
51 netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 ); 61 netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
52  62
53-#if defined(__FreeBSD__) 63-#if defined(__FreeBSD__)
54+#if defined(__FreeBSD__) || defined (__NetBSD__) 64+#if defined(__FreeBSD__) || defined (__NetBSD__)
55 sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0); 65 sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
56 #else 66 #else
57 sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0); 67 sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0);