Upgrade to 5.0.8.

Partially submitted by:	demon

9 files changed, 65 insertions, 83 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 334d495bd3a0..c095b5f9c45a 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	net-snmp
-PORTVERSION=	5.0.6
+PORTVERSION=	5.0.8
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
-		ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= net-snmp
 
 MAINTAINER=	kuriyama@FreeBSD.org
@@ -36,6 +34,8 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
+_CONFIGURE_ENV=	AUTOCONF=${LOCALBASE}/bin/autoconf213 \
+	AUTOHEADER=${LOCALBASE}/bin/autoheader213
 
 DEFAULT_SNMP_VERSION?=	3
 NET_SNMP_SYS_CONTACT?=	nobody@no.where
@@ -44,7 +44,7 @@ NET_SNMP_LOGFILE?=	/var/log/snmpd.log
 NET_SNMP_PERSISTENTDIR?=/var/net-snmp
 
 MAN1=		mib2c.1 \
-		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 snmpd.1 \
+		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
 		snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
 		snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1
@@ -52,9 +52,10 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
 		netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \
 		netsnmp_example_scalar_int.3 netsnmp_handler.3 \
-		netsnmp_instance.3 netsnmp_mib_handler_methods.3 \
-		netsnmp_multiplexer.3 netsnmp_old_api.3 netsnmp_read_only.3 \
-		netsnmp_scalar.3 \
+		netsnmp_instance.3 netsnmp_library.3 \
+		netsnmp_mib_handler_methods.3 netsnmp_mib_utilities.3 \
+		netsnmp_mode_end_call.3 netsnmp_multiplexer.3 \
+		netsnmp_old_api.3 netsnmp_read_only.3 netsnmp_scalar.3 \
 		netsnmp_serialize.3 netsnmp_table.3 netsnmp_table_array.3 \
 		netsnmp_table_data.3 netsnmp_table_dataset.3 \
 		netsnmp_table_iterator.3 netsnmp_todo.3 netsnmp_watcher.3 \
@@ -74,7 +75,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		snmp_timeout.3 snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
-MAN8=		snmptrapd.8
+MAN8=		snmpd.8 snmptrapd.8
 BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
 SBIN=		snmpd snmptrapd
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 1cc50ef8dc15..28a49985a98c 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (net-snmp-5.0.6.tar.gz) = 8c67aae0d7d8fa00625361cece1a2138
+MD5 (net-snmp-5.0.8.tar.gz) = 9fa8555c1a9d68008b3b0df52721ee82
diff --git a/net/net-snmp/files/patch-Makefile.top b/net/net-snmp/files/patch-Makefile.top
index 0645bba3426a..33bed26b787a 100644
--- a/net/net-snmp/files/patch-Makefile.top
+++ b/net/net-snmp/files/patch-Makefile.top
@@ -1,17 +1,6 @@
---- Makefile.top.orig	Sun Oct  6 06:09:32 2002
-+++ Makefile.top	Sun Oct  6 18:09:19 2002
-@@ -37,8 +37,8 @@
- LN_S		= @LN_S@
- #AUTOCONF	= @AUTOCONF@
- #AUTOHEADER	= @AUTOHEADER@
--AUTOCONF	= autoconf
--AUTOHEADER	= autoheader
-+AUTOCONF	= autoconf213
-+AUTOHEADER	= autoheader213
- 
- #
- # Compiler arguments
-@@ -60,7 +60,7 @@
+--- Makefile.top.orig	Thu Mar  6 05:08:26 2003
++++ Makefile.top	Sat Mar 29 21:54:50 2003
+@@ -59,7 +59,7 @@
  # generally, LIBCURRENT should stay the same unless major changes occur.
  # Increment REVISION every release.  
  # Increment AGE if new stuff is available.
diff --git a/net/net-snmp/files/patch-disk.c b/net/net-snmp/files/patch-disk.c
deleted file mode 100644
index ee6603a94e2a..000000000000
--- a/net/net-snmp/files/patch-disk.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- agent/mibgroup/ucd-snmp/disk.c.orig	Mon Jul  8 11:37:20 2002
-+++ agent/mibgroup/ucd-snmp/disk.c	Thu Aug 29 11:08:39 2002
-@@ -366,7 +366,7 @@
-     double          totalblks, free, used, avail, availblks;
- #else
-     static long     avail;
--#ifdef STRUCT_STATVFS_HAS_F_FILES
-+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
-     int             percent_inode;
- #endif
- #endif
-@@ -454,6 +454,11 @@
-                (double) (vfs.f_files -
-                          (vfs.f_ffree - vfs.f_favail)) * 100.0 + 0.5);
- #endif
-+#if defined(HAVE_UFS_FFS_FS_H) && !defined(STRUCT_STATVFS_HAS_F_FILES)
-+    percent_inode = vfs.f_files == 0 ? 100.0 :
-+         (int) ((double) (vfs.f_files - vfs.f_ffree) /
-+		(double) (vfs.f_files) * 100.0 + 0.5);
-+#endif
-     switch (vp->magic) {
-     case DISKTOTAL:
-         long_ret = vfs.f_blocks * (vfs.f_bsize / 1024);
-@@ -475,7 +480,7 @@
-     case DISKPERCENT:
-         long_ret = percent;
-         return ((u_char *) (&long_ret));
--#ifdef STRUCT_STATVFS_HAS_F_FILES
-+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
-     case DISKPERCENTNODE:
-         long_ret = percent_inode;
-         return ((u_char *) (&long_ret));
diff --git a/net/net-snmp/files/patch-diskio.c b/net/net-snmp/files/patch-diskio.c
index bbb0da6192ee..609168f22e9c 100644
--- a/net/net-snmp/files/patch-diskio.c
+++ b/net/net-snmp/files/patch-diskio.c
@@ -1,5 +1,5 @@
---- agent/mibgroup/ucd-snmp/diskio.c.orig	Mon May 20 03:38:58 2002
-+++ agent/mibgroup/ucd-snmp/diskio.c	Thu Feb 20 07:53:08 2003
+--- agent/mibgroup/ucd-snmp/diskio.c.orig	Thu Mar  6 07:55:01 2003
++++ agent/mibgroup/ucd-snmp/diskio.c	Sat Mar 29 22:41:29 2003
 @@ -49,7 +49,12 @@
  #endif                          /* bsdi */
  
@@ -13,3 +13,44 @@
  #include <devstat.h>
  #endif                          /* freebsd */
  
+@@ -380,7 +385,11 @@
+     }
+     memset(stat->dinfo, 0, sizeof(struct devinfo));
+ 
++#if defined(freebsd5) && (__FreeBSD_version >= 500107)
++    if ((devstat_getdevs(NULL, stat)) == -1) {
++#else
+     if ((getdevs(stat)) == -1) {
++#endif
+         fprintf(stderr, "Can't get devices:%s\n", devstat_errbuf);
+         return 1;
+     }
+@@ -429,6 +438,20 @@
+     case DISKIO_DEVICE:
+         *var_len = strlen(stat->dinfo->devices[indx].device_name);
+         return (u_char *) stat->dinfo->devices[indx].device_name;
++#if defined(freebsd5) && (__FreeBSD_version >= 500107)
++    case DISKIO_NREAD:
++        long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ];
++        return (u_char *) & long_ret;
++    case DISKIO_NWRITTEN:
++        long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE];
++        return (u_char *) & long_ret;
++    case DISKIO_READS:
++        long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ];
++        return (u_char *) & long_ret;
++    case DISKIO_WRITES:
++        long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE];
++        return (u_char *) & long_ret;
++#else
+     case DISKIO_NREAD:
+         long_ret = (signed long) stat->dinfo->devices[indx].bytes_read;
+         return (u_char *) & long_ret;
+@@ -441,6 +464,7 @@
+     case DISKIO_WRITES:
+         long_ret = (signed long) stat->dinfo->devices[indx].num_writes;
+         return (u_char *) & long_ret;
++#endif
+ 
+     default:
+         ERROR_MSG("diskio.c: don't know how to handle this request.");
diff --git a/net/net-snmp/files/patch-hr_disk.c b/net/net-snmp/files/patch-hr_disk.c
deleted file mode 100644
index 4afa759aafa6..000000000000
--- a/net/net-snmp/files/patch-hr_disk.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/mibgroup/host/hr_disk.c.orig	Sat Apr 20 16:30:03 2002
-+++ agent/mibgroup/host/hr_disk.c	Wed Apr 24 01:33:15 2002
-@@ -185,6 +185,9 @@
-                       "/dev/rdsk/c%dt%dd0s0", 0, 7);
-     Add_HR_Disk_entry("/dev/rdsk/c%dd%ds%d", 0, 1, 0, 15,
-                       "/dev/rdsk/c%dd%ds0", 0, 7);
-+#elif defined(__FreeBSD__) && __FreeBSD__ >= 4
-+    Add_HR_Disk_entry("/dev/ad%ds%d%c", 0, 1, 1, 4, "/dev/ad%ds%d", 'a', 'h');
-+    Add_HR_Disk_entry("/dev/da%ds%d%c", 0, 1, 1, 4, "/dev/da%ds%d", 'a', 'h');
- #elif defined(freebsd3)
-     Add_HR_Disk_entry("/dev/wd%ds%d%c", 0, 1, 1, 4, "/dev/wd%ds%d", 'a',
-                       'h');
diff --git a/net/net-snmp/files/patch-snmp_agent.c b/net/net-snmp/files/patch-snmp_agent.c
deleted file mode 100644
index 4d0442f4d8be..000000000000
--- a/net/net-snmp/files/patch-snmp_agent.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- agent/snmp_agent.c.orig	Sun Oct  6 05:41:58 2002
-+++ agent/snmp_agent.c	Sun Oct  6 18:19:12 2002
-@@ -71,6 +71,7 @@
- 
- #ifdef USE_LIBWRAP
- #include <tcpd.h>
-+#include <syslog.h>
- int             allow_severity = LOG_INFO;
- int             deny_severity = LOG_WARNING;
- #endif
diff --git a/net/net-snmp/files/patch-snmpd.1.def b/net/net-snmp/files/patch-snmpd.8.def
index 6c3db6228f1e..ac853823ca25 100644
--- a/net/net-snmp/files/patch-snmpd.1.def
+++ b/net/net-snmp/files/patch-snmpd.8.def
@@ -1,6 +1,6 @@
---- man/snmpd.1.def.orig	Tue May  7 06:28:37 2002
-+++ man/snmpd.1.def	Thu Jul 25 18:49:40 2002
-@@ -205,6 +205,10 @@
+--- 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 @@
  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.
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
index b8492066e08d..0102f30cfcc3 100644
--- a/net/net-snmp/pkg-plist
+++ b/net/net-snmp/pkg-plist
@@ -38,6 +38,7 @@ include/net-snmp/agent/ds_agent.h
 include/net-snmp/agent/instance.h
 include/net-snmp/agent/mib_module_config.h
 include/net-snmp/agent/mib_module_includes.h
+include/net-snmp/agent/mode_end_call.h
 include/net-snmp/agent/multiplexer.h
 include/net-snmp/agent/net-snmp-agent-includes.h
 include/net-snmp/agent/null.h
@@ -138,6 +139,7 @@ include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.6.h
 include/net-snmp/system/solaris2.7.h
 include/net-snmp/system/solaris2.8.h
+include/net-snmp/system/solaris2.9.h
 include/net-snmp/system/sunos.h
 include/net-snmp/system/svr5.h
 include/net-snmp/system/sysv.h
@@ -170,8 +172,10 @@ share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
+share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
 share/snmp/mib2c.old-api.conf
+share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
 share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
 share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
@@ -195,6 +199,7 @@ share/snmp/mibs/IPV6-UDP-MIB.txt
 share/snmp/mibs/NET-SNMP-AGENT-MIB.txt
 share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
 share/snmp/mibs/NET-SNMP-MIB.txt
+share/snmp/mibs/NET-SNMP-TC.txt
 share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
 share/snmp/mibs/RFC-1215.txt
 share/snmp/mibs/RFC1155-SMI.txt