8 files changed, 43 insertions, 65 deletions

diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 58b18a063cdd..f0cb6cf85ba3 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snmp
-PORTVERSION=	5.1
-PORTREVISION=	4
+PORTVERSION=	5.1.1
 PKGNAMEPREFIX=	net-
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -146,7 +145,7 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		netsnmp_Container_iterator.3 netsnmp_baby_steps.3 \
 		netsnmp_cache_handler.3 netsnmp_container.3 \
 		netsnmp_deprecated.3 netsnmp_iterator_info_s.3 \
-		netsnmp_leaf.3 netsnmp_mfd_pdu_context_s.3 \
+		netsnmp_leaf.3 \
 		netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \
 		netsnmp_stash_cache.3 netsnmp_utilities.3
 
diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo
index 9b471b596c0b..f584b2ca28e6 100644
--- a/net-mgmt/net-snmp53/distinfo
+++ b/net-mgmt/net-snmp53/distinfo
@@ -1,2 +1,2 @@
-MD5 (net-snmp-5.1.tar.gz) = 14217471edb2b805b0e28c4c3cfd8c75
-SIZE (net-snmp-5.1.tar.gz) = 2909299
+MD5 (net-snmp-5.1.1.tar.gz) = 68f6c946387718e4f300cbb8b6c4bd43
+SIZE (net-snmp-5.1.1.tar.gz) = 2977122
diff --git a/net-mgmt/net-snmp53/files/patch-Makefile.in b/net-mgmt/net-snmp53/files/patch-Makefile.in
index 405b874b64aa..a751bb7b7223 100644
--- a/net-mgmt/net-snmp53/files/patch-Makefile.in
+++ b/net-mgmt/net-snmp53/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Oct 22 22:13:07 2003
-+++ Makefile.in	Fri Nov 14 12:59:36 2003
+--- Makefile.in.orig	Thu Feb 19 05:35:25 2004
++++ Makefile.in	Wed Mar 24 08:25:27 2004
 @@ -15,7 +15,7 @@
  INSTALLHEADERS=version.h
  INCLUDESUBDIR=system
  INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h darwin.h \
 -	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \
 +	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd.h generic.h hpux.h \
- 	irix.h linux.h mips.h netbsd.h openbsd.h osf5.h solaris2.6.h solaris2.7.h \
- 	solaris2.8.h solaris2.9.h solaris.h sunos.h svr5.h sysv.h ultrix4.h
- INCLUDESUBDIR2=machine
+ 	irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
+ 	solaris2.6.h solaris2.7.h solaris2.8.h solaris2.9.h solaris.h \
+ 	sunos.h svr5.h sysv.h ultrix4.h
diff --git a/net-mgmt/net-snmp53/files/patch-file.c b/net-mgmt/net-snmp53/files/patch-file.c
deleted file mode 100644
index 94eab370a857..000000000000
--- a/net-mgmt/net-snmp53/files/patch-file.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- agent/mibgroup/ucd-snmp/file.c.orig	Thu Dec 25 23:57:14 2003
-+++ agent/mibgroup/ucd-snmp/file.c	Thu Dec 25 23:57:37 2003
-@@ -91,17 +91,19 @@
- file_parse_config(const char *token, char *cptr)
- {
-     char space;
-+    int items;
- 	
-     if (fileCount < MAXFILE) {
-         fileTable[fileCount].max = -1;
- 
--        sscanf(cptr, "%255s%c%d",
-+	memset(fileTable[fileCount].name, 0, sizeof(fileTable[0].name));
-+        items = sscanf(cptr, "%255s%c%d",
-                fileTable[fileCount].name, &space, &fileTable[fileCount].max);
- 	/*
- 	 * Log an error then return if the string scanned in was larger then
- 	 * it should have been.
- 	 */
--	if (space != ' ') {
-+	if (items != 1 && space != ' ') {
- 		snmp_log(LOG_ERR, "file_parse_config: file name scanned " \
- 		    "in from line %s is too large.  fileCount = %d\n", cptr,
- 		    fileCount);
diff --git a/net-mgmt/net-snmp53/files/patch-freebsd.h b/net-mgmt/net-snmp53/files/patch-freebsd.h
new file mode 100644
index 000000000000..c445b0abeb58
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-freebsd.h
@@ -0,0 +1,11 @@
+--- include/net-snmp/system/freebsd.h.orig	Sat Apr  3 14:56:45 2004
++++ include/net-snmp/system/freebsd.h	Sat Apr  3 14:56:59 2004
+@@ -6,7 +6,7 @@
+  * udp_inpcb list symbol 
+  */
+ #undef INP_NEXT_SYMBOL
+-#define INP_NEXT_SYMBOL inp_next
++#define INP_NEXT_SYMBOL inp_list.le_next
+ 
+ #undef TCP_TTL_SYMBOL
+ #define TCP_TTL_SYMBOL "ip_defttl"
diff --git a/net-mgmt/net-snmp53/files/patch-hr_system.c b/net-mgmt/net-snmp53/files/patch-hr_system.c
index a0271bdaf052..f2d810ac0771 100644
--- a/net-mgmt/net-snmp53/files/patch-hr_system.c
+++ b/net-mgmt/net-snmp53/files/patch-hr_system.c
@@ -1,21 +1,11 @@
---- agent/mibgroup/host/hr_system.c.orig	Sat Mar  1 05:35:13 2003
-+++ agent/mibgroup/host/hr_system.c	Sun Feb  8 17:39:50 2004
-@@ -280,7 +280,6 @@
-     while ((utmp_p = getutent()) != NULL) {
+--- agent/mibgroup/host/hr_system.c.orig	Mon Feb 23 02:29:34 2004
++++ agent/mibgroup/host/hr_system.c	Sat Apr  3 00:00:24 2004
+@@ -596,6 +596,8 @@
  #ifndef UTMP_HAS_NO_TYPE
-         if (utmp_p->ut_type == USER_PROCESS) {
--#endif
-             /* This block of code fixes zombie user PIDs in the
-                utmp/utmpx file that would otherwise be counted as a
-                current user */
-@@ -291,6 +290,10 @@
-             }
-             ++total;
-         }
+         if (utmp_p->ut_type != USER_PROCESS)
+             continue;
 +#else
 +	if (*utmp_p->ut_name != '~')
-+            ++total;
-+#endif
-     }
-     endutent();
-     return total;
+ #endif
+ #ifndef UTMP_HAS_NO_PID
+             /* This block of code fixes zombie user PIDs in the
diff --git a/net-mgmt/net-snmp53/files/patch-local:snmpconf b/net-mgmt/net-snmp53/files/patch-local:snmpconf
index 3b9d20968d1d..ae537cfcddd8 100644
--- a/net-mgmt/net-snmp53/files/patch-local:snmpconf
+++ b/net-mgmt/net-snmp53/files/patch-local:snmpconf
@@ -1,12 +1,12 @@
---- local/snmpconf.orig	Thu May 29 05:30:19 2003
-+++ local/snmpconf	Thu May 29 05:34:45 2003
+--- local/snmpconf.orig	Wed Feb 11 01:33:42 2004
++++ local/snmpconf	Fri Apr  2 23:42:35 2004
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!%%PERL%% -w
  
  #
  # A simple configuration file builder based on questions listed in
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  %arrayitems=qw(question 1 validanswer 1);
  
  #defaults
@@ -15,7 +15,7 @@
  
  # read the argument string
  getopts("qadhfc:piI:r:R:g:G", \%opts);
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
      print "$0 [options] [FILETOCREATE...]\n";
      print "options:\n";
      print "  -f           overwrite existing files without prompting\n";
@@ -24,7 +24,7 @@
      print "  -p           install created files into $ENV{HOME}/.snmp.\n";
      print "  -I DIR       install created files into DIR.\n";
      print "  -a           Don't ask any questions, just read in current\n";
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
  #
  # Find existing files to possibly read in.
  #
@@ -33,16 +33,16 @@
  push @searchpath, $opts{I} if ($opts{I});
  foreach my $i (@searchpath) {
      debug("searching $i\n");
-@@ -159,7 +159,7 @@
+@@ -160,7 +160,7 @@
  foreach my $i (@didfiles) {
      if ($didfile{$i} ne "1") {
  	if ($opts{'i'} || $opts{'I'}) {
--	    $opts{'I'} = "/usr/local/share/snmp" if (!$opts{'I'});
-+	    $opts{'I'} = "%%PREFIX%%/share/snmp" if (!$opts{'I'});
- 	    system("mv $opts{'I'}/$i $opts{'I'}/$i.bak") if (-f "$opts{'I'}/$i");
- 	    system("mv $didfile{$i} $opts{'I'}");
- 	    Print("  $didfile{$i} installed in $opts{'I'}\n");
-@@ -180,7 +180,7 @@
+-	  $opts{'I'} = "/usr/local/share/snmp" if (!$opts{'I'});
++	  $opts{'I'} = "%%PREFIX%%/share/snmp" if (!$opts{'I'});
+ 	  
+ 	  move ("$opts{'I'}/$i", "$opts{'I'}/$i.bak") if (-f "$opts{'I'}/$i");
+ 	  if (move ("$didfile{$i}", "$opts{'I'}")) {
+@@ -198,7 +198,7 @@
  }
  
  if (!$opts{'p'} && !$opts{'i'} && !$opts{'I'}) {
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index eb1047b018cd..e8362e4a8f8a 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -61,7 +61,6 @@ include/net-snmp/agent/table_array.h
 include/net-snmp/agent/table_data.h
 include/net-snmp/agent/table_dataset.h
 include/net-snmp/agent/table_iterator.h
-include/net-snmp/agent/table_mfd.h
 include/net-snmp/agent/var_struct.h
 include/net-snmp/agent/watcher.h
 include/net-snmp/config_api.h
@@ -118,6 +117,7 @@ include/net-snmp/library/tools.h
 include/net-snmp/library/transform_oids.h
 include/net-snmp/library/ucd_compat.h
 include/net-snmp/library/vacm.h
+include/net-snmp/library/winpipe.h
 include/net-snmp/library/winservice.h
 include/net-snmp/machine/generic.h
 include/net-snmp/mib_api.h
@@ -144,6 +144,7 @@ include/net-snmp/system/generic.h
 include/net-snmp/system/hpux.h
 include/net-snmp/system/irix.h
 include/net-snmp/system/linux.h
+include/net-snmp/system/mingw32.h
 include/net-snmp/system/mips.h
 include/net-snmp/system/netbsd.h
 include/net-snmp/system/openbsd.h
@@ -231,6 +232,7 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c.int_watch.conf
 %%DATADIR%%/mib2c.iterate.conf
 %%DATADIR%%/mib2c.iterate_access.conf
+%%DATADIR%%/mib2c.notify.conf
 %%DATADIR%%/mib2c.old-api.conf
 %%DATADIR%%/mib2c.scalar.conf
 %%DATADIR%%/mibs/AGENTX-MIB.txt