Changes 5.4.2:

snmplib:
- [PATCH 1921861]: Avoid endless loop after truncating 64bit int
- Better handling of CONTAINER_INSERT failures with multiple indices

snmpd:
- [PATCH 2023633]: add SCTP-MIB implementation (Linux only)
- suppress annoying "registration != duplicate" warning for root oids

build:
- [BUG 2023803]: Compilation problems on HP-UX 11.31
- Update to libtool 1.5.26

AIX:
- Add support for AIX 6.x.

17 files changed, 137 insertions, 297 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index aca2d0d7697..d99fd261cfc 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2008/07/15 09:14:01 adam Exp $
+# $NetBSD: Makefile,v 1.73 2008/09/08 12:58:09 adam Exp $
 
-DISTNAME=	net-snmp-5.4.1.2
+DISTNAME=	net-snmp-5.4.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/}
 
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index 0969a2baf8e..ebd915514cc 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/09/08 12:58:09 adam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -463,6 +463,7 @@ share/snmp/mib2c.iterate_access.conf
 share/snmp/mib2c.mfd.conf
 share/snmp/mib2c.notify.conf
 share/snmp/mib2c.old-api.conf
+share/snmp/mib2c.perl.conf
 share/snmp/mib2c.scalar.conf
 share/snmp/mib2c.table_data.conf
 share/snmp/mibs/AGENTX-MIB.txt
@@ -498,6 +499,7 @@ share/snmp/mibs/RFC-1215.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
 share/snmp/mibs/RMON-MIB.txt
+share/snmp/mibs/SCTP-MIB.txt
 share/snmp/mibs/SMUX-MIB.txt
 share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 2af65c30393..b514013e54d 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,25 +1,24 @@
-$NetBSD: distinfo,v 1.48 2008/07/15 09:14:01 adam Exp $
+$NetBSD: distinfo,v 1.49 2008/09/08 12:58:09 adam Exp $
 
-SHA1 (net-snmp-5.4.1.2.tar.gz) = aebe7d881f26403abd6b9ef3e69565beb041138d
-RMD160 (net-snmp-5.4.1.2.tar.gz) = ef8870420b651bc83a72cd792308886aa8fbfe8f
-Size (net-snmp-5.4.1.2.tar.gz) = 5123346 bytes
-SHA1 (patch-aa) = 51b09cc020776d136861d34f9ea529a986d2426d
+SHA1 (net-snmp-5.4.2.tar.gz) = 5b69da7d60bbc1092b61992f2d9ccb1051377ec6
+RMD160 (net-snmp-5.4.2.tar.gz) = 8c0cfd259893023c2c98fa68746adb48555d7788
+Size (net-snmp-5.4.2.tar.gz) = 5168274 bytes
+SHA1 (patch-aa) = 34f85e513ace26c1c2b05bb1c4b72a23491861cf
 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
-SHA1 (patch-ac) = acdcde40ec53215d7778b2d0a67656b82274d006
-SHA1 (patch-ad) = 0041bbc3c1b2be73c8d1af1aba671d3a227473f4
+SHA1 (patch-ac) = becbd7d3f7bbd16d6ddd1a6ea5467a127553caa4
 SHA1 (patch-ae) = 721e62bb42b6d3787f36316cf2628cd71ae6a6ce
-SHA1 (patch-af) = 88d0433a6a233dc52fec10e29183d820c50bd524
+SHA1 (patch-af) = 15a18d1a8f3a8ffaba5facb37420668791944d29
 SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f
 SHA1 (patch-ah) = 9ad04b5c0046a82c4e601e4f3abb2dd491846489
 SHA1 (patch-ai) = c57baca06856187115db39fd50668203dad0a94c
 SHA1 (patch-aj) = 30c28c4801cea33d54e68bbde603e7d531dfb2f8
 SHA1 (patch-ak) = cccad21d4f56e79799a433ef7bf0e8ff4e917afb
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
-SHA1 (patch-am) = 58c2439ac2ad96e4114bc454d8148abd9dde4d43
+SHA1 (patch-am) = 84fc1131fb2699ab45b161a07017253e23a8ad08
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
 SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
-SHA1 (patch-dc) = a60caa72af001f5bbda173e5daa9afc6a7180a60
+SHA1 (patch-dc) = 3f668032cbef42b44ee908b3c973af619ce0a689
 SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643
 SHA1 (patch-de) = b505cef8542b30b3d28f5b3e61c473076e242d24
 SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c
@@ -27,21 +26,17 @@ SHA1 (patch-dh) = c9a776d6574df008adae52a2f08930e0662f70b3
 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348
 SHA1 (patch-dl) = e464597dcade165978cea80a51d66bbb8d19e4db
 SHA1 (patch-dm) = 05c182f5bc1751ea0a0bcc7e21f24684b3c4933a
-SHA1 (patch-dn) = 16c68c667c129c4fcccdbff704d7d25481691710
+SHA1 (patch-dn) = b0c40b7dc7311c446016750cf3bb6e42e1aef9be
 SHA1 (patch-do) = 7a69e6e81cbddbb7fc610f4260fe521a5e4c2348
 SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
 SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
-SHA1 (patch-dr) = ab75e5cf3448d9c0520b6e7d2c68adfbf3ab639b
-SHA1 (patch-ds) = 4d59f016eca12660f94dcba89f94e395323ab7b4
+SHA1 (patch-dr) = 9f962834da29776f43ee1483aca00625bb58674b
+SHA1 (patch-ds) = 0ce73a2d5b5b4b9629b7e49e9d4e655ec0f89055
 SHA1 (patch-dt) = bd1884af6fb3743e79ab926fcd952068cb9a3642
-SHA1 (patch-du) = a07160ee1197d8aefa3ccaf7fb255be48311e8bc
-SHA1 (patch-ea) = 9d8d6b167b87d7e4f184b06f1279a55072a7645e
-SHA1 (patch-ee) = ec2a41ba9489bf71412169c0f8367eac214e3738
+SHA1 (patch-du) = c3c053c95c24c3fecfdcb7dfe649168a866206ba
 SHA1 (patch-eg) = 421ccf1c810a2b03d7ff10fe38e8a3eea62d9836
 SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912
 SHA1 (patch-ei) = 7eb4899b08b73c79f1eb8616bcebad38c0fbe148
-SHA1 (patch-ej) = c8047a6109bf6b833c56562d48b56b480c4299be
 SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68
 SHA1 (patch-ep) = 91029b17538360ba09e8e74943d2c4481f89a33a
 SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96
-SHA1 (patch-et) = 63e31a08413b004608540a28a8fc448966320e7f
diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa
index 960be2b48b7..b907cb27ba3 100644
--- a/net/net-snmp/patches/patch-aa
+++ b/net/net-snmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2007/08/10 23:37:02 seb Exp $
+$NetBSD: patch-aa,v 1.8 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/host/hr_filesys.c.orig	2006-08-06 00:01:01.000000000 +0000
+--- agent/mibgroup/host/hr_filesys.c.orig	2008-07-30 11:58:30.000000000 +0200
 +++ agent/mibgroup/host/hr_filesys.c
-@@ -93,6 +93,11 @@ struct mnttab  *HRFS_entry = &HRFS_entry
+@@ -96,6 +96,11 @@ struct mnttab  *HRFS_entry = &HRFS_entry
  
  #elif defined(HAVE_STATVFS) && defined(__NetBSD__)
  
diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac
index dfef678666b..bec7e2956b6 100644
--- a/net/net-snmp/patches/patch-ac
+++ b/net/net-snmp/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2007/08/11 11:05:56 adam Exp $
+$NetBSD: patch-ac,v 1.7 2008/09/08 12:58:09 adam Exp $
 
---- configure.in.orig	2007-08-11 12:17:24.000000000 +0200
+--- configure.in.orig	2008-09-05 11:27:25.000000000 +0200
 +++ configure.in
-@@ -2678,6 +2678,8 @@ AC_CHECK_LIB(kstat, kstat_lookup,
+@@ -2697,6 +2697,8 @@ AC_CHECK_LIB(kstat, kstat_lookup,
          AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).])
          LNETSNMPLIBS="${LNETSNMPLIBS} -lkstat")
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2007/08/11 11:05:56 adam Exp $
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -3406,6 +3408,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/
+@@ -3425,6 +3427,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/
  #if HAVE_NETINET_IP6_H
  #include <netinet/ip6.h>
  #endif
@@ -24,102 +24,112 @@ $NetBSD: patch-ac,v 1.6 2007/08/11 11:05:56 adam Exp $
  ]])
  # DYNAMIC MODULE SUPPORT
  AC_CHECK_HEADERS(dlfcn.h)
-@@ -3800,7 +3808,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+@@ -3864,8 +3872,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
- #undef KERNEL
- #undef _KERNEL
-@@ -3812,7 +3822,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+ ], sockaddr, sa_len, no)
+ 
+@@ -3876,8 +3886,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
- #undef KERNEL
- #undef _KERNEL
-@@ -3848,7 +3860,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+ ], sockaddr, sa_union.sa_generic.sa_family2, no)
+ 
+@@ -3912,8 +3924,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3866,7 +3880,9 @@ AC_TRY_COMPILE([
- #endif
+@@ -3932,8 +3946,10 @@ AC_TRY_COMPILE([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3890,7 +3906,9 @@ AC_TRY_COMPILE([
- #endif
+@@ -3958,8 +3974,10 @@ AC_TRY_COMPILE([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3947,7 +3965,9 @@ AC_TRY_COMPILE([
- #endif
+@@ -4017,8 +4035,10 @@ AC_TRY_COMPILE([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3985,7 +4005,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+@@ -4057,8 +4077,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3998,7 +4020,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+@@ -4072,8 +4094,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -4011,7 +4035,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+@@ -4087,8 +4111,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -4024,7 +4050,9 @@ AC_CHECK_STRUCT_FOR([
- #endif
+@@ -4102,8 +4128,10 @@ AC_CHECK_STRUCT_FOR([
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad
deleted file mode 100644
index 874ba5dd176..00000000000
--- a/net/net-snmp/patches/patch-ad
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2008/05/18 11:59:54 tron Exp $
-
---- perl/SNMP/SNMP.xs.orig	2007-06-18 23:28:09.000000000 +0100
-+++ perl/SNMP/SNMP.xs	2008-05-18 12:40:27.000000000 +0100
-@@ -470,14 +470,16 @@
-            if (flag == USE_ENUMS) {
-               for(ep = tp->enums; ep; ep = ep->next) {
-                  if (ep->value == *var->val.integer) {
--                    strcpy(buf, ep->label);
-+                    strncpy(buf, ep->label, buf_len);
-+                    buf[buf_len-1] = '\0';
-                     len = strlen(buf);
-                     break;
-                  }
-               }
-            }
-            if (!len) {
--              sprintf(buf,"%ld", *var->val.integer);
-+              snprintf(buf, buf_len, "%ld", *var->val.integer);
-+              buf[buf_len-1] = '\0';
-               len = strlen(buf);
-            }
-            break;
-@@ -486,21 +488,25 @@
-         case ASN_COUNTER:
-         case ASN_TIMETICKS:
-         case ASN_UINTEGER:
--           sprintf(buf,"%lu", (unsigned long) *var->val.integer);
-+           snprintf(buf, buf_len, "%lu", (unsigned long) *var->val.integer);
-+           buf[buf_len-1] = '\0';
-            len = strlen(buf);
-            break;
- 
-         case ASN_OCTET_STR:
-         case ASN_OPAQUE:
--           memcpy(buf, (char*)var->val.string, var->val_len);
-            len = var->val_len;
-+           if ( len > buf_len )
-+               len = buf_len;
-+           memcpy(buf, (char*)var->val.string, len);
-            break;
- 
-         case ASN_IPADDRESS:
--          ip = (u_char*)var->val.string;
--          sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
--          len = strlen(buf);
--          break;
-+           ip = (u_char*)var->val.string;
-+           snprintf(buf, buf_len, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
-+           buf[buf_len-1] = '\0';
-+           len = strlen(buf);
-+           break;
- 
-         case ASN_NULL:
-            break;
-@@ -512,14 +518,14 @@
-           break;
- 
- 	case SNMP_ENDOFMIBVIEW:
--          sprintf(buf,"%s", "ENDOFMIBVIEW");
--	  break;
-+           snprintf(buf, buf_len, "%s", "ENDOFMIBVIEW");
-+	   break;
- 	case SNMP_NOSUCHOBJECT:
--	  sprintf(buf,"%s", "NOSUCHOBJECT");
--	  break;
-+	   snprintf(buf, buf_len, "%s", "NOSUCHOBJECT");
-+	   break;
- 	case SNMP_NOSUCHINSTANCE:
--	  sprintf(buf,"%s", "NOSUCHINSTANCE");
--	  break;
-+	   snprintf(buf, buf_len, "%s", "NOSUCHINSTANCE");
-+	   break;
- 
-         case ASN_COUNTER64:
- #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
-@@ -538,19 +544,19 @@
- #endif
- 
-         case ASN_BIT_STR:
--            snprint_bitstring(buf, sizeof(buf), var, NULL, NULL, NULL);
-+            snprint_bitstring(buf, buf_len, var, NULL, NULL, NULL);
-             len = strlen(buf);
-             break;
- #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
-         case ASN_OPAQUE_FLOAT:
--	  if (var->val.floatVal)
--	    sprintf(buf,"%f", *var->val.floatVal);
--         break;
-+           if (var->val.floatVal)
-+              snprintf(buf, buf_len, "%f", *var->val.floatVal);
-+           break;
-          
-         case ASN_OPAQUE_DOUBLE:
--	  if (var->val.doubleVal)
--	    sprintf(buf,"%f", *var->val.doubleVal);
--         break;
-+           if (var->val.doubleVal)
-+              snprintf(buf, buf_len, "%f", *var->val.doubleVal);
-+           break;
- #endif
-          
-         case ASN_NSAP:
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 1e920cad321..33c6fe766b2 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2007/08/11 11:05:56 adam Exp $
+$NetBSD: patch-af,v 1.12 2008/09/08 12:58:09 adam Exp $
 
---- configure.orig	2007-08-11 12:20:35.000000000 +0200
+--- configure.orig	2008-09-05 11:29:01.000000000 +0200
 +++ configure
-@@ -27463,6 +27463,81 @@ _ACEOF
+@@ -27854,6 +27854,81 @@ _ACEOF
  fi
  
  
@@ -84,7 +84,7 @@ $NetBSD: patch-af,v 1.11 2007/08/11 11:05:56 adam Exp $
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -36453,6 +36528,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -36844,6 +36919,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  #if HAVE_NETINET_IP6_H
  #include <netinet/ip6.h>
  #endif
@@ -97,102 +97,112 @@ $NetBSD: patch-af,v 1.11 2007/08/11 11:05:56 adam Exp $
  
  
  #include <$ac_header>
-@@ -42273,7 +42354,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -42849,8 +42930,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
- #undef KERNEL
- #undef _KERNEL
-@@ -42371,7 +42454,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+ 
+ 
+@@ -42947,8 +43030,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
- #undef KERNEL
- #undef _KERNEL
-@@ -42665,7 +42750,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+ 
+ 
+@@ -43241,8 +43326,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -42752,7 +42839,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43330,8 +43417,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -42819,7 +42908,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43399,8 +43488,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -42957,7 +43048,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43539,8 +43630,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -43188,7 +43281,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43772,8 +43865,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -43287,7 +43382,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43873,8 +43968,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -43386,7 +43483,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -43974,8 +44071,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -43485,7 +43584,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
+@@ -44075,8 +44174,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <sys/types.h>
+ #ifdef IFNET_NEEDS_KERNEL
  #define KERNEL
 +#if !defined(__DragonFly__)
  #define _KERNEL
+ #endif
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am
index c4162bb18fa..0027a4af45e 100644
--- a/net/net-snmp/patches/patch-am
+++ b/net/net-snmp/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
+$NetBSD: patch-am,v 1.9 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/host/hr_swrun.c.orig	2007-04-02 16:51:34 +0300
-+++ agent/mibgroup/host/hr_swrun.c	2007-09-12 21:41:48 +0300
-@@ -599,6 +599,8 @@
+--- agent/mibgroup/host/hr_swrun.c.orig	2008-08-22 02:18:50.000000000 +0200
++++ agent/mibgroup/host/hr_swrun.c
+@@ -599,6 +599,8 @@ var_hrswrun(struct variable * vp,
  #elif HAVE_KVM_GETPROCS
      #if defined(freebsd5) && __FreeBSD_version >= 500014
          strcpy(string, proc_table[LowProcIndex].ki_comm);
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
      #else
          strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
      #endif
-@@ -722,6 +724,8 @@
+@@ -722,6 +724,8 @@ var_hrswrun(struct variable * vp,
  #elif HAVE_KVM_GETPROCS
      #if defined(freebsd5) && __FreeBSD_version >= 500014
          strcpy(string, proc_table[LowProcIndex].ki_comm);
@@ -20,7 +20,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
      #else
          strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
      #endif
-@@ -921,11 +925,17 @@
+@@ -929,11 +933,17 @@ var_hrswrun(struct variable * vp,
  	} else
  	    long_return = 4;	/* application */
      #else
@@ -38,7 +38,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
  #else
  	long_return = 4;	/* application */
  #endif
-@@ -962,6 +972,8 @@
+@@ -970,6 +980,8 @@ var_hrswrun(struct variable * vp,
  #if HAVE_KVM_GETPROCS
      #if defined(freebsd5) && __FreeBSD_version >= 500014
          switch (proc_table[LowProcIndex].ki_stat) {
@@ -47,7 +47,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
      #else
          switch (proc_table[LowProcIndex].kp_proc.p_stat) {
      #endif
-@@ -1069,6 +1081,14 @@
+@@ -1077,6 +1089,14 @@ var_hrswrun(struct variable * vp,
          long_return = 0;
      #elif defined(freebsd5)
          long_return = proc_table[LowProcIndex].ki_runtime / 100000;
@@ -62,7 +62,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
      #else
          long_return = proc_table[LowProcIndex].kp_proc.p_uticks +
              proc_table[LowProcIndex].kp_proc.p_sticks +
-@@ -1157,6 +1177,8 @@
+@@ -1169,6 +1189,8 @@ var_hrswrun(struct variable * vp,
          long_return =
      #if defined(freebsd5)
              proc_table[LowProcIndex].ki_size / 1024;
@@ -71,7 +71,7 @@ $NetBSD: patch-am,v 1.8 2008/07/15 09:14:01 adam Exp $
      #else
              proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024;
      #endif
-@@ -1477,6 +1499,9 @@
+@@ -1489,6 +1511,9 @@ Get_Next_HR_SWRun(void)
      #if defined(freebsd5) && __FreeBSD_version >= 500014
          if (proc_table[current_proc_entry].ki_stat != 0)
              return proc_table[current_proc_entry++].ki_pid;
diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc
index 72a84837ba8..37bd5723e79 100644
--- a/net/net-snmp/patches/patch-dc
+++ b/net/net-snmp/patches/patch-dc
@@ -1,8 +1,8 @@
-$NetBSD: patch-dc,v 1.4 2007/08/11 11:05:57 adam Exp $
+$NetBSD: patch-dc,v 1.5 2008/09/08 12:58:09 adam Exp $
 
---- include/net-snmp/net-snmp-config.h.in.orig	2007-07-19 23:00:35.000000000 +0200
+--- include/net-snmp/net-snmp-config.h.in.orig	2008-07-28 13:41:40.000000000 +0200
 +++ include/net-snmp/net-snmp-config.h.in
-@@ -1460,6 +1460,7 @@
+@@ -1463,6 +1463,7 @@
  #define NETSNMP_HPUX11ID 14
  #define NETSNMP_AIXID 15
  #define NETSNMP_MACOSXID 16
@@ -10,7 +10,7 @@ $NetBSD: patch-dc,v 1.4 2007/08/11 11:05:57 adam Exp $
  #define NETSNMP_UNKNOWNID 255
  
  #ifdef hpux9
-@@ -1489,6 +1490,9 @@
+@@ -1492,6 +1493,9 @@
  #if defined(__FreeBSD__)
  #define NETSNMP_OSTYPE NETSNMP_FREEBSDID
  #endif
diff --git a/net/net-snmp/patches/patch-dn b/net/net-snmp/patches/patch-dn
index 81646d4a422..0afe12501ee 100644
--- a/net/net-snmp/patches/patch-dn
+++ b/net/net-snmp/patches/patch-dn
@@ -1,6 +1,6 @@
-$NetBSD: patch-dn,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dn,v 1.2 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	2006-03-19 20:27:45.000000000 +0000
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	2008-02-12 18:40:48.000000000 +0100
 +++ agent/mibgroup/ucd-snmp/memory_freebsd2.c
 @@ -10,8 +10,12 @@
   */
@@ -66,5 +66,5 @@ $NetBSD: patch-dn,v 1.1 2006/03/19 22:03:29 joerg Exp $
 +#elif defined(dragonfly)
 +        long_ret = ptok(vmstats.v_cache_count);
  #else
-         long_ret = ptok(mem.v_cache_count);
+         long_ret = ptok(mem.v_cache_count) + ptok(mem.v_inactive_count);
  #endif
diff --git a/net/net-snmp/patches/patch-dr b/net/net-snmp/patches/patch-dr
index e6a9a2c1e03..f97f45469b6 100644
--- a/net/net-snmp/patches/patch-dr
+++ b/net/net-snmp/patches/patch-dr
@@ -1,8 +1,8 @@
-$NetBSD: patch-dr,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dr,v 1.2 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/mibII/tcpTable.c.orig	2006-03-19 21:24:04.000000000 +0000
+--- agent/mibgroup/mibII/tcpTable.c.orig	2007-10-14 14:12:58.000000000 +0200
 +++ agent/mibgroup/mibII/tcpTable.c
-@@ -711,7 +711,11 @@ tcpTable_load(netsnmp_cache *cache, void
+@@ -719,7 +719,11 @@ tcpTable_load(netsnmp_cache *cache, void
      size_t   len;
      int      sname[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST };
      char     *tcpcb_buf = NULL;
@@ -14,7 +14,7 @@ $NetBSD: patch-dr,v 1.1 2006/03/19 22:03:29 joerg Exp $
      netsnmp_inpcb  *nnew;
      int      StateMap[] = { 1, 2, 3, 4, 5, 8, 6, 10, 9, 7, 11 };
  
-@@ -733,10 +737,18 @@ tcpTable_load(netsnmp_cache *cache, void
+@@ -741,10 +745,18 @@ tcpTable_load(netsnmp_cache *cache, void
       *  Unpick this into the constituent 'xinpgen' structures, and extract
       *     the 'inpcb' elements into a linked list (built in reverse)
       */
@@ -33,7 +33,7 @@ $NetBSD: patch-dr,v 1.1 2006/03/19 22:03:29 joerg Exp $
          nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb);
          if (!nnew)
              break;
-@@ -749,7 +761,11 @@ tcpTable_load(netsnmp_cache *cache, void
+@@ -757,7 +769,11 @@ tcpTable_load(netsnmp_cache *cache, void
  
  	nnew->inp_next = tcp_head;
  	tcp_head   = nnew;
diff --git a/net/net-snmp/patches/patch-ds b/net/net-snmp/patches/patch-ds
index 7f74cde7d4d..657d1bef5fe 100644
--- a/net/net-snmp/patches/patch-ds
+++ b/net/net-snmp/patches/patch-ds
@@ -1,8 +1,8 @@
-$NetBSD: patch-ds,v 1.3 2007/02/05 12:06:16 adam Exp $
+$NetBSD: patch-ds,v 1.4 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/mibII/udpTable.c.orig	2006-11-07 00:43:27.000000000 +0100
+--- agent/mibgroup/mibII/udpTable.c.orig	2008-02-13 17:12:42.000000000 +0100
 +++ agent/mibgroup/mibII/udpTable.c
-@@ -617,7 +617,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -619,7 +619,11 @@ udpTable_load(netsnmp_cache *cache, void
      size_t   len;
      int      sname[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST };
      char     *udpcb_buf = NULL;
@@ -14,7 +14,7 @@ $NetBSD: patch-ds,v 1.3 2007/02/05 12:06:16 adam Exp $
      UDPTABLE_ENTRY_TYPE  *nnew;
  
      udpTable_free(NULL, NULL);
-@@ -638,10 +642,18 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -640,10 +644,18 @@ udpTable_load(netsnmp_cache *cache, void
       *  Unpick this into the constituent 'xinpgen' structures, and extract
       *     the 'inpcb' elements into a linked list (built in reverse)
       */
@@ -33,7 +33,7 @@ $NetBSD: patch-ds,v 1.3 2007/02/05 12:06:16 adam Exp $
          nnew = SNMP_MALLOC_TYPEDEF(UDPTABLE_ENTRY_TYPE);
          if (!nnew)
              break;
-@@ -654,7 +666,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -656,7 +668,11 @@ udpTable_load(netsnmp_cache *cache, void
  #endif
  
  	udp_head   = nnew;
diff --git a/net/net-snmp/patches/patch-du b/net/net-snmp/patches/patch-du
index 7e0b12080a4..b2eadd5dc78 100644
--- a/net/net-snmp/patches/patch-du
+++ b/net/net-snmp/patches/patch-du
@@ -1,6 +1,6 @@
-$NetBSD: patch-du,v 1.1 2007/02/05 19:19:14 joerg Exp $
+$NetBSD: patch-du,v 1.2 2008/09/08 12:58:09 adam Exp $
 
---- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2007-02-05 18:25:59.000000000 +0000
+--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2008-05-28 13:48:46.000000000 +0200
 +++ agent/mibgroup/hardware/memory/memory_freebsd.c
 @@ -36,6 +36,12 @@ int netsnmp_mem_arch_load( netsnmp_cache
      long           pagesize;
@@ -15,14 +15,14 @@ $NetBSD: patch-du,v 1.1 2007/02/05 19:19:14 joerg Exp $
      struct vmmeter vmem;
      struct vmtotal total;
      size_t         total_size  = sizeof(total);
-@@ -53,12 +59,18 @@ int netsnmp_mem_arch_load( netsnmp_cache
-     sysctl(total_mib,    2, &total,    &total_size,    NULL, 0);
-     sysctl(phys_mem_mib, 2, &phys_mem, &mem_size,      NULL, 0);
+@@ -58,12 +64,18 @@ int netsnmp_mem_arch_load( netsnmp_cache
      sysctl(user_mem_mib, 2, &user_mem, &mem_size,      NULL, 0);
+     sysctlbyname("vfs.bufspace",    &bufspace,    &buf_size, NULL, 0);
+     sysctlbyname("vfs.maxbufspace", &maxbufspace, &buf_size, NULL, 0);
 +#ifdef dragonfly
 +    pagesize = getpagesize();
-+    sysctlbyname("vm.vmstats", & vms, &vms_size, NULL, 0);
-+    sysctlbyname("vm.vmmeter", & vmem, &vmem_size, NULL, 0);
++    sysctlbyname("vm.vmstats", &vms, &vms_size, NULL, 0);
++    sysctlbyname("vm.vmmeter", &vmem, &vmem_size, NULL, 0);
 +#else
      auto_nlist(SUM_SYMBOL,      (char *) &vmem,     sizeof(vmem));
  #ifndef freebsd4
@@ -34,17 +34,19 @@ $NetBSD: patch-du,v 1.1 2007/02/05 19:19:14 joerg Exp $
  
      /*
       * ... and save this in a standard form.
-@@ -124,8 +136,13 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -129,9 +141,15 @@ int netsnmp_mem_arch_load( netsnmp_cache
      } else {
          if (!mem->descr)
               mem->descr = strdup("Cached memory");
 +#ifdef dragonfly
 +        mem->units = vms.v_page_size;
-+        mem->size  = vms.v_cache_count;
++        mem->size  = vms.v_cache_max;
++        mem->free  = vms.v_cache_max - vms.v_cache_count;
 +#else
          mem->units = vmem.v_page_size;
-         mem->size  = vmem.v_cache_count;
+         mem->size  = vmem.v_cache_max;
+         mem->free  = vmem.v_cache_max - vmem.v_cache_count;
 +#endif
-         mem->free  = -1;
      }
  
+     nswap = swapmode(pagesize);
diff --git a/net/net-snmp/patches/patch-ea b/net/net-snmp/patches/patch-ea
deleted file mode 100644
index 2c6d0f3ed1e..00000000000
--- a/net/net-snmp/patches/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ea,v 1.4 2007/08/11 11:05:57 adam Exp $
-
---- snmplib/snmp_api.c.orig	2007-07-21 16:51:54.000000000 +0200
-+++ snmplib/snmp_api.c
-@@ -6833,7 +6833,7 @@ snmp_add_var(netsnmp_pdu *pdu,
-         }
- #endif /* NETSNMP_DISABLE_MIB_LOADING */
-         atmp = inet_addr(value);
--        if (atmp != (long) -1 || !strcmp(value, "255.255.255.255"))
-+        if (atmp != (in_addr_t) -1 || !strcmp(value, "255.255.255.255"))
-             snmp_pdu_add_variable(pdu, name, name_length, ASN_IPADDRESS,
-                                   (u_char *) & atmp, sizeof(atmp));
-         else
diff --git a/net/net-snmp/patches/patch-ee b/net/net-snmp/patches/patch-ee
deleted file mode 100644
index 66252a0fe4d..00000000000
--- a/net/net-snmp/patches/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ee,v 1.2 2007/02/05 12:06:16 adam Exp $
-
---- agent/mibgroup/host/hr_device.c.orig	2006-09-15 02:48:39.000000000 +0200
-+++ agent/mibgroup/host/hr_device.c
-@@ -222,7 +222,7 @@ var_hrdevice(struct variable *vp,
- {
-     int             dev_idx, type;
-     oid            *oid_p;
--    char           *tmp_str;
-+    const char           *tmp_str;
-     static char     string[1024];
- 
- really_try_next:
diff --git a/net/net-snmp/patches/patch-ej b/net/net-snmp/patches/patch-ej
deleted file mode 100644
index 540287da409..00000000000
--- a/net/net-snmp/patches/patch-ej
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ej,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- agent/mibgroup/utilities/iquery.c.orig	2006-04-11 11:10:16.000000000 +0000
-+++ agent/mibgroup/utilities/iquery.c
-@@ -153,7 +153,7 @@ netsnmp_session *netsnmp_iquery_session(
-         memdup( &(ss->securityEngineID), engineID, engIDLen );
-         ss->securityEngineIDLen = engIDLen;
-         if ( version == SNMP_VERSION_3 ) {
--            memdup(&(ss->securityName), secName, strlen(secName));
-+            memdup((u_char **)&(ss->securityName), secName, strlen(secName));
-             ss->securityNameLen = strlen(secName);
-         } else {
-             memdup( &(ss->community), secName, strlen(secName));
diff --git a/net/net-snmp/patches/patch-et b/net/net-snmp/patches/patch-et
deleted file mode 100644
index d7f9d68261b..00000000000
--- a/net/net-snmp/patches/patch-et
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-et,v 1.2 2006/10/11 19:22:02 rillig Exp $
-
-Removed bashisms.
-
---- local/mib2c-update.orig	2005-09-27 18:01:36.000000000 +0200
-+++ local/mib2c-update	2006-10-11 21:13:41.000000000 +0200
-@@ -96,7 +96,7 @@ check_setup()
- #        rc=0
- #    fi
- 
--    if [[ $rc -eq 0 && $UPDATE_NOPROBE -ne 1 ]]; then
-+    if [ $rc -eq 0 ] && [ $UPDATE_NOPROBE -ne 1 ]; then
-         mib2c -c unknown  > /dev/null 2>&1
-         if [ $? -eq 0 ]; then
-             error "WARNING: mib2c returns 0 on error conditions!"
-@@ -131,7 +131,7 @@ do_diff()
-             diff -U $FUZZ -p -b -w --show-c-function \
-                 -I "$""Id:" $f $DD_CURR/$f >> $DD_OUTPUT
-             rc=$?
--            (( rcs = $rcs + $rc ))
-+            rcs=`expr $rcs + $rc`
-             if [ $rc -eq 1 ]; then
-                 echo "   $f is different"
-             fi
-@@ -330,10 +330,10 @@ if [ -f .M2C-UPDATE-MERGE-FAILED ]; then
-         echo "[q)uit]"
-         echo "(c|r|q) ?"
-         read ans
--        if [ "x$ans" == "xr" ]; then
-+        if [ "x$ans" = "xr" ]; then
-             rm .M2C-UPDATE-MERGE-FAILED
-             break
--        elif [ "x$ans" == "xc" ]; then
-+        elif [ "x$ans" = "xc" ]; then
-             echo "Have you have manually merged all the"
-             echo "changes into the merged directory?"
-             echo "(y|n)"