3
--- net-snmp-5.3.1.orig/Makefile.in
4
+++ net-snmp-5.3.1/Makefile.in
3
Index: net-snmp-5.4.2.1/Makefile.in
4
===================================================================
5
--- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-27 15:13:25.000000000 +0100
6
+++ net-snmp-5.4.2.1/Makefile.in 2009-11-27 15:13:35.000000000 +0100
7
9
INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
11
13
+ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h kfreebsd.h \
12
14
+ hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
13
15
solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
14
solaris.h sunos.h svr5.h sysv.h ultrix4.h
16
solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
15
17
INCLUDESUBDIR2=machine
18
--- net-snmp-5.3.1.orig/include/net-snmp/system/kfreebsd.h
19
+++ net-snmp-5.3.1/include/net-snmp/system/kfreebsd.h
18
Index: net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h
19
===================================================================
20
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
21
+++ net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h 2009-11-27 15:13:35.000000000 +0100
21
23
+#include "freebsd6.h"
22
24
+#define freebsd6 freebsd6
83
85
+ u_quad_t xt_alignment_hack;
88
Index: net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c
89
===================================================================
90
--- net-snmp-5.4.2.1.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:15:37.000000000 +0100
91
+++ net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2009-11-27 15:19:01.000000000 +0100
94
#include <sys/types.h>
96
-#if defined(__FreeBSD__)
97
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
98
#include <sys/resource.h>
99
#if !defined(CPUSTATES)
100
#include <sys/dkstat.h>
102
#define NETSNMP_CPU_STATS uint64_t
105
-#elif defined(__FreeBSD__)
106
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
107
#define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */
111
#define NETSNMP_VM_STATS_TYPE struct uvmexp
112
#endif /* VM_UVMEXP2 || VM_UVMEXP */
114
-#elif defined(__FreeBSD__) /* FreeBSD */
115
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* FreeBSD */
116
#define NETSNMP_VM_STATS VM_METER
117
#define NETSNMP_VM_STATS_TYPE struct vmmeter
118
#define NS_VM_INTR v_intr
120
size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
121
netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
123
-#if defined(__FreeBSD__)
124
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
125
sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
127
sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0);