Changes 5.3.1:

 snmpd:
   - fix trap processing from SMUX peers
   - fix disman/event monitoring crashes
   - fix bug 1399369: ifNumber broken
   - fix re-init of daemons after SIGHUP
 snmptrapd:
   - fix bug 1420758/1458815: snmptrapd aborts/loops in select()
   - fix re-init of daemons after SIGHUP
 snmplib:
   - fix OID lookups for fully qualified object names (eg .iso.org)
 snmpusm:
   - performance improvement when changing localized keys
 perl:
   - The perl modules now check to make sure they're building
     against the proper Net-SNMP version.
 misc:
   - Coverity fixes

10 files changed, 120 insertions, 74 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index cff6a54c052..fd7f1b45ac6 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2006/07/06 18:13:08 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/07/29 16:48:27 adam Exp $
 
-DISTNAME=	net-snmp-5.3.0.1
-PKGREVISION=	3
+DISTNAME=	net-snmp-5.3.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
@@ -12,8 +11,8 @@ COMMENT=	Extensible SNMP implementation
 
 CONFLICTS=	ucd-snmp-[0-9]*
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 MAKE_ENV+=	OPSYS=${OPSYS:Q}
 
@@ -80,9 +79,9 @@ CONFIGURE_ARGS+=	--enable-ucd-snmp-compatibility
 #
 # Enable the perl modules build and installation
 #
-CONFIGURE_ARGS+=	--with-perl-modules=${MAKE_PARAMS:Q}
-PERL5_CONFIGURE=	NO
+PERL5_CONFIGURE=	no
 PERL5_PACKLIST=		auto/Bundle/NetSNMP/.packlist
+CONFIGURE_ARGS+=	--with-perl-modules=${MAKE_PARAMS:Q}
 CONFIGURE_ENV+=		PERLPROG=${PERL5:Q}
 
 .include "options.mk"
@@ -99,6 +98,8 @@ REPLACE.bash.old=	/bin/bash
 REPLACE.bash.new=	${SH}
 REPLACE_FILES.bash=	local/mib2c-update
 
+INSTALLATION_DIRS+=	share/examples/net-snmp
+
 post-extract:
 	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/include/net-snmp/system
 
@@ -109,8 +110,7 @@ post-wrapper:
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/net-snmp
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf				\
+	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf	\
 		${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/net-snmp/builtin.mk b/net/net-snmp/builtin.mk
new file mode 100644
index 00000000000..7b43583e7e8
--- /dev/null
+++ b/net/net-snmp/builtin.mk
@@ -0,0 +1,65 @@
+# $NetBSD: builtin.mk,v 1.1 2006/07/29 16:48:27 adam Exp $
+
+BUILTIN_PKG:=	net-snmp
+
+BUILTIN_FIND_FILES_VAR:=	H_NETSNMP
+BUILTIN_FIND_FILES.H_NETSNMP=	/usr/include/net-snmp/net-snmp-config.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
+.if !defined(IS_BUILTIN.net-snmp)
+IS_BUILTIN.net-snmp=	no
+.  if empty(H_NETSNMP:M__nonexistent__) && empty(H_NETSNMP:M${LOCALBASE}/*)
+IS_BUILTIN.net-snmp=	yes
+.  endif
+.endif
+MAKEVARS+=	IS_BUILTIN.net-snmp
+
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.net-snmp) && \
+    !empty(IS_BUILTIN.net-snmp:M[yY][eE][sS]) && \
+    empty(H_NETSNMP:M__nonexistent__)
+BUILTIN_VERSION.net-snmp!=				\
+	${AWK} '/\#define[	 ]*PACKAGE_VERSION/ {	\
+			vers = $$3;			\
+			gsub("\"", "", vers);		\
+			print vers;			\
+		}					\
+	' ${H_NETSNMP:Q}
+BUILTIN_PKG.net-snmp=	net-snmp-${BUILTIN_VERSION.net-snmp}
+.endif
+MAKEVARS+=	BUILTIN_PKG.net-snmp
+
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.net-snmp)
+.  if ${PREFER.net-snmp} == "pkgsrc"
+USE_BUILTIN.net-snmp=	no
+.  else
+USE_BUILTIN.net-snmp=	${IS_BUILTIN.net-snmp}
+.    if defined(BUILTIN_PKG.net-snmp) && \
+        !empty(IS_BUILTIN.net-snmp:M[yY][eE][sS])
+USE_BUILTIN.net-snmp=	yes
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.net-snmp}
+.        if !empty(USE_BUILTIN.net-snmp:M[yY][eE][sS])
+USE_BUILTIN.net-snmp!=							\
+	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.net-snmp:Q}; then \
+		${ECHO} yes;						\
+	else								\
+		${ECHO} no;						\
+	fi
+.        endif
+.      endfor
+.    endif
+.  endif
+.endif
+MAKEVARS+=	USE_BUILTIN.net-snmp
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 433027ca912..411519caddd 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.24 2006/06/19 13:46:36 christos Exp $
+$NetBSD: distinfo,v 1.25 2006/07/29 16:48:27 adam Exp $
 
-SHA1 (net-snmp-5.3.0.1.tar.gz) = c58ddabe4281c3681a268bd48de6865e812f2ec5
-RMD160 (net-snmp-5.3.0.1.tar.gz) = 86b7e56b512faf73d2a08ac3df2def4560b62945
-Size (net-snmp-5.3.0.1.tar.gz) = 4183370 bytes
+SHA1 (net-snmp-5.3.1.tar.gz) = 8ddb5122769814f04a7d3d352dcc640df7c89d41
+RMD160 (net-snmp-5.3.1.tar.gz) = 7bcdd213fb2517d0927b030deab5146522b58b3d
+Size (net-snmp-5.3.1.tar.gz) = 4210843 bytes
 SHA1 (patch-aa) = 30a4d1546fe7022a0578d01004fc3f284e45c392
 SHA1 (patch-ab) = cdc455989f9d7abb6cad9256a42e2008b6c0f2ee
 SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
-SHA1 (patch-af) = f7c95d2276ccd8332e7dc39f2bf88c857bdfde9f
-SHA1 (patch-ag) = 9bad3789cfb12bb68c2b306e82600d866467471a
+SHA1 (patch-af) = d2a38e024bd5da572fc898674907eef8f84d4f43
+SHA1 (patch-ag) = 23c8d1755a29a503827f3851eeddddb633a2eda8
 SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
-SHA1 (patch-am) = 4db69b58419b809f7251d0ca555b3adb3e989710
+SHA1 (patch-am) = 237adef32b2121e95a9d7bcd332420efedd3dacd
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
 SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
-SHA1 (patch-dc) = 43e430f42c9f8a89c95a2eae91053805fa3e2373
+SHA1 (patch-dc) = 96fb6bca78a88bd2d9290bc8e47cc49893220104
 SHA1 (patch-dd) = 56957eaf21224d788baf315e35768d2c7b2f2c95
 SHA1 (patch-de) = f6e97f3cc60102c8542409a29fb744339569ef9f
 SHA1 (patch-df) = 3a82b023d3b284150562c66aa8f5c41c6c455367
@@ -23,13 +23,12 @@ SHA1 (patch-dh) = 1c88c853f867aa363f8995df8ab7023daaba6509
 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348
 SHA1 (patch-dj) = 392a5bcd7e63f0831fc6a6aa34904dd590b05703
 SHA1 (patch-dk) = fdd71ac507b0b589ae4464c2810300a5d2de17a0
-SHA1 (patch-dl) = 571b12bcdc1f801b47274d46a17b6e94294c0b4e
+SHA1 (patch-dl) = 6bdf874319b9d2fa28aa5f2cbe9f5cc2697aea68
 SHA1 (patch-dm) = 05c182f5bc1751ea0a0bcc7e21f24684b3c4933a
 SHA1 (patch-dn) = 16c68c667c129c4fcccdbff704d7d25481691710
 SHA1 (patch-do) = 7a69e6e81cbddbb7fc610f4260fe521a5e4c2348
 SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
 SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
 SHA1 (patch-dr) = ab75e5cf3448d9c0520b6e7d2c68adfbf3ab639b
-SHA1 (patch-ds) = b27b0dc9c0da0ab688f26e2821e90c145c6ae641
-SHA1 (patch-dt) = 0cbf8245fbb5475dc864acc4e7c1490095377a6e
+SHA1 (patch-ds) = e0319c5f63ed56ab8a9ddc96759f16fd43395096
 SHA1 (patch-mib2cupdate) = d6773633c8737fe45a58e378967995e21012d21d
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 85f694d9b86..fcde0d912a2 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-af,v 1.7 2006/07/29 16:48:27 adam Exp $
 
---- configure.orig	2006-01-14 01:51:51.000000000 +0000
+--- configure.orig	2006-07-29 17:35:31.000000000 +0200
 +++ configure
-@@ -13421,7 +13421,7 @@ else
+@@ -13548,7 +13548,7 @@ else
     default_mibs=IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:HOST-RESOURCES-MIB:SNMPv2-MIB:RFC1213-MIB:NOTIFICATION-LOG-MIB:DISMAN-EVENT-MIB:DISMAN-SCHEDULE-MIB
  
     case $target_os in
--      linux* | mingw32* | cygwin* | freebsd* | dynix* | solaris2* | hpux* )
-+      linux* | mingw32* | cygwin* | freebsd* | dynix* | solaris2* | hpux* | dragonfly* )
+-      linux* | freebsd* | dynix* | solaris2* | hpux* )
++      linux* | freebsd* | dynix* | solaris2* | hpux* | dragonfly* )
           new_module_list="$new_module_list host"
           ;;
        *)
-@@ -15503,6 +15503,53 @@ fi
+@@ -15630,6 +15630,53 @@ fi
  
  fi
  
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -27716,7 +27763,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28131,7 +28178,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -75,7 +75,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -27814,7 +27863,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28229,7 +28278,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -85,7 +85,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -27912,10 +27963,14 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28327,10 +28378,14 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <net/route.h>
  
  
-@@ -27999,7 +28054,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28414,7 +28469,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -111,7 +111,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28066,7 +28123,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28481,7 +28538,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -121,7 +121,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28204,7 +28263,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28619,7 +28678,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -131,7 +131,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28299,7 +28360,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28714,7 +28775,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -141,7 +141,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28398,7 +28461,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28813,7 +28876,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -151,7 +151,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28497,7 +28562,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -28912,7 +28977,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -161,7 +161,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28596,7 +28663,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -29011,7 +29078,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -171,7 +171,7 @@ $NetBSD: patch-af,v 1.6 2006/03/19 22:03:29 joerg Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -34718,6 +34787,8 @@ do
+@@ -35133,6 +35202,8 @@ do
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
diff --git a/net/net-snmp/patches/patch-ag b/net/net-snmp/patches/patch-ag
index fac9a4ab6cc..11e81b5da15 100644
--- a/net/net-snmp/patches/patch-ag
+++ b/net/net-snmp/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-ag,v 1.8 2006/07/29 16:48:27 adam Exp $
 
---- agent/mibgroup/host/hr_storage.c.orig	2005-10-31 09:14:38.000000000 +0000
+--- agent/mibgroup/host/hr_storage.c.orig	2006-06-05 19:38:24.000000000 +0200
 +++ agent/mibgroup/host/hr_storage.c
 @@ -73,6 +73,13 @@
  #endif
@@ -43,9 +43,9 @@ $NetBSD: patch-ag,v 1.7 2006/03/19 22:03:29 joerg Exp $
                  long_return = -1;
  	        break;
 -#if defined(MBSTAT_SYMBOL)
--	    case HRS_TYPE_MBUF:
+-           case HRS_TYPE_MBUF:
 -                long_return = mbstat.m_mbufs;
--                break; 
+-                break;
 -#endif
  #elif defined(TOTAL_MEMORY_SYMBOL) || defined(USE_SYSCTL_VM)
              case HRS_TYPE_MEM:
diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am
index 94625796db9..ada7cab7d84 100644
--- a/net/net-snmp/patches/patch-am
+++ b/net/net-snmp/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.4 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-am,v 1.5 2006/07/29 16:48:27 adam Exp $
 
---- agent/mibgroup/host/hr_swrun.c.orig	2005-10-28 21:28:45.000000000 +0000
+--- agent/mibgroup/host/hr_swrun.c.orig	2006-06-01 15:29:13.000000000 +0200
 +++ agent/mibgroup/host/hr_swrun.c
-@@ -884,6 +884,8 @@ var_hrswrun(struct variable * vp,
+@@ -896,6 +896,8 @@ var_hrswrun(struct variable * vp,
  	else
  	    long_return = 4;	/* application */
      #endif
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.4 2006/03/19 22:03:29 joerg Exp $
  #else
  	long_return = 4;	/* application */
  #endif
-@@ -1025,6 +1027,10 @@ var_hrswrun(struct variable * vp,
+@@ -1037,6 +1039,10 @@ var_hrswrun(struct variable * vp,
          long_return = 0;
      #elif defined(freebsd5)
          long_return = proc_table[LowProcIndex].ki_runtime / 100000;
diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc
index 94b7ec1a09c..b52c30207e7 100644
--- a/net/net-snmp/patches/patch-dc
+++ b/net/net-snmp/patches/patch-dc
@@ -1,8 +1,8 @@
-$NetBSD: patch-dc,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dc,v 1.2 2006/07/29 16:48:27 adam Exp $
 
---- include/net-snmp/net-snmp-config.h.in.orig	2005-12-08 11:08:34.000000000 +0000
+--- include/net-snmp/net-snmp-config.h.in.orig	2006-05-26 18:36:06.000000000 +0200
 +++ include/net-snmp/net-snmp-config.h.in
-@@ -1219,6 +1219,7 @@
+@@ -1225,6 +1225,7 @@
  #define HPUX11ID 14
  #define AIXID 15
  #define MACOSXID 16
@@ -10,7 +10,7 @@ $NetBSD: patch-dc,v 1.1 2006/03/19 22:03:29 joerg Exp $
  #define UNKNOWNID 255
  
  #ifdef hpux9
-@@ -1248,6 +1249,9 @@
+@@ -1254,6 +1255,9 @@
  #if defined(__FreeBSD__)
  #define OSTYPE FREEBSDID
  #endif
diff --git a/net/net-snmp/patches/patch-dl b/net/net-snmp/patches/patch-dl
index 4796fd9d55d..9f0278f6ab5 100644
--- a/net/net-snmp/patches/patch-dl
+++ b/net/net-snmp/patches/patch-dl
@@ -1,8 +1,8 @@
-$NetBSD: patch-dl,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dl,v 1.2 2006/07/29 16:48:27 adam Exp $
 
---- agent/mibgroup/mibII/tcp.c.orig	2006-03-19 20:03:42.000000000 +0000
+--- agent/mibgroup/mibII/tcp.c.orig	2006-01-06 01:21:52.000000000 +0100
 +++ agent/mibgroup/mibII/tcp.c
-@@ -169,6 +169,11 @@ init_tcp(void)
+@@ -166,6 +166,11 @@ init_tcp(void)
  #define USES_TRADITIONAL_TCPSTAT
  #endif
  
diff --git a/net/net-snmp/patches/patch-ds b/net/net-snmp/patches/patch-ds
index 75fe334eea9..b15fc4c324a 100644
--- a/net/net-snmp/patches/patch-ds
+++ b/net/net-snmp/patches/patch-ds
@@ -1,8 +1,8 @@
-$NetBSD: patch-ds,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-ds,v 1.2 2006/07/29 16:48:27 adam Exp $
 
---- agent/mibgroup/mibII/udpTable.c.orig	2006-03-19 21:28:31.000000000 +0000
+--- agent/mibgroup/mibII/udpTable.c.orig	2006-06-27 17:25:38.000000000 +0200
 +++ agent/mibgroup/mibII/udpTable.c
-@@ -599,7 +599,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -615,7 +615,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.1 2006/03/19 22:03:29 joerg Exp $
      UDPTABLE_ENTRY_TYPE  *nnew;
  
      udpTable_free(NULL, NULL);
-@@ -620,10 +624,18 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -636,10 +640,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.1 2006/03/19 22:03:29 joerg Exp $
          nnew = SNMP_MALLOC_TYPEDEF(UDPTABLE_ENTRY_TYPE);
          if (!nnew)
              break;
-@@ -636,7 +648,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -652,7 +664,11 @@ udpTable_load(netsnmp_cache *cache, void
  #endif
  
  	udp_head   = nnew;
diff --git a/net/net-snmp/patches/patch-dt b/net/net-snmp/patches/patch-dt
deleted file mode 100644
index f6e4bc96cb6..00000000000
--- a/net/net-snmp/patches/patch-dt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-dt,v 1.1 2006/03/19 22:03:29 joerg Exp $
-
---- agent/Makefile.in.orig	2006-03-19 21:34:14.000000000 +0000
-+++ agent/Makefile.in
-@@ -136,8 +136,12 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
- 	$(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
- 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
- 
-+.if ${OPSYS} == "DragonFly"
-+MIB_SYSTEM_LIBS=	-lkinfo
-+.endif
-+
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
--	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS)
-+	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) $(MIB_SYSTEM_LIBS)
- 	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
- 
- agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)