From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 23 03:30:26 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2199716A422 for ; Tue, 23 May 2006 03:30:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A7DB43D49 for ; Tue, 23 May 2006 03:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4N3UPUS099018 for ; Tue, 23 May 2006 03:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4N3UPu2099017; Tue, 23 May 2006 03:30:25 GMT (envelope-from gnats) Resent-Date: Tue, 23 May 2006 03:30:25 GMT Resent-Message-Id: <200605230330.k4N3UPu2099017@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rick van der Zwet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C2E216A4CE for ; Tue, 23 May 2006 03:23:24 +0000 (UTC) (envelope-from rick@wzoeterwoude.net) Received: from smtp-vbr4.xs4all.nl (smtp-vbr4.xs4all.nl [194.109.24.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF42A43D4C for ; Tue, 23 May 2006 03:23:16 +0000 (GMT) (envelope-from rick@wzoeterwoude.net) Received: from traffie.wzoeterwoude.net (rvdzwet.xs4all.nl [213.84.99.45]) by smtp-vbr4.xs4all.nl (8.13.6/8.13.6) with ESMTP id k4N3NEtu094410 for ; Tue, 23 May 2006 05:23:14 +0200 (CEST) (envelope-from rick@wzoeterwoude.net) Received: (qmail 67990 invoked by uid 98); 23 May 2006 03:23:13 -0000 Received: from 192.168.0.19 by traffie.wzoeterwoude.net (envelope-from , uid 82) with qmail-scanner-1.25 (spamassassin: 3.1.1. Clear:RC:1(192.168.0.19):. Processed in 0.311876 secs); 23 May 2006 03:23:13 -0000 Received: from unknown (HELO ?192.168.0.19?) (rick@192.168.0.19) by traffie.wzoeterwoude.net with SMTP; 23 May 2006 03:23:11 -0000 Message-Id: <44729C3D.9030601@wzoeterwoude.net> Date: Tue, 23 May 2006 05:23:09 +0000 From: Rick van der Zwet To: FreeBSD-gnats-submit@FreeBSD.org Cc: rick@wzoeterwoude.net Subject: ports/97673: Update port: net-mgmt/net-snmp 5.2.2 -> 5.3.0.1, large patch included X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rick van der Zwet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2006 03:30:26 -0000 >Number: 97673 >Category: ports >Synopsis: Update port: net-mgmt/net-snmp 5.2.2 -> 5.3.0.1, large patch included >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 23 03:30:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rick van der Zwet >Release: FreeBSD 6.1-RELEASE i386 >Organization: Stichting Wireless Leiden >Environment: System: FreeBSD freezone-mobile 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update of net-snmp nicely intergrates some of patches, but still not all of them >How-To-Repeat: >Fix: Looked by hand if patches where obsolete and altered them a bit to matchnew line numbers, etc --- net-snmp.diff begins here --- diff -uNr /tmp/net-snmp.orig/Makefile /usr/ports/net-mgmt/net-snmp/Makefile --- /tmp/net-snmp.orig/Makefile Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/Makefile Mon May 22 23:02:31 2006 @@ -6,8 +6,8 @@ # PORTNAME= snmp -PORTVERSION= 5.2.2 -PORTREVISION= 1 +PORTVERSION= 5.3.0.1 +PORTREVISION= 0 CATEGORIES= net-mgmt ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= net-snmp @@ -16,10 +16,6 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= An extendable SNMP implementation - -.if !defined(WITH_TKMIB) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-local:Makefile.in -.endif .if defined(WITH_TKMIB) RUN_DEPEND= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk diff -uNr /tmp/net-snmp.orig/distinfo /usr/ports/net-mgmt/net-snmp/distinfo --- /tmp/net-snmp.orig/distinfo Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/distinfo Mon May 22 22:58:28 2006 @@ -1,3 +1,3 @@ -MD5 (net-snmp-5.2.2.tar.gz) = 2d9cdf956d6be5c5fcf2f898b403389b -SHA256 (net-snmp-5.2.2.tar.gz) = ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd -SIZE (net-snmp-5.2.2.tar.gz) = 3919826 +MD5 (net-snmp-5.3.0.1.tar.gz) = db5995ff8fae154cbe7417a4a6f2ca60 +SHA256 (net-snmp-5.3.0.1.tar.gz) = dc7786ad2b1464edb5d8331a2687fa72f979ce3984df4e94334e8eec0676e69d +SIZE (net-snmp-5.3.0.1.tar.gz) = 4183370 diff -uNr /tmp/net-snmp.orig/files/extra-patch-local:Makefile.in /usr/ports/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in --- /tmp/net-snmp.orig/files/extra-patch-local:Makefile.in Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- local/Makefile.in.orig Tue Oct 11 03:47:48 2005 -+++ local/Makefile.in Wed Nov 30 11:32:52 2005 -@@ -16,7 +16,7 @@ - # - SNMPCONFPATH=@SNMPCONFPATH@ - PERSISTENT_DIRECTORY=@PERSISTENT_DIRECTORY@ --PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail -+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail - SHELLSCRIPTS=mib2c-update - SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \ - ipf-mod.pl.made snmpconf.made traptoemail.made diff -uNr /tmp/net-snmp.orig/files/patch-Makefile.in /usr/ports/net-mgmt/net-snmp/files/patch-Makefile.in --- /tmp/net-snmp.orig/files/patch-Makefile.in Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-Makefile.in Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Oct 11 20:49:23 2005 -+++ Makefile.in Wed Nov 30 11:35:12 2005 -@@ -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 freebsd5.h freebsd6.h \ -+ darwin.h darwin7.h darwin8.h freebsd5.h freebsd6.h freebsd7.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.6.h solaris2.7.h solaris2.8.h solaris2.9.h solaris2.10.h \ diff -uNr /tmp/net-snmp.orig/files/patch-agent_index.c /usr/ports/net-mgmt/net-snmp/files/patch-agent_index.c --- /tmp/net-snmp.orig/files/patch-agent_index.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-agent_index.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/agent_index.c.orig Mon Jan 24 09:14:39 2005 -+++ agent/agent_index.c Mon Jan 24 09:14:55 2005 -@@ -39,10 +39,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-agent_read_config.c /usr/ports/net-mgmt/net-snmp/files/patch-agent_read_config.c --- /tmp/net-snmp.orig/files/patch-agent_read_config.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-agent_read_config.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/agent_read_config.c.orig Mon Jan 24 09:12:58 2005 -+++ agent/agent_read_config.c Mon Jan 24 09:13:13 2005 -@@ -84,10 +84,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff -uNr /tmp/net-snmp.orig/files/patch-agent_registry.c /usr/ports/net-mgmt/net-snmp/files/patch-agent_registry.c --- /tmp/net-snmp.orig/files/patch-agent_registry.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-agent_registry.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/agent_registry.c.orig Mon Jan 24 09:14:00 2005 -+++ agent/agent_registry.c Mon Jan 24 09:14:08 2005 -@@ -51,10 +51,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-at.c /usr/ports/net-mgmt/net-snmp/files/patch-at.c --- /tmp/net-snmp.orig/files/patch-at.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-at.c Thu Jan 1 00:00:00 1970 @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/at.c.orig Mon Jan 24 09:08:41 2005 -+++ agent/mibgroup/mibII/at.c Mon Jan 24 09:08:58 2005 -@@ -90,9 +90,6 @@ - #if HAVE_WINSOCK_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #ifdef hpux11 - #include diff -uNr /tmp/net-snmp.orig/files/patch-auto_nlist.c /usr/ports/net-mgmt/net-snmp/files/patch-auto_nlist.c --- /tmp/net-snmp.orig/files/patch-auto_nlist.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-auto_nlist.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/auto_nlist.c.orig Mon Jan 24 09:11:07 2005 -+++ agent/auto_nlist.c Mon Jan 24 09:11:24 2005 -@@ -21,10 +21,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include "autonlist.h" - #include "kernel.h" diff -uNr /tmp/net-snmp.orig/files/patch-callback.c /usr/ports/net-mgmt/net-snmp/files/patch-callback.c --- /tmp/net-snmp.orig/files/patch-callback.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-callback.c Thu Jan 1 00:00:00 1970 @@ -1,12 +0,0 @@ ---- snmplib/callback.c.orig Tue Jan 25 10:19:39 2005 -+++ snmplib/callback.c Tue Jan 25 10:19:53 2005 -@@ -34,6 +34,9 @@ - #include - #endif - -+#if HAVE_UNISTD_H -+#include -+#endif - #if HAVE_DMALLOC_H - #include - #endif diff -uNr /tmp/net-snmp.orig/files/patch-configure.in /usr/ports/net-mgmt/net-snmp/files/patch-configure.in --- /tmp/net-snmp.orig/files/patch-configure.in Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-configure.in Thu Jan 1 00:00:00 1970 @@ -1,38 +0,0 @@ ---- configure.in.orig Tue Nov 29 14:16:55 2005 -+++ configure.in Wed Nov 30 11:49:24 2005 -@@ -2075,7 +2075,7 @@ - # fall back - CFLAG="-f" - fi --for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel -+for i in /vmunix /hp-ux /stand/vmunix /dev/ksyms /kernel/unix /kernel/genunix /netbsd /unix /kernel /bsd /mach_kernel /boot/kernel/kernel /dev/null - do - if test -f $i -o $CFLAG $i; then - ac_cv_KERNEL_LOC="$i" -@@ -2989,6 +2989,26 @@ - # checking for 4.3 vs 4.4 rtentry. - AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE, - [ -+ -+dnl 4.4 compatible but renamed on FreeBSD -+AC_TRY_COMPILE([ -+#include -+#define KERNEL -+#define _KERNEL -+#include -+#undef KERNEL -+#undef _KERNEL -+#include -+],[ -+ -+#ifndef STRUCT_RTENTRY_HAS_RT_DST -+#define rt_dst rt_nodes->rn_key -+#endif -+ -+ struct rtentry rt; -+ rt.rt_nodes[0].rn_bit = 1; -+ rt.rt_dst; -+ ], ac_cv_RTENTRY_TYPE="BSD-4.4") - - # 4.4 compat - AC_TRY_COMPILE([ diff -uNr /tmp/net-snmp.orig/files/patch-default_store.c /usr/ports/net-mgmt/net-snmp/files/patch-default_store.c --- /tmp/net-snmp.orig/files/patch-default_store.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-default_store.c Thu Jan 1 00:00:00 1970 @@ -1,12 +0,0 @@ ---- snmplib/default_store.c.orig Tue Jan 25 10:20:31 2005 -+++ snmplib/default_store.c Tue Jan 25 10:20:47 2005 -@@ -145,6 +145,9 @@ - #include - #endif - -+#if HAVE_UNISTD_H -+#include -+#endif - #if HAVE_DMALLOC_H - #include - #endif diff -uNr /tmp/net-snmp.orig/files/patch-freebsd5.h /usr/ports/net-mgmt/net-snmp/files/patch-freebsd5.h --- /tmp/net-snmp.orig/files/patch-freebsd5.h Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-freebsd5.h Thu Jan 1 00:00:00 1970 @@ -1,10 +0,0 @@ ---- include/net-snmp/system/freebsd5.h.orig Wed Sep 1 00:13:46 2004 -+++ include/net-snmp/system/freebsd5.h Wed Sep 1 00:13:57 2004 -@@ -7,6 +7,7 @@ - #define freebsd3 1 - /* freebsd5 is a superset of freebsd4 */ - #define freebsd4 1 -+#define freebsd5 1 - - #undef IFADDR_SYMBOL - #define IFADDR_SYMBOL "in_ifaddrhead" diff -uNr /tmp/net-snmp.orig/files/patch-freebsd7.h /usr/ports/net-mgmt/net-snmp/files/patch-freebsd7.h --- /tmp/net-snmp.orig/files/patch-freebsd7.h Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-freebsd7.h Thu Jan 1 00:00:00 1970 @@ -1,4 +0,0 @@ ---- include/net-snmp/system/freebsd7.h.orig Sun Jul 17 22:41:06 2005 -+++ include/net-snmp/system/freebsd7.h Sun Jul 17 22:41:28 2005 -@@ -0,0 +1 @@ -+#include "freebsd6.h" diff -uNr /tmp/net-snmp.orig/files/patch-hr_storage.c /usr/ports/net-mgmt/net-snmp/files/patch-hr_storage.c --- /tmp/net-snmp.orig/files/patch-hr_storage.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-hr_storage.c Thu Jan 1 00:00:00 1970 @@ -1,221 +0,0 @@ ---- agent/mibgroup/host/hr_storage.c.orig Fri Oct 7 07:55:23 2005 -+++ agent/mibgroup/host/hr_storage.c Wed Nov 30 12:01:05 2005 -@@ -233,6 +233,10 @@ - void sol_get_swapinfo(int *, int *); - #endif - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void collect_mbuf(long *long_mbuf, long *long_mbufc); -+#endif -+ - #define HRSTORE_MEMSIZE 1 - #define HRSTORE_INDEX 2 - #define HRSTORE_TYPE 3 -@@ -472,7 +476,8 @@ - NULL, - "Memory Buffers", /* HRS_TYPE_MBUF */ - "Real Memory", /* HRS_TYPE_MEM */ -- "Swap Space" /* HRS_TYPE_SWAP */ -+ "Swap Space", /* HRS_TYPE_SWAP */ -+ "Memory Buffer Clusters" /* HRS_TYPE_MBUFCLUSTER */ - }; - - -@@ -611,6 +616,7 @@ - storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */ - break; - case HRS_TYPE_MBUF: -+ case HRS_TYPE_MBUFCLUSTER: - storage_type_id[storage_type_len - 1] = 1; /* Other */ - break; - default: -@@ -704,7 +710,7 @@ - long_return = memory_totals.t_vm; - #endif - break; --#else /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#else - case HRS_TYPE_MEM: - long_return = physmem; - break; -@@ -726,13 +732,45 @@ - i++) - long_return += mbstat.m_mtypes[i]; - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_MBUFS) -+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021 - long_return = mbstat.m_mbufs; -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500024 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ { -+ size_t mlen = sizeof(int); -+ int nmbufs; -+ if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbufs; -+ break; -+ } -+#else -+#error "XXX" -+ /* XXX TODO: implement new method */ -+ return NULL; -+#endif /* __FreeBSD__ */ - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else - long_return = 0; - #endif - break; -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500024 -+ case HRS_TYPE_MBUFCLUSTER: { -+ size_t mlen = sizeof(int); -+ int nmbclusters; -+ if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, -+ NULL, 0) < 0) { -+ return NULL; -+ } -+ long_return = nmbclusters; -+ break; -+ } -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -796,6 +834,12 @@ - #endif - #elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS) - long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */ -+#elif defined(__FreeBSD__) && __FreeBSD_version < 500102 -+ /* mbuf stats disabled */ -+ return NULL; -+#elif defined(__FreeBSD__) -+ collect_mbuf((long*)&long_return, (long*)NULL); -+ break; - #elif defined(NO_DUMMY_VALUES) - goto try_next; - #else -@@ -803,6 +847,11 @@ - #endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+ case HRS_TYPE_MBUFCLUSTER: -+ collect_mbuf(NULL, &long_return); -+ break; -+#endif - default: - #if NO_DUMMY_VALUES - goto try_next; -@@ -829,7 +878,11 @@ - break; - #if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL) - case HRS_TYPE_MBUF: -+#if defined(__FreeBSD__) && __FreeBSD_version >= 502113 -+ long_return = mbstat.m_mcfail + mbstat.m_mpfail; -+#else - long_return = mbstat.m_drops; -+#endif - break; - #endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */ - default: -@@ -955,3 +1008,97 @@ - *usedP = ainfo.ani_resv; - } - #endif /* solaris2 */ -+ -+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102 -+void -+collect_mbuf(long *long_mbuf, long *long_mbufc) -+{ -+#if __FreeBSD_version >= 502113 -+ size_t mlen; -+ struct mbstat mbstat; -+ -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ return; -+ } -+ if (mbstat.m_mbufs < 0) mbstat.m_mbufs = 0; /* XXX */ -+ if (mbstat.m_mclusts < 0) mbstat.m_mclusts = 0; /* XXX */ -+ if (long_mbuf) { -+ *long_mbuf = mbstat.m_mbufs; -+ } -+ if (long_mbufc) { -+ *long_mbufc = mbstat.m_mclusts; -+ } -+#else -+ int i, j, num_objs; -+ size_t mlen; -+ u_long totused[2]; -+ u_long totnum, totfree; -+ struct mbstat mbstat; -+ struct mbpstat **mbpstat = NULL; -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu len"); -+ goto err; -+ } -+ num_objs = (int)(mlen / sizeof(struct mbpstat)); -+ if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats pointers"); -+ goto err; -+ } -+ if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { -+ warn("calloc: cannot allocate memory for mbpstats"); -+ goto err; -+ } -+ -+ if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mb_statpcpu"); -+ goto err; -+ } -+ mlen = sizeof mbstat; -+ if (sysctlbyname("kern.ipc.mbstat", &mbstat, &mlen, NULL, 0) < 0) { -+ warn("sysctl: retrieving mbstat"); -+ goto err; -+ } -+ -+ for (i = 0; i < num_objs; i++) -+ mbpstat[i] = mbpstat[0] + i; -+ -+#define GENLST (num_objs - 1) -+ -+ totnum = mbpstat[GENLST]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree = mbpstat[GENLST]->mb_mbfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_mbbucks * mbstat.m_mbperbuck; -+ totfree += mbpstat[i]->mb_mbfree; -+ } -+ totused[0] = totnum - totfree; -+ totnum = mbpstat[GENLST]->mb_clbucks * mbstat.m_clperbuck; -+ totfree = mbpstat[GENLST]->mb_clfree; -+ for (i = 0; i < (num_objs - 1); i++) { -+ if (mbpstat[i]->mb_active == 0) -+ continue; -+ totnum += mbpstat[i]->mb_clbucks * mbstat.m_clperbuck; -+ totfree += mbpstat[i]->mb_clfree; -+ } -+ totused[1] = totnum - totfree; -+ -+ if (long_mbuf) { -+ *long_mbuf = totused[0]; -+ } -+ if (long_mbufc) { -+ *long_mbufc = totused[1]; -+ } -+ -+ err: -+ if (mbpstat != NULL) { -+ if (mbpstat[0] != NULL) -+ free(mbpstat[0]); -+ free(mbpstat); -+ } -+#endif -+} -+#endif diff -uNr /tmp/net-snmp.orig/files/patch-hr_storage.h /usr/ports/net-mgmt/net-snmp/files/patch-hr_storage.h --- /tmp/net-snmp.orig/files/patch-hr_storage.h Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-hr_storage.h Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- agent/mibgroup/host/hr_storage.h.orig Tue Feb 25 22:17:48 2003 -+++ agent/mibgroup/host/hr_storage.h Wed May 5 15:27:40 2004 -@@ -12,6 +12,7 @@ - #define HRS_TYPE_MBUF 1 - #define HRS_TYPE_MEM 2 - #define HRS_TYPE_SWAP 3 --#define HRS_TYPE_FIXED_MAX 3 /* the largest fixed type */ -+#define HRS_TYPE_MBUFCLUSTER 4 -+#define HRS_TYPE_FIXED_MAX 4 /* the largest fixed type */ - - #endif /* _MIBGROUP_HRSTORAGE_H */ diff -uNr /tmp/net-snmp.orig/files/patch-hr_swrun.c /usr/ports/net-mgmt/net-snmp/files/patch-hr_swrun.c --- /tmp/net-snmp.orig/files/patch-hr_swrun.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-hr_swrun.c Thu Jan 1 00:00:00 1970 @@ -1,78 +0,0 @@ ---- agent/mibgroup/host/hr_swrun.c.orig Thu Oct 20 04:32:20 2005 -+++ agent/mibgroup/host/hr_swrun.c Wed Nov 30 12:50:12 2005 -@@ -585,7 +585,7 @@ - string[ sizeof(string)-1 ] = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -698,7 +698,7 @@ - *cp1 = 0; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - strcpy(string, proc_table[LowProcIndex].ki_comm); - #else - strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm); -@@ -868,8 +868,23 @@ - if (pid < PID_MAXSYS) - long_return = 2; /* operatingSystem */ - else --#endif - long_return = 4; /* application */ -+#elif HAVE_KVM_GETPROCS -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) { -+ if (proc_table[LowProcIndex].ki_pri.pri_class == PRI_ITHD) -+ long_return = 3;/* deviceDriver */ -+ else -+ long_return = 2;/* operatingSystem */ -+ } else -+ long_return = 4; /* application */ -+#else -+ if (proc_table[LowProcIndex].kp_proc.p_flag & P_SYSTEM) -+ long_return = 2; /* operatingSystem */ -+ else -+ long_return = 4; /* application */ -+#endif -+#endif - return (u_char *) & long_return; - case HRSWRUN_STATUS: - #if defined(cygwin) -@@ -901,7 +916,7 @@ - } - #else - #if HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - switch (proc_table[LowProcIndex].ki_stat) { - #else - switch (proc_table[LowProcIndex].kp_proc.p_stat) { -@@ -1000,7 +1015,13 @@ - long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100; - #endif - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 -+ /* XXX: Accessing ki_paddr causes sig10 ... -+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks + -+ proc_table[LowProcIndex].ki_paddr->p_sticks + -+ proc_table[LowProcIndex].ki_paddr->p_iticks; */ -+ long_return = 0; -+ #elif defined(freebsd5) - long_return = proc_table[LowProcIndex].ki_runtime / 100000; - #else - long_return = proc_table[LowProcIndex].kp_proc.p_uticks + -@@ -1365,7 +1386,7 @@ - #elif defined(solaris2) - return proc_table[current_proc_entry++]; - #elif HAVE_KVM_GETPROCS -- #if defined(freebsd5) -+ #if defined(freebsd5) && __FreeBSD_version >= 500014 - if (proc_table[current_proc_entry].ki_stat != 0) - return proc_table[current_proc_entry++].ki_pid; - #else diff -uNr /tmp/net-snmp.orig/files/patch-hr_system.c /usr/ports/net-mgmt/net-snmp/files/patch-hr_system.c --- /tmp/net-snmp.orig/files/patch-hr_system.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-hr_system.c Tue May 23 00:21:19 2006 @@ -1,6 +1,6 @@ --- agent/mibgroup/host/hr_system.c.orig Mon Feb 23 02:29:34 2004 +++ agent/mibgroup/host/hr_system.c Sat Apr 3 00:00:24 2004 -@@ -596,6 +596,8 @@ +@@ -613,6 +613,8 @@ #ifndef UTMP_HAS_NO_TYPE if (utmp_p->ut_type != USER_PROCESS) continue; diff -uNr /tmp/net-snmp.orig/files/patch-interfaces.c /usr/ports/net-mgmt/net-snmp/files/patch-interfaces.c --- /tmp/net-snmp.orig/files/patch-interfaces.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-interfaces.c Thu Jan 1 00:00:00 1970 @@ -1,293 +0,0 @@ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Jan 4 00:51:32 2005 -+++ agent/mibgroup/mibII/interfaces.c Thu Apr 7 11:47:45 2005 -@@ -399,6 +399,133 @@ - return NULL; - } - -+#if defined(freebsd2) -+static char *physaddrbuf; -+static int nphysaddrs; -+struct sockaddr_dl **physaddrs; -+ -+void -+init_interfaces_setup(void) -+{ -+ int naddrs, ilen, bit; -+ static int mib[6] -+ = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -+ char *cp; -+ size_t len; -+ struct rt_msghdr *rtm; -+ struct if_msghdr *ifm; -+ struct ifa_msghdr *ifam; -+ struct sockaddr *sa; -+ -+ naddrs = 0; -+ if (physaddrs) -+ free(physaddrs); -+ if (physaddrbuf) -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ physaddrs = 0; -+ nphysaddrs = 0; -+ len = 0; -+ if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -+ return; -+ -+ cp = physaddrbuf = malloc(len); -+ if (physaddrbuf == 0) -+ return; -+ if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ return; -+ } -+ -+ loop: -+ ilen = len; -+ cp = physaddrbuf; -+ while (ilen > 0) { -+ rtm = (struct rt_msghdr *) cp; -+ if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -+ free(physaddrs); -+ physaddrs = 0; -+ free(physaddrbuf); -+ physaddrbuf = 0; -+ } -+ ifm = (struct if_msghdr *) rtm; -+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -+ if (physaddrs != 0) -+ physaddrs[naddrs] = (void *) (ifm + 1); -+ naddrs++; -+#endif -+ ilen -= ifm->ifm_msglen; -+ cp += ifm->ifm_msglen; -+ rtm = (struct rt_msghdr *) cp; -+ while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { -+#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -+ ilen -= rtm->rtm_msglen; -+ cp += rtm->rtm_msglen; -+#else -+ int is_alias = 0; -+ ifam = (struct ifa_msghdr *) rtm; -+ ilen -= sizeof(*ifam); -+ cp += sizeof(*ifam); -+ sa = (struct sockaddr *) cp; -+#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -+ for (bit = 1; bit && ilen > 0; bit <<= 1) { -+ if (!(ifam->ifam_addrs & bit)) -+ continue; -+ ilen -= ROUND(sa->sa_len); -+ cp += ROUND(sa->sa_len); -+ -+ if (bit == RTA_IFA) { -+ if (physaddrs) -+#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -+ physaddrs[naddrs++] -+ = satosdl(sa); -+ else -+ naddrs++; -+ } -+ sa = (struct sockaddr *) cp; -+ } -+#endif -+ rtm = (struct rt_msghdr *) cp; -+ } -+ } -+ if (physaddrs) { -+ nphysaddrs = naddrs; -+ return; -+ } -+ physaddrs = malloc(naddrs * sizeof(*physaddrs)); -+ if (physaddrs == 0) -+ return; -+ naddrs = 0; -+ goto loop; -+ -+} -+ -+static int -+get_phys_address(int iindex, char **ap, int *len) -+{ -+ int i; -+ int once = 1; -+ -+ do { -+ for (i = 0; i < nphysaddrs; i++) { -+ if (physaddrs[i]->sdl_index == iindex) -+ break; -+ } -+ if (i < nphysaddrs) -+ break; -+ init_interfaces_setup(); -+ } while (once--); -+ -+ if (i < nphysaddrs) { -+ *ap = LLADDR(physaddrs[i]); -+ *len = physaddrs[i]->sdl_alen; -+ return 0; -+ } -+ return -1; -+} -+#endif -+ - #ifdef USE_SYSCTL_IFLIST - - static u_char *if_list = 0; -@@ -607,10 +734,20 @@ - } - return (u_char *) & long_return; - case IFPHYSADDRESS: -+#if defined(freebsd2) -+ { -+ char *cp; -+ if (get_phys_address(interface, &cp, var_len)) -+ return NULL; -+ else -+ return cp; -+ } -+#else - /* - * XXX - */ - return NULL; -+#endif - case IFADMINSTATUS: - long_return = if_msg.ifm_flags & IFF_UP ? 1 : 2; - return (u_char *) & long_return; -@@ -2250,129 +2387,17 @@ - u_char *var_ifEntry(struct variable *, oid *, size_t *, int, - size_t *, WriteMethod ** write); - --static char *physaddrbuf; --static int nphysaddrs; --struct sockaddr_dl **physaddrs; -- - void --init_interfaces_setup(void) -+Interface_Scan_Init(void) - { -- int naddrs, ilen, bit; -- static int mib[6] -- = { CTL_NET, PF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; -- char *cp; -- size_t len; -- struct rt_msghdr *rtm; -- struct if_msghdr *ifm; -- struct ifa_msghdr *ifam; -- struct sockaddr *sa; -- -- naddrs = 0; -- if (physaddrs) -- free(physaddrs); -- if (physaddrbuf) -- free(physaddrbuf); -- physaddrbuf = 0; -- physaddrs = 0; -- nphysaddrs = 0; -- len = 0; -- if (sysctl(mib, 6, 0, &len, 0, 0) < 0) -- return; -- -- cp = physaddrbuf = malloc(len); -- if (physaddrbuf == 0) -- return; -- if (sysctl(mib, 6, physaddrbuf, &len, 0, 0) < 0) { -- free(physaddrbuf); -- physaddrbuf = 0; -- return; -- } -- -- loop: -- ilen = len; -- cp = physaddrbuf; -- while (ilen > 0) { -- rtm = (struct rt_msghdr *) cp; -- if (rtm->rtm_version != RTM_VERSION || rtm->rtm_type != RTM_IFINFO) { -- free(physaddrs); -- physaddrs = 0; -- free(physaddrbuf); -- physaddrbuf = 0; -- } -- ifm = (struct if_msghdr *) rtm; --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- if (physaddrs != 0) -- physaddrs[naddrs] = (void *) (ifm + 1); -- naddrs++; --#endif -- ilen -= ifm->ifm_msglen; -- cp += ifm->ifm_msglen; -- rtm = (struct rt_msghdr *) cp; -- while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) { --#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5) -- ilen -= rtm->rtm_msglen; -- cp += rtm->rtm_msglen; --#else -- int is_alias = 0; -- ifam = (struct ifa_msghdr *) rtm; -- ilen -= sizeof(*ifam); -- cp += sizeof(*ifam); -- sa = (struct sockaddr *) cp; --#define ROUND(x) (((x) + sizeof(long) - 1) & ~sizeof(long)) -- for (bit = 1; bit && ilen > 0; bit <<= 1) { -- if (!(ifam->ifam_addrs & bit)) -- continue; -- ilen -= ROUND(sa->sa_len); -- cp += ROUND(sa->sa_len); -- -- if (bit == RTA_IFA) { -- if (physaddrs) --#define satosdl(sa) ((struct sockaddr_dl *)(sa)) -- physaddrs[naddrs++] -- = satosdl(sa); -- else -- naddrs++; -- } -- sa = (struct sockaddr *) cp; -- } --#endif -- rtm = (struct rt_msghdr *) cp; -- } -- } -- if (physaddrs) { -- nphysaddrs = naddrs; -- return; -- } -- physaddrs = malloc(naddrs * sizeof(*physaddrs)); -- if (physaddrs == 0) -- return; -- naddrs = 0; -- goto loop; -- - } - --static int --get_phys_address(int iindex, char **ap, int *len) -+int -+Interface_Scan_Next(short *Index, -+ char *Name, -+ struct ifnet *Retifnet, struct in_ifaddr *Retin_ifaddr) - { -- int i; -- int once = 1; -- -- do { -- for (i = 0; i < nphysaddrs; i++) { -- if (physaddrs[i]->sdl_index == iindex) -- break; -- } -- if (i < nphysaddrs) -- break; -- init_interfaces_setup(); -- } while (once--); -- -- if (i < nphysaddrs) { -- *ap = LLADDR(physaddrs[i]); -- *len = physaddrs[i]->sdl_alen; -- return 0; -- } -- return -1; -+ return 0; - } - - int diff -uNr /tmp/net-snmp.orig/files/patch-master.c /usr/ports/net-mgmt/net-snmp/files/patch-master.c --- /tmp/net-snmp.orig/files/patch-master.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-master.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/master.c.orig Mon Jan 24 09:16:00 2005 -+++ agent/mibgroup/agentx/master.c Mon Jan 24 09:16:21 2005 -@@ -39,10 +39,6 @@ - #endif - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #if HAVE_UNISTD_H - #include - #endif diff -uNr /tmp/net-snmp.orig/files/patch-master_admin.c /usr/ports/net-mgmt/net-snmp/files/patch-master_admin.c --- /tmp/net-snmp.orig/files/patch-master_admin.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-master_admin.c Thu Jan 1 00:00:00 1970 @@ -1,12 +0,0 @@ ---- agent/mibgroup/agentx/master_admin.c.orig Mon Jan 24 09:18:07 2005 -+++ agent/mibgroup/agentx/master_admin.c Mon Jan 24 09:18:15 2005 -@@ -35,9 +35,6 @@ - #if HAVE_SYS_SOCKET_H - #include - #endif --#if HAVE_DMALLOC_H --#include --#endif - - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-oid_stash.c /usr/ports/net-mgmt/net-snmp/files/patch-oid_stash.c --- /tmp/net-snmp.orig/files/patch-oid_stash.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-oid_stash.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- snmplib/oid_stash.c.orig Mon Jan 24 09:43:04 2005 -+++ snmplib/oid_stash.c Mon Jan 24 09:43:14 2005 -@@ -5,10 +5,6 @@ - #include - #include - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - - /** @defgroup oid_stash Store and retrieve data referenced by an OID. diff -uNr /tmp/net-snmp.orig/files/patch-snmpUDPDomain.c /usr/ports/net-mgmt/net-snmp/files/patch-snmpUDPDomain.c --- /tmp/net-snmp.orig/files/patch-snmpUDPDomain.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-snmpUDPDomain.c Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- snmplib/snmpUDPDomain.c.orig Mon Jan 24 10:47:16 2005 -+++ snmplib/snmpUDPDomain.c Mon Jan 24 10:47:41 2005 -@@ -88,7 +88,7 @@ - } else { - char tmp[64]; - -- sprintf(tmp, "UDP: [%s]:%hd", -+ sprintf(tmp, "UDP: [%s]:%hu", - inet_ntoa(to->sin_addr), ntohs(to->sin_port)); - return strdup(tmp); - } diff -uNr /tmp/net-snmp.orig/files/patch-snmp_vars.c /usr/ports/net-mgmt/net-snmp/files/patch-snmp_vars.c --- /tmp/net-snmp.orig/files/patch-snmp_vars.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-snmp_vars.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/snmp_vars.c.orig Mon Jan 24 09:12:09 2005 -+++ agent/snmp_vars.c Mon Jan 24 09:12:23 2005 -@@ -136,10 +136,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-snmpd.8.def /usr/ports/net-mgmt/net-snmp/files/patch-snmpd.8.def --- /tmp/net-snmp.orig/files/patch-snmpd.8.def Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-snmpd.8.def Tue May 23 00:43:43 2006 @@ -1,13 +1,12 @@ --- man/snmpd.8.def.orig Wed Feb 26 04:11:19 2003 +++ man/snmpd.8.def Sat Mar 29 22:05:07 2003 -@@ -211,6 +211,10 @@ +@@ -233,6 +233,9 @@ the error "Error opening specified endpoint". Likewise, since AAL5 PVC support is only currently available on Linux, it will fail with the same error on other platforms. +.PP -+.B snmpd +uses libwrap's access control if configured by --with-libwrap. +Access control patterns may only reference IP addresses. - - .RE .SH CONFIGURATION FILES + .PP + .B snmpd diff -uNr /tmp/net-snmp.orig/files/patch-subagent.c /usr/ports/net-mgmt/net-snmp/files/patch-subagent.c --- /tmp/net-snmp.orig/files/patch-subagent.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-subagent.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/mibgroup/agentx/subagent.c.orig Mon Jan 24 09:17:08 2005 -+++ agent/mibgroup/agentx/subagent.c Mon Jan 24 09:17:12 2005 -@@ -36,10 +36,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-sysORTable.c /usr/ports/net-mgmt/net-snmp/files/patch-sysORTable.c --- /tmp/net-snmp.orig/files/patch-sysORTable.c Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-sysORTable.c Thu Jan 1 00:00:00 1970 @@ -1,13 +0,0 @@ ---- agent/mibgroup/mibII/sysORTable.c.orig Mon Jan 24 08:27:58 2005 -+++ agent/mibgroup/mibII/sysORTable.c Mon Jan 24 08:28:10 2005 -@@ -34,10 +34,6 @@ - #include - #endif - --#if HAVE_DMALLOC_H --#include --#endif -- - #include - #include - #include diff -uNr /tmp/net-snmp.orig/files/patch-ucd_snmp.h /usr/ports/net-mgmt/net-snmp/files/patch-ucd_snmp.h --- /tmp/net-snmp.orig/files/patch-ucd_snmp.h Mon May 22 22:56:32 2006 +++ /usr/ports/net-mgmt/net-snmp/files/patch-ucd_snmp.h Thu Jan 1 00:00:00 1970 @@ -1,11 +0,0 @@ ---- agent/mibgroup/ucd_snmp.h.orig Mon Oct 25 21:36:55 2004 -+++ agent/mibgroup/ucd_snmp.h Mon Oct 25 21:37:20 2004 -@@ -39,6 +39,8 @@ - config_arch_require(freebsd4, ucd-snmp/memory_freebsd2) - config_arch_require(freebsd5, ucd-snmp/vmstat_freebsd2) - config_arch_require(freebsd5, ucd-snmp/memory_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2) -+config_arch_require(freebsd6, ucd-snmp/memory_freebsd2) - config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1) - config_arch_require(netbsd1, ucd-snmp/memory_netbsd1) - config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1) --- net-snmp.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: