Wed Nov 17 00:59:07 2010 UTC ()
Fix build problem on NetBSD 4.

Previous patch for NetBSD wasn't really for netbsd4 but 4.99.58 and later.
So, I changed "#ifdef netbsd4" to "#ifdef NETBSD_STATS_VIA_SYSCTL" and
clean up patches.  Should be fix PR pkg/43288.

It is fix of build problem only, so no PKG_REVISION bump.


(taca)
diff -r1.56 -r1.57 pkgsrc/net/net-snmp/distinfo
diff -r1.4 -r1.5 pkgsrc/net/net-snmp/patches/patch-et
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-eu
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-ev
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-ew
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-ex
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-ez
diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/patch-fa
diff -r1.2 -r1.3 pkgsrc/net/net-snmp/patches/patch-ey
cvs diff -r1.56 -r1.57 pkgsrc/net/net-snmp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/distinfo 2010/07/20 08:33:44 1.56
+++ pkgsrc/net/net-snmp/distinfo 2010/11/17 00:59:06 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.56 2010/07/20 08:33:44 adam Exp $ 1$NetBSD: distinfo,v 1.57 2010/11/17 00:59:06 taca Exp $
2 2
3SHA1 (net-snmp-5.4.3.tar.gz) = 849a20ddeaa90b1b0010e487876927e615b5c6bc 3SHA1 (net-snmp-5.4.3.tar.gz) = 849a20ddeaa90b1b0010e487876927e615b5c6bc
4RMD160 (net-snmp-5.4.3.tar.gz) = 417f47c301c3221a64f37162b56b4661c9f6d8cb 4RMD160 (net-snmp-5.4.3.tar.gz) = 417f47c301c3221a64f37162b56b4661c9f6d8cb
5Size (net-snmp-5.4.3.tar.gz) = 5199202 bytes 5Size (net-snmp-5.4.3.tar.gz) = 5199202 bytes
6SHA1 (patch-aa) = 34f85e513ace26c1c2b05bb1c4b72a23491861cf 6SHA1 (patch-aa) = 34f85e513ace26c1c2b05bb1c4b72a23491861cf
7SHA1 (patch-ab) = b24653882f757a247771f802f2d58ea42c0d9fb0 7SHA1 (patch-ab) = b24653882f757a247771f802f2d58ea42c0d9fb0
8SHA1 (patch-ac) = 8651736a8166c9edcc46c452e6efe8f6ab80fba8 8SHA1 (patch-ac) = 8651736a8166c9edcc46c452e6efe8f6ab80fba8
9SHA1 (patch-ad) = 33342943740508e38527cc5c049adcbd2cb56b8f 9SHA1 (patch-ad) = 33342943740508e38527cc5c049adcbd2cb56b8f
10SHA1 (patch-ae) = f2aa891feb0e1e1d85cd6bf7f9daed92c5955112 10SHA1 (patch-ae) = f2aa891feb0e1e1d85cd6bf7f9daed92c5955112
11SHA1 (patch-af) = 3fd6b61199bf47673dcfd10aae6a81ef2c4b33ab 11SHA1 (patch-af) = 3fd6b61199bf47673dcfd10aae6a81ef2c4b33ab
12SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f 12SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f
13SHA1 (patch-ah) = 7d4a6fa1cc370da2301da952dabdb996b52fb0f7 13SHA1 (patch-ah) = 7d4a6fa1cc370da2301da952dabdb996b52fb0f7
14SHA1 (patch-ai) = c57baca06856187115db39fd50668203dad0a94c 14SHA1 (patch-ai) = c57baca06856187115db39fd50668203dad0a94c
@@ -34,22 +34,22 @@ SHA1 (patch-dn) = b0c40b7dc7311c44601675 @@ -34,22 +34,22 @@ SHA1 (patch-dn) = b0c40b7dc7311c44601675
34SHA1 (patch-do) = 7a69e6e81cbddbb7fc610f4260fe521a5e4c2348 34SHA1 (patch-do) = 7a69e6e81cbddbb7fc610f4260fe521a5e4c2348
35SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d 35SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
36SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c 36SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
37SHA1 (patch-dr) = 9f962834da29776f43ee1483aca00625bb58674b 37SHA1 (patch-dr) = 9f962834da29776f43ee1483aca00625bb58674b
38SHA1 (patch-ds) = 0ce73a2d5b5b4b9629b7e49e9d4e655ec0f89055 38SHA1 (patch-ds) = 0ce73a2d5b5b4b9629b7e49e9d4e655ec0f89055
39SHA1 (patch-dt) = bd1884af6fb3743e79ab926fcd952068cb9a3642 39SHA1 (patch-dt) = bd1884af6fb3743e79ab926fcd952068cb9a3642
40SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba 40SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba
41SHA1 (patch-eg) = 421ccf1c810a2b03d7ff10fe38e8a3eea62d9836 41SHA1 (patch-eg) = 421ccf1c810a2b03d7ff10fe38e8a3eea62d9836
42SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912 42SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912
43SHA1 (patch-ei) = 7628297dcfd56c8d69cf8235a680956b868aaca5 43SHA1 (patch-ei) = 7628297dcfd56c8d69cf8235a680956b868aaca5
44SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68 44SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68
45SHA1 (patch-ep) = 91029b17538360ba09e8e74943d2c4481f89a33a 45SHA1 (patch-ep) = 91029b17538360ba09e8e74943d2c4481f89a33a
46SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96 46SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96
47SHA1 (patch-et) = 5a352594bfde763c215eb8b0d18951add1f3e777 47SHA1 (patch-et) = e7e56b535b684580ce16eb279b786af6a9e12d40
48SHA1 (patch-eu) = c0521de99c52c517509a76b55a62640fdce06d40 48SHA1 (patch-eu) = 7f6f2ac9cfd88577dbc77ee713bd0041b10c2c9a
49SHA1 (patch-ev) = 4a686c44e73a7d9d6a792db1f1a5b20fc654e33e 49SHA1 (patch-ev) = 966e9686d826e530323baad5a10e6bd251a08526
50SHA1 (patch-ew) = 2f96f61269723adbb4df0cd0adc65d0e0abb6b01 50SHA1 (patch-ew) = 503c4db9c3e784a16854a6b5aa40a79798f2e381
51SHA1 (patch-ex) = ac1876e54fd7bc643ae8a290f83ce4ab3b50d7c6 51SHA1 (patch-ex) = d624bfdea76e425d632be4a523706470f5abe570
52SHA1 (patch-ey) = bc54546495c3726a5e4853eb29b04de9858f8f19 52SHA1 (patch-ey) = ff5f0fbcbea699f5ae628b315b39a676acb8d190
53SHA1 (patch-ez) = 812fffcf992a040677cbb05d8a8344d221203030 53SHA1 (patch-ez) = dc7ef797733fd930f2a3dacb8c28151371706dfc
54SHA1 (patch-fa) = ea4243dd36395d16ee1a6b2eccce9ef833a9308b 54SHA1 (patch-fa) = 9478aa624fbdc82b54d1e7f50f4e2ee0518dcb92
55SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb 55SHA1 (patch-fb) = 64d97a51d82488ef4d3ea5dd40278501975d58fb
cvs diff -r1.4 -r1.5 pkgsrc/net/net-snmp/patches/Attic/patch-et (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-et 2010/05/11 04:39:54 1.4
+++ pkgsrc/net/net-snmp/patches/Attic/patch-et 2010/11/17 00:59:06 1.5
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-et,v 1.4 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-et,v 1.5 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/icmp.c.orig 2010-03-12 00:31:17.000000000 +0000 3--- agent/mibgroup/mibII/icmp.c.orig 2010-10-19 03:54:57.000000000 +0000
4+++ agent/mibgroup/mibII/icmp.c 2010-03-12 00:33:41.000000000 +0000 4+++ agent/mibgroup/mibII/icmp.c
5@@ -127,6 +127,12 @@ 5@@ -127,6 +127,12 @@ init_icmp(void)
6 #define USES_SNMP_DESIGNED_ICMPSTAT 6 #define USES_SNMP_DESIGNED_ICMPSTAT
7 #endif 7 #endif
8  8
9+#ifdef netbsd4 9+#ifdef NETBSD_STATS_VIA_SYSCTL
10+#define ICMP_STAT_STRUCTURE struct icmp_mib 10+#define ICMP_STAT_STRUCTURE struct icmp_mib
11+#define USES_SNMP_DESIGNED_ICMPSTAT 11+#define USES_SNMP_DESIGNED_ICMPSTAT
12+#undef ICMP_NSTATS 12+#undef ICMP_NSTATS
13+#endif 13+#endif
14+ 14+
15 #if defined (WIN32) || defined (cygwin) 15 #if defined (WIN32) || defined (cygwin)
16 #include <iphlpapi.h> 16 #include <iphlpapi.h>
17 #define ICMP_STAT_STRUCTURE MIB_ICMP 17 #define ICMP_STAT_STRUCTURE MIB_ICMP
18@@ -706,6 +712,21 @@ 18@@ -706,6 +712,21 @@ icmp_load(netsnmp_cache *cache, void *vm
19 } 19 }
20 return ret_value; 20 return ret_value;
21 } 21 }
22+#elif defined(netbsd4) 22+#elif defined(NETBSD_STATS_VIA_SYSCTL)
23+int 23+int
24+icmp_load(netsnmp_cache *cache, void *vmagic) 24+icmp_load(netsnmp_cache *cache, void *vmagic)
25+{ 25+{
26+ long ret_value =- -1; 26+ long ret_value =- -1;
27+ 27+
28+ ret_value = netbsd_read_icmp_stat(&icmpstat); 28+ ret_value = netbsd_read_icmp_stat(&icmpstat);
29+ 29+
30+ if ( ret_value < 0 ) { 30+ if ( ret_value < 0 ) {
31+ DEBUGMSGTL(("mibII/icmp", "Failed to load ICMP Group (netbsd)\n")); 31+ DEBUGMSGTL(("mibII/icmp", "Failed to load ICMP Group (netbsd)\n"));
32+ } else { 32+ } else {
33+ DEBUGMSGTL(("mibII/icmp", "Loaded ICMP Group (netbsd)\n")); 33+ DEBUGMSGTL(("mibII/icmp", "Loaded ICMP Group (netbsd)\n"));
34+ } 34+ }
35+ return ret_value; 35+ return ret_value;
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-eu (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-eu 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-eu 2010/11/17 00:59:06 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-eu,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-eu,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/ip.c.orig 2010-03-12 00:31:27.000000000 +0000 3--- agent/mibgroup/mibII/ip.c.orig 2010-10-19 03:54:57.000000000 +0000
4+++ agent/mibgroup/mibII/ip.c 2010-03-12 00:33:50.000000000 +0000 4+++ agent/mibgroup/mibII/ip.c
5@@ -199,6 +199,12 @@ 5@@ -199,6 +199,12 @@ init_ip(void)
6 #define USES_SNMP_DESIGNED_IPSTAT 6 #define USES_SNMP_DESIGNED_IPSTAT
7 #endif 7 #endif
8  8
9+#ifdef netbsd4 9+#ifdef NETBSD_STATS_VIA_SYSCTL
10+#define IP_STAT_STRUCTURE struct ip_mib 10+#define IP_STAT_STRUCTURE struct ip_mib
11+#define USES_SNMP_DESIGNED_IPSTAT 11+#define USES_SNMP_DESIGNED_IPSTAT
12+#undef IP_NSTATS 12+#undef IP_NSTATS
13+#endif 13+#endif
14+ 14+
15 #if defined (WIN32) || defined (cygwin) 15 #if defined (WIN32) || defined (cygwin)
16 #include <iphlpapi.h> 16 #include <iphlpapi.h>
17 #define IP_STAT_STRUCTURE MIB_IPSTATS 17 #define IP_STAT_STRUCTURE MIB_IPSTATS
18@@ -804,6 +810,21 @@ 18@@ -804,6 +810,21 @@ ip_load(netsnmp_cache *cache, void *vmag
19 } 19 }
20 return ret_value; 20 return ret_value;
21 } 21 }
22+#elif defined (netbsd4) 22+#elif defined (NETBSD_STATS_VIA_SYSCTL)
23+int 23+int
24+ip_load(netsnmp_cache *cache, void *vmagic) 24+ip_load(netsnmp_cache *cache, void *vmagic)
25+{ 25+{
26+ long ret_value = -1; 26+ long ret_value = -1;
27+ 27+
28+ ret_value = netbsd_read_ip_stat(&ipstat); 28+ ret_value = netbsd_read_ip_stat(&ipstat);
29+ 29+
30+ if ( ret_value < 0) { 30+ if ( ret_value < 0) {
31+ DEBUGMSGTL(("mibII/ip", "Failed to load IP Group (netbsd)\n")); 31+ DEBUGMSGTL(("mibII/ip", "Failed to load IP Group (netbsd)\n"));
32+ } else { 32+ } else {
33+ DEBUGMSGTL(("mibII/ip", "Loaded IP Group (netbsd)\n")); 33+ DEBUGMSGTL(("mibII/ip", "Loaded IP Group (netbsd)\n"));
34+ } 34+ }
35+ return ret_value; 35+ return ret_value;
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-ev (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-ev 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-ev 2010/11/17 00:59:06 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ev,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-ev,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/kernel_netbsd.c.orig 2010-03-12 00:47:14.000000000 +0000 3--- agent/mibgroup/mibII/kernel_netbsd.c.orig 2010-10-19 03:54:58.000000000 +0000
4+++ agent/mibgroup/mibII/kernel_netbsd.c 2010-03-12 01:40:58.000000000 +0000 4+++ agent/mibgroup/mibII/kernel_netbsd.c
5@@ -0,0 +1,194 @@ 5@@ -0,0 +1,198 @@
6+/* 6+/*
7+ * NetBSD implementation for mapping the IP stat arrays into struct's 7+ * NetBSD implementation for mapping the IP stat arrays into struct's
8+ * Required for NetBSD versions produced after April 7th 2008 (4+) 8+ * Required for NetBSD versions produced after April 7th 2008 (4+)
9+ * 9+ *
10+ * Based on: http://mail-index.netbsd.org/pkgsrc-users/2008/04/27/msg007095.html 10+ * Based on: http://mail-index.netbsd.org/pkgsrc-users/2008/04/27/msg007095.html
11+ */ 11+ */
12+ 12+
13+#include <sys/param.h> 13+#include <sys/param.h>
14+#include <sys/sysctl.h> 14+#include <sys/sysctl.h>
15+#include <sys/protosw.h> 15+#include <sys/protosw.h>
16+ 16+
17+#include <netinet/in.h> 17+#include <netinet/in.h>
18+#include <netinet/in_systm.h> 18+#include <netinet/in_systm.h>
@@ -22,26 +22,28 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39 @@ -22,26 +22,28 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39
22+#include <netinet/icmp_var.h> 22+#include <netinet/icmp_var.h>
23+#include <netinet/tcp.h> 23+#include <netinet/tcp.h>
24+#include <netinet/tcp_timer.h> 24+#include <netinet/tcp_timer.h>
25+#include <netinet/tcp_var.h> 25+#include <netinet/tcp_var.h>
26+#include <netinet/udp.h> 26+#include <netinet/udp.h>
27+#include <netinet/udp_var.h> 27+#include <netinet/udp_var.h>
28+ 28+
29+#include <net-snmp/net-snmp-config.h> 29+#include <net-snmp/net-snmp-config.h>
30+#include <net-snmp/net-snmp-includes.h> 30+#include <net-snmp/net-snmp-includes.h>
31+#include <net-snmp/agent/net-snmp-agent-includes.h> 31+#include <net-snmp/agent/net-snmp-agent-includes.h>
32+ 32+
33+#include "kernel_netbsd.h" 33+#include "kernel_netbsd.h"
34+ 34+
 35+#if defined(NETBSD_STATS_VIA_SYSCTL)
 36+
35+int 37+int
36+netbsd_read_icmp_stat(struct icmp_mib *mib) 38+netbsd_read_icmp_stat(struct icmp_mib *mib)
37+{ 39+{
38+ size_t size; 40+ size_t size;
39+ uint64_t icmpstat[ICMP_NSTATS]; 41+ uint64_t icmpstat[ICMP_NSTATS];
40+ int i; 42+ int i;
41+ 43+
42+ (void)memset(mib, 0, sizeof(*mib)); 44+ (void)memset(mib, 0, sizeof(*mib));
43+ 45+
44+ if (-1 == sysctlbyname("net.inet.icmp.stats", icmpstat, &size, NULL, 0)) 46+ if (-1 == sysctlbyname("net.inet.icmp.stats", icmpstat, &size, NULL, 0))
45+ return -1; 47+ return -1;
46+ 48+
47+ mib->icmpInMsgs = icmpstat[ICMP_STAT_BADCODE] 49+ mib->icmpInMsgs = icmpstat[ICMP_STAT_BADCODE]
@@ -187,13 +189,15 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39 @@ -187,13 +189,15 @@ $NetBSD: patch-ev,v 1.1 2010/05/11 04:39
187+ 189+
188+ if (-1 == sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0)) 190+ if (-1 == sysctlbyname("net.inet.udp.stats", udpstat, &size, NULL, 0))
189+ return -1; 191+ return -1;
190+ 192+
191+ mib->udpInDatagrams = udpstat[UDP_STAT_IPACKETS]; 193+ mib->udpInDatagrams = udpstat[UDP_STAT_IPACKETS];
192+ mib->udpNoPorts = udpstat[UDP_STAT_NOPORT]; 194+ mib->udpNoPorts = udpstat[UDP_STAT_NOPORT];
193+ mib->udpOutDatagrams = udpstat[UDP_STAT_OPACKETS]; 195+ mib->udpOutDatagrams = udpstat[UDP_STAT_OPACKETS];
194+ mib->udpInErrors = udpstat[UDP_STAT_HDROPS] 196+ mib->udpInErrors = udpstat[UDP_STAT_HDROPS]
195+ + udpstat[UDP_STAT_BADSUM] //+ udpstat[UDP_STAT_DISCARD] /* FIXME */ 197+ + udpstat[UDP_STAT_BADSUM] //+ udpstat[UDP_STAT_DISCARD] /* FIXME */
196+ + udpstat[UDP_STAT_FULLSOCK] + udpstat[UDP_STAT_BADLEN]; 198+ + udpstat[UDP_STAT_FULLSOCK] + udpstat[UDP_STAT_BADLEN];
197+ 199+
198+ return 0; 200+ return 0;
199+} 201+}
 202+
 203+#endif
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-ew (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-ew 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-ew 2010/11/17 00:59:06 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ew,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-ew,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/kernel_netbsd.h.orig 2010-03-12 00:31:50.000000000 +0000 3--- agent/mibgroup/mibII/kernel_netbsd.h.orig 2010-03-12 00:31:50.000000000 +0000
4+++ agent/mibgroup/mibII/kernel_netbsd.h 2010-03-12 00:31:50.000000000 +0000 4+++ agent/mibgroup/mibII/kernel_netbsd.h 2010-03-12 00:31:50.000000000 +0000
5@@ -0,0 +1,91 @@ 5@@ -0,0 +1,91 @@
6+#ifndef _MIBGROUP_KERNEL_NETBSD_H 6+#ifndef _MIBGROUP_KERNEL_NETBSD_H
7+#define _MIBGROUP_KERNEL_NETBSD_H 7+#define _MIBGROUP_KERNEL_NETBSD_H
8+ 8+
9+#if __NetBSD_Version__ >= 499005800 9+#if defined(NETBSD_STATS_VIA_SYSCTL)
10+ 10+
11+struct icmp_mib { 11+struct icmp_mib {
12+ unsigned long icmpInMsgs; 12+ unsigned long icmpInMsgs;
13+ unsigned long icmpInErrors; 13+ unsigned long icmpInErrors;
14+ unsigned long icmpInDestUnreachs; 14+ unsigned long icmpInDestUnreachs;
15+ unsigned long icmpInTimeExcds; 15+ unsigned long icmpInTimeExcds;
16+ unsigned long icmpInParmProbs; 16+ unsigned long icmpInParmProbs;
17+ unsigned long icmpInSrcQuenchs; 17+ unsigned long icmpInSrcQuenchs;
18+ unsigned long icmpInRedirects; 18+ unsigned long icmpInRedirects;
19+ unsigned long icmpInEchos; 19+ unsigned long icmpInEchos;
20+ unsigned long icmpInEchoReps; 20+ unsigned long icmpInEchoReps;
21+ unsigned long icmpInTimestamps; 21+ unsigned long icmpInTimestamps;
22+ unsigned long icmpInTimestampReps; 22+ unsigned long icmpInTimestampReps;
@@ -81,16 +81,16 @@ $NetBSD: patch-ew,v 1.1 2010/05/11 04:39 @@ -81,16 +81,16 @@ $NetBSD: patch-ew,v 1.1 2010/05/11 04:39
81+ 81+
82+struct udp_mib { 82+struct udp_mib {
83+ unsigned long udpInDatagrams; 83+ unsigned long udpInDatagrams;
84+ unsigned long udpNoPorts; 84+ unsigned long udpNoPorts;
85+ unsigned long udpInErrors; 85+ unsigned long udpInErrors;
86+ unsigned long udpOutDatagrams; 86+ unsigned long udpOutDatagrams;
87+}; 87+};
88+ 88+
89+int netbsd_read_icmp_stat(struct icmp_mib *); 89+int netbsd_read_icmp_stat(struct icmp_mib *);
90+int netbsd_read_ip_stat(struct ip_mib *); 90+int netbsd_read_ip_stat(struct ip_mib *);
91+int netbsd_read_tcp_stat(struct tcp_mib *); 91+int netbsd_read_tcp_stat(struct tcp_mib *);
92+int netbsd_read_udp_stat(struct udp_mib *); 92+int netbsd_read_udp_stat(struct udp_mib *);
93+ 93+
94+#endif /* __NetBSD_Version__ >= 499005800 */ 94+#endif /* NETBSD_STATS_VIA_SYSCTL */
95+ 95+
96+#endif /* _MIBGROUP_KERNEL_NETBSD_H */ 96+#endif /* _MIBGROUP_KERNEL_NETBSD_H */
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-ex (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-ex 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-ex 2010/11/17 00:59:06 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ex,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-ex,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/mibII_common.h.orig 2010-03-12 00:32:15.000000000 +0000 3--- agent/mibgroup/mibII/mibII_common.h.orig 2006-09-15 00:48:50.000000000 +0000
4+++ agent/mibgroup/mibII/mibII_common.h 2010-03-12 00:33:59.000000000 +0000 4+++ agent/mibgroup/mibII/mibII_common.h
5@@ -100,6 +100,9 @@ 5@@ -100,6 +100,9 @@
6 #ifdef linux 6 #ifdef linux
7 #include "kernel_linux.h" 7 #include "kernel_linux.h"
8 #endif 8 #endif
9+#ifdef netbsd4 9+#ifdef NETBSD_STATS_VIA_SYSCTL
10+#include "kernel_netbsd.h" 10+#include "kernel_netbsd.h"
11+#endif 11+#endif
12 /* or MIB_xxxCOUNTER_SYMBOL || hpux11 */ 12 /* or MIB_xxxCOUNTER_SYMBOL || hpux11 */
13 #ifdef hpux 13 #ifdef hpux
14 #include <sys/mib.h> 14 #include <sys/mib.h>
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-ez (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-ez 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-ez 2010/11/17 00:59:06 1.2
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-ez,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-ez,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/udp.c.orig 2010-03-12 00:32:31.000000000 +0000 3--- agent/mibgroup/mibII/udp.c.orig 2010-10-19 03:54:57.000000000 +0000
4+++ agent/mibgroup/mibII/udp.c 2010-03-12 00:34:17.000000000 +0000 4+++ agent/mibgroup/mibII/udp.c
5@@ -29,6 +29,10 @@ 5@@ -29,6 +29,10 @@
6 #include "kernel_linux.h" 6 #include "kernel_linux.h"
7 #endif 7 #endif
8  8
9+#ifdef netbsd4 9+#ifdef NETBSD_STATS_VIA_SYSCTL
10+#include "kernel_netbsd.h" 10+#include "kernel_netbsd.h"
11+#endif 11+#endif
12+ 12+
13 #ifdef cygwin 13 #ifdef cygwin
14 #define WIN32 14 #define WIN32
15 #include <windows.h> 15 #include <windows.h>
16@@ -149,6 +153,12 @@ 16@@ -149,6 +153,12 @@ init_udp(void)
17 #define USES_SNMP_DESIGNED_UDPSTAT 17 #define USES_SNMP_DESIGNED_UDPSTAT
18 #endif 18 #endif
19  19
20+#ifdef netbsd4 20+#ifdef NETBSD_STATS_VIA_SYSCTL
21+#define UDP_STAT_STRUCTURE struct udp_mib 21+#define UDP_STAT_STRUCTURE struct udp_mib
22+#define USES_SNMP_DESIGNED_UDPSTAT 22+#define USES_SNMP_DESIGNED_UDPSTAT
23+#undef UDP_NSTATS 23+#undef UDP_NSTATS
24+#endif 24+#endif
25+ 25+
26 #ifdef WIN32 26 #ifdef WIN32
27 #include <iphlpapi.h> 27 #include <iphlpapi.h>
28 #define UDP_STAT_STRUCTURE MIB_UDPSTATS 28 #define UDP_STAT_STRUCTURE MIB_UDPSTATS
29@@ -469,6 +479,21 @@ 29@@ -469,6 +479,21 @@ udp_load(netsnmp_cache *cache, void *vma
30 } 30 }
31 return ret_value; 31 return ret_value;
32 } 32 }
33+#elif defined(netbsd4) 33+#elif defined(NETBSD_STATS_VIA_SYSCTL)
34+int 34+int
35+udp_load(netsnmp_cache *cache, void *vmagic) 35+udp_load(netsnmp_cache *cache, void *vmagic)
36+{ 36+{
37+ long ret_value = -1; 37+ long ret_value = -1;
38+ 38+
39+ ret_value = netbsd_read_udp_stat(&udpstat); 39+ ret_value = netbsd_read_udp_stat(&udpstat);
40+ 40+
41+ if ( ret_value < 0 ) { 41+ if ( ret_value < 0 ) {
42+ DEBUGMSGTL(("mibII/udpScalar", "Failed to load UDP scalar Group (netbsd)\n")); 42+ DEBUGMSGTL(("mibII/udpScalar", "Failed to load UDP scalar Group (netbsd)\n"));
43+ } else { 43+ } else {
44+ DEBUGMSGTL(("mibII/udpScalar", "Loaded UDP scalar Group (netbsd)\n")); 44+ DEBUGMSGTL(("mibII/udpScalar", "Loaded UDP scalar Group (netbsd)\n"));
45+ } 45+ }
46+ return ret_value; 46+ return ret_value;
cvs diff -r1.1 -r1.2 pkgsrc/net/net-snmp/patches/Attic/patch-fa (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-fa 2010/05/11 04:39:54 1.1
+++ pkgsrc/net/net-snmp/patches/Attic/patch-fa 2010/11/17 00:59:06 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-fa,v 1.1 2010/05/11 04:39:54 adam Exp $ 1$NetBSD: patch-fa,v 1.2 2010/11/17 00:59:06 taca Exp $
2 2
3--- include/net-snmp/system/netbsd.h.orig 2010-03-12 00:32:48.000000000 +0000 3--- include/net-snmp/system/netbsd.h.orig 2007-03-08 15:52:34.000000000 +0000
4+++ include/net-snmp/system/netbsd.h 2010-03-12 00:34:40.000000000 +0000 4+++ include/net-snmp/system/netbsd.h
5@@ -38,5 +38,9 @@ 5@@ -38,5 +38,9 @@
6 # define netbsd1 netbsd1 6 # define netbsd1 netbsd1
7 #endif 7 #endif
8  8
9+#if __NetBSD_Version__ >= 400000000 9+#if __NetBSD_Version__ >= 499005800
10+#define netbsd4 netbsd4 10+#define NETBSD_STATS_VIA_SYSCTL
11+#endif /* __NetBSD_Version__ >= 400000000 */ 11+#endif /* __NetBSD_Version__ >= 499005800 */
12+ 12+
13 /* define the extra mib modules that are supported */ 13 /* define the extra mib modules that are supported */
14 #define NETSNMP_INCLUDE_HOST_RESOURCES 14 #define NETSNMP_INCLUDE_HOST_RESOURCES
cvs diff -r1.2 -r1.3 pkgsrc/net/net-snmp/patches/Attic/patch-ey (expand / switch to unified diff)

--- pkgsrc/net/net-snmp/patches/Attic/patch-ey 2010/07/20 08:33:44 1.2
+++ pkgsrc/net/net-snmp/patches/Attic/patch-ey 2010/11/17 00:59:06 1.3
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-ey,v 1.2 2010/07/20 08:33:44 adam Exp $ 1$NetBSD: patch-ey,v 1.3 2010/11/17 00:59:06 taca Exp $
2 2
3--- agent/mibgroup/mibII/tcp.c.orig 2009-11-13 12:59:26.000000000 +0000 3--- agent/mibgroup/mibII/tcp.c.orig 2010-10-19 03:54:58.000000000 +0000
4+++ agent/mibgroup/mibII/tcp.c 4+++ agent/mibgroup/mibII/tcp.c
5@@ -167,6 +167,12 @@ init_tcp(void) 5@@ -167,6 +167,12 @@ init_tcp(void)
6 #define USES_SNMP_DESIGNED_TCPSTAT 6 #define USES_SNMP_DESIGNED_TCPSTAT
7 #endif 7 #endif
8  8
9+#ifdef netbsd4 9+#ifdef NETBSD_STATS_VIA_SYSCTL
10+#define TCP_STAT_STRUCTURE struct tcp_mib 10+#define TCP_STAT_STRUCTURE struct tcp_mib
11+#define USES_SNMP_DESIGNED_TCPSTAT 11+#define USES_SNMP_DESIGNED_TCPSTAT
12+#undef TCP_NSTATS 12+#undef TCP_NSTATS
13+#endif 13+#endif
14+ 14+
15 #if defined (WIN32) || defined (cygwin) 15 #if defined (WIN32) || defined (cygwin)
16 #include <iphlpapi.h> 16 #include <iphlpapi.h>
17 #define TCP_STAT_STRUCTURE MIB_TCPSTATS 17 #define TCP_STAT_STRUCTURE MIB_TCPSTATS
18@@ -689,6 +695,21 @@ tcp_load(netsnmp_cache *cache, void *vma 18@@ -768,6 +774,21 @@ tcp_load(netsnmp_cache *cache, void *vma
19 } 19 }
20 return ret_value; 20 return ret_value;
21 } 21 }
22+#elif defined(netbsd4) 22+#elif defined(NETBSD_STATS_VIA_SYSCTL)
23+int 23+int
24+tcp_load(netsnmp_cache *cache, void *vmagic) 24+tcp_load(netsnmp_cache *cache, void *vmagic)
25+{ 25+{
26+ long ret_value = -1; 26+ long ret_value = -1;
27+ 27+
28+ ret_value = netbsd_read_tcp_stat(&tcpstat); 28+ ret_value = netbsd_read_tcp_stat(&tcpstat);
29+ 29+
30+ if ( ret_value < 0 ) { 30+ if ( ret_value < 0 ) {
31+ DEBUGMSGTL(("mibII/tcpScalar", "Failed to load TCP scalar Group (netbsd)\n")); 31+ DEBUGMSGTL(("mibII/tcpScalar", "Failed to load TCP scalar Group (netbsd)\n"));
32+ } else { 32+ } else {
33+ DEBUGMSGTL(("mibII/tcpScalar", "Loaded TCP scalar Group (netbsd)\n")); 33+ DEBUGMSGTL(("mibII/tcpScalar", "Loaded TCP scalar Group (netbsd)\n"));
34+ } 34+ }
35+ return ret_value; 35+ return ret_value;