Upgrade to 5.0.8.

Partially submitted by:	demon

6 files changed, 49 insertions, 73 deletions

diff --git a/net-mgmt/net-snmp53/files/patch-Makefile.top b/net-mgmt/net-snmp53/files/patch-Makefile.top
index 0645bba3426a..33bed26b787a 100644
--- a/net-mgmt/net-snmp53/files/patch-Makefile.top
+++ b/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-disk.c b/net-mgmt/net-snmp53/files/patch-disk.c
deleted file mode 100644
index ee6603a94e2a..000000000000
--- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-diskio.c b/net-mgmt/net-snmp53/files/patch-diskio.c
index bbb0da6192ee..609168f22e9c 100644
--- a/net-mgmt/net-snmp53/files/patch-diskio.c
+++ b/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-hr_disk.c b/net-mgmt/net-snmp53/files/patch-hr_disk.c
deleted file mode 100644
index 4afa759aafa6..000000000000
--- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-snmp_agent.c b/net-mgmt/net-snmp53/files/patch-snmp_agent.c
deleted file mode 100644
index 4d0442f4d8be..000000000000
--- a/net-mgmt/net-snmp53/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-mgmt/net-snmp53/files/patch-snmpd.1.def b/net-mgmt/net-snmp53/files/patch-snmpd.8.def
index 6c3db6228f1e..ac853823ca25 100644
--- a/net-mgmt/net-snmp53/files/patch-snmpd.1.def
+++ b/net-mgmt/net-snmp53/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.