Changes 5.1.1:

New:
  - test suite supports testing over other transports (tcp, udp6, unix, ...)
    (see the -P switch to the testing/RUNTESTS script)
  - Solaris supports the use of it's PKCS#11 library for supporting
    cryptographic functions (OpenSSL isn't required if PKCS#11 is available)
    (see configure's --with-pkcs flag)
Fixes:
  - Improvements on 64 bit architectures.
  - A few minor memory leaks fixed.
  - An extremely large number of minor bug fixes.
  - Many perl module specific bug fixes.
  - snmpd will safely handle more signals.
Ports:
  - Many many significant Windows improvements.
    - A win32 build script in win32/build.pl
    - Support for the MinGW compiler
    - (see the README.win32 file for details on new ports)
    - Various helpful win32/*.bat files for installation, etc.
  - Some linux 2.6 support improvements

8 files changed, 49 insertions, 86 deletions

diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa
index 8437edbb09b..50b37f54575 100644
--- a/net/net-snmp/patches/patch-aa
+++ b/net/net-snmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/09/12 12:07:19 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- agent/snmp_agent.c.orig	Sat Mar 15 02:37:08 2003
+--- agent/snmp_agent.c.orig	2004-03-15 23:52:08.000000000 +0000
 +++ agent/snmp_agent.c
-@@ -74,6 +74,10 @@ SOFTWARE.
+@@ -92,6 +92,10 @@ SOFTWARE.
  #include <net-snmp/agent/net-snmp-agent-includes.h>
  #include <net-snmp/library/snmp_assert.h>
  
diff --git a/net/net-snmp/patches/patch-ab b/net/net-snmp/patches/patch-ab
index 0195e0cd8b8..811bf3b1089 100644
--- a/net/net-snmp/patches/patch-ab
+++ b/net/net-snmp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/04/14 21:48:49 danw Exp $
+$NetBSD: patch-ab,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/mibII/ipv6.c.orig	Fri May 17 12:05:12 2002
+--- agent/mibgroup/mibII/ipv6.c.orig	2004-02-02 23:33:34.000000000 +0000
 +++ agent/mibgroup/mibII/ipv6.c
 @@ -11,7 +11,7 @@
  #include <sys/types.h>
@@ -273,48 +273,3 @@ $NetBSD: patch-ab,v 1.2 2004/04/14 21:48:49 danw Exp $
          p = (caddr_t) in6pcb.in6p_next;
  #else
          xig = (struct xinpgen *) ((char *) xig + xig->xig_len);
-Index: agent/mibgroup/mibII/tcpTable.c
-===================================================================
-RCS file: /cvsroot/apps/net-snmp/agent/mibgroup/mibII/tcpTable.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- agent/mibgroup/mibII/tcpTable.c	12 Sep 2003 23:10:08 -0000	1.1.1.1
-+++ agent/mibgroup/mibII/tcpTable.c	13 Sep 2003 05:36:50 -0000	1.2
-@@ -499,6 +499,10 @@
-             snmp_log_perror("TCP_Count_Connections - inpcb");
-             break;
-         }
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
-+	if (inpcb.inp_af != AF_INET)
-+	    continue;
-+#endif
- #if !(defined(freebsd2) || defined(netbsd1) || defined(openbsd2))
-         if (inpcb.INP_PREV_SYMBOL != prev) {    /* ??? */
-             sleep(1);
-Index: agent/mibgroup/mibII/udpTable.c
-===================================================================
-RCS file: /cvsroot/apps/net-snmp/agent/mibgroup/mibII/udpTable.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- agent/mibgroup/mibII/udpTable.c	12 Sep 2003 23:10:08 -0000	1.1.1.1
-+++ agent/mibgroup/mibII/udpTable.c	13 Sep 2003 05:36:50 -0000	1.2
-@@ -178,6 +178,16 @@
-     LowState = -1;              /* UDP doesn't have 'State', but it's a useful flag */
-     UDP_Scan_Init();
-     for (;;) {
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
-+	if (inpcb.inp_af != AF_INET) {
-+	    if ((i = UDP_Scan_Next(&inpcb)) < 0)
-+		goto Again;
-+	    if (i == 0)
-+		break;              /* Done */
-+	    cp = (u_char *) & inpcb.inp_laddr.s_addr;
-+	    continue;
-+	}
-+#endif
- #ifdef hpux11
-         if ((i = UDP_Scan_Next(&udp)) == 0)
-             break;              /* Done */
-
diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac
index 534edaf0a67..eedbe43747d 100644
--- a/net/net-snmp/patches/patch-ac
+++ b/net/net-snmp/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2003/12/30 19:30:48 kim Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/14 13:30:34 adam Exp $
 
---- include/net-snmp/system/netbsd.h.orig	2002-04-20 03:30:12.000000000 -0400
-+++ include/net-snmp/system/netbsd.h	2003-12-30 14:17:00.000000000 -0500
+--- include/net-snmp/system/netbsd.h.orig	2002-04-20 07:30:12.000000000 +0000
++++ include/net-snmp/system/netbsd.h
 @@ -1,5 +1,7 @@
  #include "bsd.h"
  
diff --git a/net/net-snmp/patches/patch-ad b/net/net-snmp/patches/patch-ad
index 1e46cac5eb4..243410bd723 100644
--- a/net/net-snmp/patches/patch-ad
+++ b/net/net-snmp/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/02/25 21:50:40 christos Exp $
+$NetBSD: patch-ad,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/ucd_snmp.h.orig	2004-02-25 16:25:12.000000000 -0500
-+++ agent/mibgroup/ucd_snmp.h	2004-02-25 15:36:25.000000000 -0500
-@@ -36,6 +36,10 @@
+--- agent/mibgroup/ucd_snmp.h.orig	2003-06-09 22:11:51.000000000 +0000
++++ agent/mibgroup/ucd_snmp.h
+@@ -40,6 +40,10 @@ config_arch_require(freebsd5, ucd-snmp/v
  config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
  config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
  config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)
@@ -12,4 +12,4 @@ $NetBSD: patch-ad,v 1.1 2004/02/25 21:50:40 christos Exp $
 +config_arch_require(netbsdelf, ucd-snmp/memory_netbsd1)
  config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1)
  config_arch_require(openbsd2, ucd-snmp/memory_netbsd1)
- config_arch_require(openbsd3, ucd-snmp/vmstat_netbsd1)
+ config_arch_require(bsdi4, ucd-snmp/vmstat_bsdi4)
diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae
index 862bb2b2599..7195b574354 100644
--- a/net/net-snmp/patches/patch-ae
+++ b/net/net-snmp/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/04/14 21:48:49 danw Exp $
+$NetBSD: patch-ae,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- snmplib/snmpUDPIPv6Domain.c.orig	Fri Apr  9 19:14:10 2004
+--- snmplib/snmpUDPIPv6Domain.c.orig	2004-02-18 14:14:54.000000000 +0000
 +++ snmplib/snmpUDPIPv6Domain.c
-@@ -36,6 +36,10 @@
+@@ -52,6 +52,10 @@ const struct in6_addr in6addr_any = IN6A
  #include <dmalloc.h>
  #endif
  
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 1ab2777bd94..a75670d431e 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,20 +1,8 @@
-$NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
+$NetBSD: patch-af,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- configure.in.orig	Sat Sep  6 02:41:25 2003
-+++ configure.in	Thu Apr 22 11:26:53 2004
-@@ -1362,6 +1362,8 @@
-     AC_CHECK_FUNCS(AES_cfb128_encrypt)
- fi
- 
-+AC_CHECK_LIB(des, des_cbc_encrypt)
-+
- dnl Check for libraries that the agent needs
- dnl saving old libraries
- NONAGENTLIBS=$LIBS
-
---- configure.orig	Sat Sep  6 03:22:58 2003
-+++ configure	Thu Apr 22 11:26:56 2004
-@@ -8524,6 +8524,54 @@
+--- configure.orig	2004-03-20 07:13:55.000000000 +0000
++++ configure
+@@ -11205,6 +11205,53 @@ fi
  
  fi
  
@@ -27,7 +15,7 @@ $NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-ldes  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 8537 "configure"
++#line 11217 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -65,7 +53,6 @@ $NetBSD: patch-af,v 1.1 2004/04/22 16:50:02 christos Exp $
 +  echo "$ac_t""no" 1>&6
 +fi
 +
-+
+ # Check for libraries that the agent needs
+ # saving old libraries
  NONAGENTLIBS=$LIBS
- 
- _cppflags="${CPPFLAGS}"
diff --git a/net/net-snmp/patches/patch-ah b/net/net-snmp/patches/patch-ah
index 3ab558716ed..6701c236def 100644
--- a/net/net-snmp/patches/patch-ah
+++ b/net/net-snmp/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2004/04/26 17:39:00 tron Exp $
+$NetBSD: patch-ah,v 1.2 2004/05/14 13:30:34 adam Exp $
 
---- agent/mibgroup/host/hr_filesys.c.orig	2003-02-28 19:17:35.000000000 +0100
-+++ agent/mibgroup/host/hr_filesys.c	2004-04-26 19:31:03.000000000 +0200
-@@ -85,6 +85,15 @@
+--- agent/mibgroup/host/hr_filesys.c.orig	2004-01-29 13:53:59.000000000 +0000
++++ agent/mibgroup/host/hr_filesys.c
+@@ -86,6 +86,15 @@ struct mnttab  *HRFS_entry = &HRFS_entry
  #define	HRFS_type	mnt_fstype
  #define	HRFS_statfs	statvfs
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ah,v 1.1 2004/04/26 17:39:00 tron Exp $
  #elif defined(HAVE_GETFSSTAT)
  static struct statfs *fsstats = 0;
  static int      fscount;
-@@ -447,7 +456,9 @@
+@@ -452,7 +461,9 @@ var_hrfilesys(struct variable *vp,
          return (u_char *) fsys_type_id;
  
      case HRFSYS_ACCESS:
diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai
new file mode 100644
index 00000000000..ca9b235a122
--- /dev/null
+++ b/net/net-snmp/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2004/05/14 13:32:11 adam Exp $
+
+--- agent/mibgroup/mibII/tcpTable.c.orig	2004-03-15 23:27:45.000000000 +0000
++++ agent/mibgroup/mibII/tcpTable.c
+@@ -88,6 +88,7 @@ struct netsnmp_inpcb_s {
+     int             state;
+     netsnmp_inpcb  *inp_next;
+ };
++#define	INP_NEXT_SYMBOL		inp_next
+ #define	TCPTABLE_ENTRY_TYPE	netsnmp_inpcb 
+ #define	TCPTABLE_STATE		state 
+ #define	TCPTABLE_LOCALADDRESS	pcb.inp_laddr.s_addr 
+@@ -771,7 +772,7 @@ tcpTable_load(netsnmp_cache *cache, void
+             nnew->state == 8 /*  closeWait  */ )
+             tcp_estab++;
+ 
+-        entry      = nnew->inp_queue.cqe_next;	/* Next kernel entry */
++        entry      = nnew->INP_NEXT_SYMBOL;	/* Next kernel entry */
+ 	nnew->inp_next = tcp_head;
+ 	tcp_head   = nnew;
+