Chagesn 5.4.1:

snmplib:
  - [BUG 1619827]: link libraries against needed external libraries
  - [PATCH 1616912]: fix memory leak in UDP transport code
  - [PATCH 1592706]: fix memory leak when cloning varbinds
  - Change snmp_sess_add_ex to consistently close and delete the
    transport argument on failure, earlier the liveness of the
    transport argument was undecided.
snmpd:
  - [BUG 1558823]: fix ipAddressTable memory leak
  - [BUG 1596638]: fix memory leak in ipCidrRouteTable, inetCidrRouteTable
  - [BUG 1611524]: fix tcp connection table file descriptor leak
  - handle row deletion issues in dataset tables
  - [BUG 1712988]: default and configurable maximum number of
    varbinds returnable to a GETBULK request.
  - [PATCH 1666737]: include ipv6 counts in
    udpInDatagrams, udpNoPorts, udpInErrors, udpOutDatagrams
  - [PATCH 1700157]: fixes ordering of exec tokens in the resulting mib tree
  - [PATCH 1719253]: fix skipNFSInHostResources so it does not break on the
    second walk of the table.
perl:
  - link Perl modules against the exact set of libraries needed
  - [BUG 1619827]: properly link against libperl when configured with --enable-as-needed
  - [PATCH 1725049]: fix bulkwalk in cases of non-repeater
python:
  - [PATCH 1716114]: Let python build in the Net-SNMP source tree
MacOSX:
  - [PATCH 1600522]: CPU Hardware Abstraction Layer (HAL)
    implementation for mach/darwin
  - IF-MIB rewrite now enabled by default
Win32:
  - fix AES support
  - [PATCH 1706344]: fix compilation with cygwin
IRIX:
  - [PATCH 1709748]: Optimized IRIX cpu stats
AIX:
  - Fix default shared library building instead of forcing static use
FreeBSD:
  - [BUG 1633483]: Support CPU HAL on FreeBSD4.x

12 files changed, 75 insertions, 132 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 4219939155e..8f3633afd28 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2007/08/10 23:37:02 seb Exp $
+# $NetBSD: Makefile,v 1.62 2007/08/11 11:05:56 adam Exp $
 
-DISTNAME=	net-snmp-5.4
-PKGREVISION=	2
+DISTNAME=	net-snmp-5.4.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index 785c77a0f2b..2bd45250f6d 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/02/05 12:06:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/08/11 11:05:56 adam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -58,6 +58,8 @@ include/net-snmp/agent/serialize.h
 include/net-snmp/agent/set_helper.h
 include/net-snmp/agent/snmp_agent.h
 include/net-snmp/agent/snmp_vars.h
+include/net-snmp/agent/stash_cache.h
+include/net-snmp/agent/stash_to_next.h
 include/net-snmp/agent/table.h
 include/net-snmp/agent/table_array.h
 include/net-snmp/agent/table_container.h
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index ee08306836a..135b6c0ff1c 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,27 +1,25 @@
-$NetBSD: distinfo,v 1.39 2007/08/10 23:37:02 seb Exp $
+$NetBSD: distinfo,v 1.40 2007/08/11 11:05:56 adam Exp $
 
-SHA1 (net-snmp-5.4.tar.gz) = 8edb17509eba9f8c9cfb015fe35a1024048129eb
-RMD160 (net-snmp-5.4.tar.gz) = 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61
-Size (net-snmp-5.4.tar.gz) = 5031685 bytes
+SHA1 (net-snmp-5.4.1.tar.gz) = ac5ba033c10d53d3057415121f8c4936c643c208
+RMD160 (net-snmp-5.4.1.tar.gz) = 3723488dab8d164702a7d55c9c72eeaec07dd50c
+Size (net-snmp-5.4.1.tar.gz) = 5122455 bytes
 SHA1 (patch-aa) = 51b09cc020776d136861d34f9ea529a986d2426d
 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
-SHA1 (patch-ac) = a91d776fc41c2ffe813ae0a281da57647e0d1662
+SHA1 (patch-ac) = acdcde40ec53215d7778b2d0a67656b82274d006
 SHA1 (patch-ae) = 721e62bb42b6d3787f36316cf2628cd71ae6a6ce
-SHA1 (patch-af) = edf87cf96b812ab870f373c4a90ff37ef2961450
+SHA1 (patch-af) = 88d0433a6a233dc52fec10e29183d820c50bd524
 SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f
-SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
 SHA1 (patch-am) = 64461aef9b4409cd7ed4941e5d5441710a6035d8
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
 SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
-SHA1 (patch-dc) = f24a352a09bf6d9e1abb5077176ce3301ac07de7
+SHA1 (patch-dc) = a60caa72af001f5bbda173e5daa9afc6a7180a60
 SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643
-SHA1 (patch-de) = 62052d13a54d28a98e6383d705b3928c17209768
+SHA1 (patch-de) = 4028ef60b5ffa4f77f12aaa7465a502bbf30308a
 SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c
 SHA1 (patch-dh) = c9a776d6574df008adae52a2f08930e0662f70b3
 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348
-SHA1 (patch-dj) = 4c7c759e1f62edf5db1ccf06a22ccee68f3353c5
 SHA1 (patch-dk) = 1025ce87163a45175cc4733b95af7db5fa3da4ff
 SHA1 (patch-dl) = 746d937ff861294f5b858bee8cc2a99c976e1907
 SHA1 (patch-dm) = 05c182f5bc1751ea0a0bcc7e21f24684b3c4933a
@@ -31,13 +29,12 @@ SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
 SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
 SHA1 (patch-dr) = ab75e5cf3448d9c0520b6e7d2c68adfbf3ab639b
 SHA1 (patch-ds) = 4d59f016eca12660f94dcba89f94e395323ab7b4
-SHA1 (patch-dt) = a8d173926161e4fce26ee5fbf3aeee05802f2598
 SHA1 (patch-du) = a07160ee1197d8aefa3ccaf7fb255be48311e8bc
-SHA1 (patch-ea) = fb13d164075c804617fc73f4cfb51ed5fb25600c
+SHA1 (patch-ea) = 9d8d6b167b87d7e4f184b06f1279a55072a7645e
 SHA1 (patch-ee) = ec2a41ba9489bf71412169c0f8367eac214e3738
 SHA1 (patch-eg) = 421ccf1c810a2b03d7ff10fe38e8a3eea62d9836
 SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912
-SHA1 (patch-ei) = 6f792c47742a65061882705d5c4837b6f6e07cc4
+SHA1 (patch-ei) = 7eb4899b08b73c79f1eb8616bcebad38c0fbe148
 SHA1 (patch-ej) = c8047a6109bf6b833c56562d48b56b480c4299be
 SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68
 SHA1 (patch-ep) = 82071d291813078d27552e5e16e1619e3b3a1bc2
diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac
index bc8ce2dfa3c..dfef678666b 100644
--- a/net/net-snmp/patches/patch-ac
+++ b/net/net-snmp/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
+$NetBSD: patch-ac,v 1.6 2007/08/11 11:05:56 adam Exp $
 
---- configure.in.orig	2006-11-24 17:53:18.000000000 +0000
+--- configure.in.orig	2007-08-11 12:17:24.000000000 +0200
 +++ configure.in
-@@ -2670,6 +2670,8 @@ elif test "x$askedpkcs" = "xyes"; then
-     AC_CHECK_LIB(pkcs11, C_Initialize)
- fi
+@@ -2678,6 +2678,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")
  
 +AC_CHECK_LIB(des, des_cbc_encrypt)
 +
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -3347,6 +3349,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/
+@@ -3406,6 +3408,12 @@ AC_CHECK_HEADERS(netinet/ip6.h netinet6/
  #if HAVE_NETINET_IP6_H
  #include <netinet/ip6.h>
  #endif
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  ]])
  # DYNAMIC MODULE SUPPORT
  AC_CHECK_HEADERS(dlfcn.h)
-@@ -3732,7 +3740,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -3800,7 +3808,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3744,7 +3754,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -3812,7 +3822,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3780,7 +3792,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -3848,7 +3860,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3798,7 +3812,9 @@ AC_TRY_COMPILE([
+@@ -3866,7 +3880,9 @@ AC_TRY_COMPILE([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -64,7 +64,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3822,7 +3838,9 @@ AC_TRY_COMPILE([
+@@ -3890,7 +3906,9 @@ AC_TRY_COMPILE([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -74,7 +74,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3879,7 +3897,9 @@ AC_TRY_COMPILE([
+@@ -3947,7 +3965,9 @@ AC_TRY_COMPILE([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -84,7 +84,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3903,7 +3923,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -3985,7 +4005,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -94,7 +94,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3916,7 +3938,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -3998,7 +4020,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -104,7 +104,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3929,7 +3953,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -4011,7 +4035,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -114,7 +114,7 @@ $NetBSD: patch-ac,v 1.5 2007/05/20 13:55:28 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -3942,7 +3968,9 @@ AC_CHECK_STRUCT_FOR([
+@@ -4024,7 +4050,9 @@ AC_CHECK_STRUCT_FOR([
  #endif
  #include <sys/types.h>
  #define KERNEL
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 1c032ac875e..1e920cad321 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,18 +1,11 @@
-$NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
+$NetBSD: patch-af,v 1.11 2007/08/11 11:05:56 adam Exp $
 
---- configure.orig	2006-11-24 17:56:15.000000000 +0000
+--- configure.orig	2007-08-11 12:20:35.000000000 +0200
 +++ configure
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 5.295 .
-+# From configure.in Revision: 5.296 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for Net-SNMP 5.4.
- #
-@@ -27031,6 +27031,81 @@ fi
- 
+@@ -27463,6 +27463,81 @@ _ACEOF
  fi
  
+ 
 +
 +echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5
 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6
@@ -91,7 +84,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -35037,6 +35112,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -36453,6 +36528,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  #if HAVE_NETINET_IP6_H
  #include <netinet/ip6.h>
  #endif
@@ -104,7 +97,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  
  
  #include <$ac_header>
-@@ -40752,7 +40833,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42273,7 +42354,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -114,7 +107,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -40850,7 +40933,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42371,7 +42454,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -124,7 +117,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41144,7 +41229,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42665,7 +42750,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -134,7 +127,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41231,7 +41318,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42752,7 +42839,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -144,7 +137,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41298,7 +41387,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42819,7 +42908,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -154,7 +147,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41436,7 +41527,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -42957,7 +43048,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -164,7 +157,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41531,7 +41624,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -43188,7 +43281,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -174,7 +167,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41630,7 +41725,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -43287,7 +43382,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -184,7 +177,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41729,7 +41826,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -43386,7 +43483,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -194,7 +187,7 @@ $NetBSD: patch-af,v 1.10 2007/05/20 13:55:29 seb Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -41828,7 +41927,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -43485,7 +43584,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
diff --git a/net/net-snmp/patches/patch-aj b/net/net-snmp/patches/patch-aj
deleted file mode 100644
index b03d14f203c..00000000000
--- a/net/net-snmp/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/01/24 22:16:55 adam Exp $
-
---- net-snmp-config.in.orig	2005-11-15 17:37:58.000000000 +0100
-+++ net-snmp-config.in
-@@ -34,7 +34,7 @@ libdir=@libdir@
- NSC_LDFLAGS="@LDFLAGS@"
- NSC_INCLUDEDIR=${includedir}
- NSC_LIBDIR=-L${libdir}
--NSC_LIBS="@LIBS@ @WRAPLIBS@"
-+NSC_LIBS="@LIBS@"
- NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@ @PERLLDOPTS@"
- NSC_PREFIX=$prefix
- NSC_EXEC_PREFIX=$exec_prefix
diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc
index 938a52eecde..72a84837ba8 100644
--- a/net/net-snmp/patches/patch-dc
+++ b/net/net-snmp/patches/patch-dc
@@ -1,8 +1,8 @@
-$NetBSD: patch-dc,v 1.3 2007/02/05 12:06:16 adam Exp $
+$NetBSD: patch-dc,v 1.4 2007/08/11 11:05:57 adam Exp $
 
---- include/net-snmp/net-snmp-config.h.in.orig	2006-10-12 11:54:57.000000000 +0200
+--- 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
-@@ -1418,6 +1418,7 @@
+@@ -1460,6 +1460,7 @@
  #define NETSNMP_HPUX11ID 14
  #define NETSNMP_AIXID 15
  #define NETSNMP_MACOSXID 16
@@ -10,7 +10,7 @@ $NetBSD: patch-dc,v 1.3 2007/02/05 12:06:16 adam Exp $
  #define NETSNMP_UNKNOWNID 255
  
  #ifdef hpux9
-@@ -1447,6 +1448,9 @@
+@@ -1489,6 +1490,9 @@
  #if defined(__FreeBSD__)
  #define NETSNMP_OSTYPE NETSNMP_FREEBSDID
  #endif
diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de
index e1e8cea928b..4220bd8944f 100644
--- a/net/net-snmp/patches/patch-de
+++ b/net/net-snmp/patches/patch-de
@@ -1,6 +1,6 @@
-$NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
+$NetBSD: patch-de,v 1.4 2007/08/11 11:05:57 adam Exp $
 
---- agent/mibgroup/mibII/ipv6.c.orig	2006-11-06 23:43:27.000000000 +0000
+--- agent/mibgroup/mibII/ipv6.c.orig	2007-05-25 00:01:04.000000000 +0200
 +++ agent/mibgroup/mibII/ipv6.c
 @@ -11,7 +11,7 @@
  #include <sys/types.h>
@@ -38,16 +38,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
              ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -823,7 +823,7 @@ var_ifv6Entry(register struct variable *
-                     DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup failed\n"));
-                     break;
-                 }
--                if (!NETSNMP_KLOOKUP(ifaddr.ifa_addr, (char *) &sdl, sizeof(sdl));
-+                if (!NETSNMP_KLOOKUP(ifaddr.ifa_addr, (char *) &sdl, sizeof(sdl))) {
-                     DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup failed\n"));
-                     break;
-                 }
-@@ -835,7 +835,7 @@ var_ifv6Entry(register struct variable *
+@@ -836,7 +836,7 @@ var_ifv6Entry(register struct variable *
                      *var_len = sdl.sdl_alen;
                      return (u_char *) (sdl.sdl_data + sdl.sdl_nlen);
                  }
@@ -56,7 +47,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
                  ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -1238,7 +1238,11 @@ var_udp6(register struct variable * vp,
+@@ -1239,7 +1239,11 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable udbtable;
      caddr_t	    first;
@@ -69,7 +60,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1253,10 +1257,31 @@ var_udp6(register struct variable * vp,
+@@ -1254,10 +1258,31 @@ var_udp6(register struct variable * vp,
      if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
          return NULL;
      first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
@@ -102,7 +93,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
  #else
      {
          const char     *udblist = "net.inet.udp.pcblist";
-@@ -1284,15 +1309,17 @@ var_udp6(register struct variable * vp,
+@@ -1285,15 +1310,17 @@ var_udp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -122,7 +113,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n",
                          p));
-@@ -1305,7 +1332,7 @@ var_udp6(register struct variable * vp,
+@@ -1306,7 +1333,7 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -131,7 +122,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1348,13 +1375,15 @@ var_udp6(register struct variable * vp,
+@@ -1349,13 +1376,15 @@ var_udp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -149,7 +140,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1413,7 +1442,7 @@ var_tcp6(register struct variable * vp,
+@@ -1414,7 +1443,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -158,7 +149,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1443,7 +1472,7 @@ var_tcp6(register struct variable * vp,
+@@ -1444,7 +1473,7 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -167,7 +158,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6)))
          return NULL;
      p = (caddr_t) tcb6.in6p_next;
-@@ -1474,7 +1503,7 @@ var_tcp6(register struct variable * vp,
+@@ -1475,7 +1504,7 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -176,7 +167,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
                p && (u_long) p != auto_nlist_value("tcb6")
  #else
                xig->xig_len > sizeof(struct xinpgen)
-@@ -1482,7 +1511,7 @@ var_tcp6(register struct variable * vp,
+@@ -1483,7 +1512,7 @@ var_tcp6(register struct variable * vp,
          ) {
          DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
  
@@ -185,7 +176,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n",
                          p));
-@@ -1495,7 +1524,7 @@ var_tcp6(register struct variable * vp,
+@@ -1496,7 +1525,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -194,7 +185,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1552,13 +1581,13 @@ var_tcp6(register struct variable * vp,
+@@ -1553,13 +1582,13 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -210,7 +201,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1650,7 +1679,11 @@ var_tcp6(register struct variable * vp,
+@@ -1651,7 +1680,11 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -223,7 +214,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1665,10 +1698,31 @@ var_tcp6(register struct variable * vp,
+@@ -1666,10 +1699,31 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -256,7 +247,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
  #else
      {
          const char     *tcblist = "net.inet.tcp.pcblist";
-@@ -1685,7 +1739,8 @@ var_tcp6(register struct variable * vp,
+@@ -1686,7 +1740,8 @@ var_tcp6(register struct variable * vp,
              return NULL;
          }
          oxig = (struct xinpgen *) sysctl_buf;
@@ -266,7 +257,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          p = (caddr_t) ((char *) xig); /* silence compiler warning */
      }
  #endif
-@@ -1696,28 +1751,32 @@ var_tcp6(register struct variable * vp,
+@@ -1697,28 +1752,32 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p && p != first
@@ -302,7 +293,7 @@ $NetBSD: patch-de,v 1.3 2007/02/05 19:18:37 joerg Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1773,13 +1832,15 @@ var_tcp6(register struct variable * vp,
+@@ -1774,13 +1833,15 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
diff --git a/net/net-snmp/patches/patch-dj b/net/net-snmp/patches/patch-dj
deleted file mode 100644
index 5ef12b290d8..00000000000
--- a/net/net-snmp/patches/patch-dj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dj,v 1.2 2007/02/05 12:06:16 adam Exp $
-
---- Makefile.in.orig	2006-11-07 15:54:25.000000000 +0100
-+++ Makefile.in
-@@ -20,7 +20,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.
- 	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 \
--	solaris.h sunos.h svr5.h sysv.h ultrix4.h
-+	solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
- INCLUDESUBDIR2=machine
- INCLUDESUBDIRHEADERS2=generic.h
- INSTALLBUILTHEADERS=include/net-snmp/net-snmp-config.h
diff --git a/net/net-snmp/patches/patch-dt b/net/net-snmp/patches/patch-dt
deleted file mode 100644
index cf3b85d2ee7..00000000000
--- a/net/net-snmp/patches/patch-dt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dt,v 1.5 2007/02/05 12:06:16 adam Exp $
-
---- agent/Makefile.in.orig	2006-11-07 15:54:25.000000000 +0100
-+++ agent/Makefile.in
-@@ -141,7 +141,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
- 	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
- 
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
--	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@
-+	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@ $(MIB_SYSTEM_LIBS)
- 	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
- 
- agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
diff --git a/net/net-snmp/patches/patch-ea b/net/net-snmp/patches/patch-ea
index 026589f251d..2c6d0f3ed1e 100644
--- a/net/net-snmp/patches/patch-ea
+++ b/net/net-snmp/patches/patch-ea
@@ -1,8 +1,8 @@
-$NetBSD: patch-ea,v 1.3 2007/02/05 12:06:16 adam Exp $
+$NetBSD: patch-ea,v 1.4 2007/08/11 11:05:57 adam Exp $
 
---- snmplib/snmp_api.c.orig	2006-10-25 18:16:24.000000000 +0200
+--- snmplib/snmp_api.c.orig	2007-07-21 16:51:54.000000000 +0200
 +++ snmplib/snmp_api.c
-@@ -6818,7 +6818,7 @@ snmp_add_var(netsnmp_pdu *pdu,
+@@ -6833,7 +6833,7 @@ snmp_add_var(netsnmp_pdu *pdu,
          }
  #endif /* NETSNMP_DISABLE_MIB_LOADING */
          atmp = inet_addr(value);
diff --git a/net/net-snmp/patches/patch-ei b/net/net-snmp/patches/patch-ei
index 7db8d673ec7..a7008276590 100644
--- a/net/net-snmp/patches/patch-ei
+++ b/net/net-snmp/patches/patch-ei
@@ -1,8 +1,8 @@
-$NetBSD: patch-ei,v 1.2 2007/02/05 12:06:16 adam Exp $
+$NetBSD: patch-ei,v 1.3 2007/08/11 11:05:57 adam Exp $
 
---- agent/mibgroup/util_funcs.c.orig	2006-10-18 04:59:10.000000000 +0200
+--- agent/mibgroup/util_funcs.c.orig	2007-01-11 23:13:56.000000000 +0100
 +++ agent/mibgroup/util_funcs.c
-@@ -237,7 +237,7 @@ get_exec_output(struct extensible *ex)
+@@ -254,7 +254,7 @@ get_exec_output(struct extensible *ex)
  #if HAVE_EXECV
      char            cachefile[STRMAX];
      char            cache[NETSNMP_MAXCACHESIZE];