Index: Makefile.in --- Makefile.in.orig 2007-06-08 22:32:56 +0200 +++ Makefile.in 2009-11-29 11:03:13 +0100 @@ -16,7 +16,7 @@ INSTALLHEADERS=version.h INCLUDESUBDIR=system INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ - darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h \ + darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h freebsd9.h \ dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \ irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \ solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \ Index: agent/auto_nlist.c --- agent/auto_nlist.c.orig 2008-06-05 23:11:53 +0200 +++ agent/auto_nlist.c 2009-11-29 11:02:56 +0100 @@ -53,6 +53,7 @@ } if (*ptr == 0) { *ptr = (struct autonlist *) malloc(sizeof(struct autonlist)); + memset(*ptr, 0, sizeof(struct autonlist)); it = *ptr; it->left = 0; it->right = 0; Index: agent/mibgroup/mibII/tcp.c --- agent/mibgroup/mibII/tcp.c.orig 2008-06-05 23:11:53 +0200 +++ agent/mibgroup/mibII/tcp.c 2009-11-29 11:02:56 +0100 @@ -84,7 +84,7 @@ * But only define it under FreeBSD, since it * breaks other systems (notable AIX) */ -#ifdef freebsd4 +#if defined (freebsd4) || defined (__NetBSD__) int hz = 1000; #endif Index: agent/mibgroup/mibII/tcpTable.c --- agent/mibgroup/mibII/tcpTable.c.orig 2007-10-14 14:12:58 +0200 +++ agent/mibgroup/mibII/tcpTable.c 2009-11-29 11:02:56 +0100 @@ -100,6 +100,11 @@ #define TCPTABLE_REMOTEPORT pcb.inp_fport #define TCPTABLE_IS_LINKED_LIST +#if defined(__FreeBSD__) +#undef INP_NEXT_SYMBOL +#define INP_NEXT_SYMBOL inp_next +#endif + #endif /* linux */ #endif /* WIN32 cygwin */ #endif /* solaris2 */ @@ -748,12 +753,17 @@ nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb); if (!nnew) break; +#if defined(__FreeBSD__) + memcpy(&(nnew->pcb), &(((struct xinpcb *) xig)->xi_inp), + sizeof(struct inpcb)); +#else nnew->state = StateMap[((NS_ELEM *) xig)->xt_tp.t_state]; if (nnew->state == 5 /* established */ || nnew->state == 8 /* closeWait */ ) tcp_estab++; memcpy(&(nnew->pcb), &(((NS_ELEM *) xig)->xt_inp), sizeof(struct inpcb)); +#endif nnew->inp_next = tcp_head; tcp_head = nnew; Index: agent/mibgroup/ucd-snmp/diskio.c --- agent/mibgroup/ucd-snmp/diskio.c.orig 2008-06-05 23:11:53 +0200 +++ agent/mibgroup/ucd-snmp/diskio.c 2009-11-29 11:02:56 +0100 @@ -593,6 +593,20 @@ case DISKIO_DEVICE: *var_len = strlen(stat->dinfo->devices[indx].device_name); return (u_char *) stat->dinfo->devices[indx].device_name; +#if defined(freebsd5) && (__FreeBSD_version >= 500107) + case DISKIO_NREAD: + long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; + return (u_char *) & long_ret; + case DISKIO_NWRITTEN: + long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; + return (u_char *) & long_ret; + case DISKIO_READS: + long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ]; + return (u_char *) & long_ret; + case DISKIO_WRITES: + long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE]; + return (u_char *) & long_ret; +#else case DISKIO_NREAD: #if defined(freebsd5) && __FreeBSD_version >= 500107 long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; @@ -650,6 +664,7 @@ case DISKIO_LA15: long_ret = devloads[indx].la15; return (u_char *) & long_ret; +#endif default: ERROR_MSG("diskio.c: don't know how to handle this request."); Index: agent/mibgroup/ucd-snmp/memory_solaris2.c --- agent/mibgroup/ucd-snmp/memory_solaris2.c.orig 2006-09-15 02:48:50 +0200 +++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2009-11-29 11:02:56 +0100 @@ -1,3 +1,4 @@ +#undef _FILE_OFFSET_BITS /* swapctl doesn't support 64bit off_t */ #include /* local SNMP configuration details */ #if HAVE_STRING_H #include Index: agent/mibgroup/ucd-snmp/proc.c --- agent/mibgroup/ucd-snmp/proc.c.orig 2008-06-05 23:11:53 +0200 +++ agent/mibgroup/ucd-snmp/proc.c 2009-11-29 11:02:56 +0100 @@ -1,3 +1,6 @@ +#ifdef solaris2 +#undef _FILE_OFFSET_BITS /* solaris procfs doesn't support 64bit off_t */ +#endif #include #ifdef solaris2 Index: agent/mibgroup/util_funcs.c --- agent/mibgroup/util_funcs.c.orig 2007-08-16 16:12:47 +0200 +++ agent/mibgroup/util_funcs.c 2009-11-29 11:02:56 +0100 @@ -461,6 +461,9 @@ int fd[2][2], i, cnt; char ctmp[STRMAX], *cptr1, *cptr2, argvs[STRMAX], **argv, **aptr; + + *pid = -1; /* open_persist_pipe ignores return code but checks *pid */ + /* * Setup our pipes */ Index: agent/snmpd.c --- agent/snmpd.c.orig 2008-08-17 22:50:55 +0200 +++ agent/snmpd.c 2009-11-29 11:02:56 +0100 @@ -424,7 +424,7 @@ int uid = 0, gid = 0; int agent_mode = -1; char *cptr, **argvptr; - char *pid_file = NULL; + char *pid_file = "@l_prefix@/var/snmp/snmpd.pid"; char option_compatability[] = "-Le"; #if HAVE_GETPID int fd; Index: apps/snmptrapd.c --- apps/snmptrapd.c.orig 2007-08-16 11:35:12 +0200 +++ apps/snmptrapd.c 2009-11-29 11:02:56 +0100 @@ -748,6 +748,7 @@ */ #if HAVE_GETPID strcat(options, "p:"); + parse_config_pidFile(NULL, "@l_prefix@/var/snmp/snmptrapd.pid"); #endif #ifdef WIN32 Index: include/net-snmp/library/system.h --- include/net-snmp/library/system.h.orig 2007-01-11 23:13:56 +0100 +++ include/net-snmp/library/system.h 2009-11-29 11:02:56 +0100 @@ -114,7 +114,8 @@ char *strdup(const char *); #endif #ifndef HAVE_SETENV - int setenv(const char *, const char *, int); + int __netsnmp_setenv(const char *, const char *, int); +# define setenv(a,b,c) __netsnmp_setenv(a,b,c) #endif int calculate_time_diff(struct timeval *, Index: include/net-snmp/system/freebsd8.h --- include/net-snmp/system/freebsd8.h.orig 2009-11-29 11:04:44 +0100 +++ include/net-snmp/system/freebsd8.h 2009-11-29 11:04:16 +0100 @@ -0,0 +1,3 @@ +/* freebsd8 is a superset of freebsd7 */ +#include "freebsd7.h" +#define freebsd7 freebsd7 Index: include/net-snmp/system/freebsd9.h --- include/net-snmp/system/freebsd9.h.orig 2009-11-29 11:04:48 +0100 +++ include/net-snmp/system/freebsd9.h 2009-11-29 11:04:31 +0100 @@ -0,0 +1,3 @@ +/* freebsd9 is a superset of freebsd8 */ +#include "freebsd8.h" +#define freebsd8 freebsd8 Index: snmplib/system.c --- snmplib/system.c.orig 2008-06-05 23:11:53 +0200 +++ snmplib/system.c 2009-11-29 11:02:56 +0100 @@ -894,7 +894,7 @@ #ifndef HAVE_SETENV int -setenv(const char *name, const char *value, int overwrite) +__netsnmp_setenv(const char *name, const char *value, int overwrite) { char *cp; int ret;