- Update to 5.7.1

PR:		ports/162847
Submitted by:	me
Approved by:	maintainer (implicit)
Feature safe:	yes

12 files changed, 21 insertions, 261 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 2a285fe0ea14..87da20f3d8ee 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snmp
-PORTVERSION=	5.7
-PORTREVISION=	5
+PORTVERSION=	5.7.1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index 2f256ee4cf55..39aa1860c6e3 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (net-snmp-5.7.tar.gz) = 700205b76e16ce87734978520d4b2d05142abdfeaf3c268a030a63c768e73c55
-SIZE (net-snmp-5.7.tar.gz) = 6039854
+SHA256 (net-snmp-5.7.1.tar.gz) = 7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f
+SIZE (net-snmp-5.7.1.tar.gz) = 6110619
diff --git a/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in b/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
index e9706499a3d2..75741c7aa1fe 100644
--- a/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
+++ b/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
@@ -1,5 +1,5 @@
---- local/Makefile.in.orig	2011-07-27 08:56:11.000000000 -0300
-+++ local/Makefile.in	2011-07-27 08:56:22.000000000 -0300
+--- ./local/Makefile.in.orig	2011-11-24 11:55:41.000000000 -0500
++++ ./local/Makefile.in	2011-11-24 11:55:48.000000000 -0500
 @@ -16,7 +16,7 @@
  #
  SNMPCONFPATH=@SNMPCONFPATH@
diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in
deleted file mode 100644
index 3d626982aa9f..000000000000
--- a/net-mgmt/net-snmp/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-07-01 19:35:46.000000000 -0300
-+++ Makefile.in	2011-07-27 09:02:01.000000000 -0300
-@@ -19,7 +19,7 @@
- INCLUDESUBDIR=system
- INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
- 	darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \
--	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd.h \
-+	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h freebsd7.h freebsd8.h freebsd9.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 \
diff --git a/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c b/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c
index 8850d5eadc14..97fe092541a5 100644
--- a/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c
+++ b/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c
@@ -1,6 +1,6 @@
---- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig	2011-07-02 00:35:46.000000000 +0200
-+++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c	2011-10-27 17:32:32.000000000 +0200
-@@ -150,13 +150,13 @@
+--- ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig	2011-11-24 12:01:07.000000000 -0500
++++ ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c	2011-11-24 12:01:20.000000000 -0500
+@@ -150,9 +150,9 @@
          if (!entry)
              continue;
  
@@ -12,14 +12,3 @@
          entry->device[sizeof(entry->device)-1] = '\0';
          entry->units = stats[i].f_bsize;    /* or f_frsize */
          entry->size  = stats[i].f_blocks;
--        entry->used  = stats[i].f_bfree;
-+        entry->used  = stats[i].f_blocks - stats[i].f_bfree;
-         entry->avail = stats[i].f_bavail;
-         entry->inums_total = stats[i].f_files;
-         entry->inums_avail = stats[i].f_ffree;
-@@ -175,4 +175,5 @@
-         }
-         netsnmp_fsys_calculate32(entry);
-     }
-+    free(stats);
- }
diff --git a/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c b/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c
deleted file mode 100644
index 1bd4bb1371d8..000000000000
--- a/net-mgmt/net-snmp/files/patch-agent-mibgroup-ucd-snmp_disk_hw.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- agent/mibgroup/ucd-snmp/disk_hw.c.orig	2011-07-02 00:35:46.000000000 +0200
-+++ agent/mibgroup/ucd-snmp/disk_hw.c	2011-10-06 19:17:46.000000000 +0200
-@@ -245,7 +245,9 @@
- 
- 
- static int _percent( int value, int total ) {
--    return (int)( value * 100 ) / total;
-+    if (!total)
-+	return 100;
-+    return (int)(( (int64_t) value * 100 ) / total);
- }
- 
- static netsnmp_fsys_info **
diff --git a/net-mgmt/net-snmp/files/patch-agent__mibgroup__mibII__tcp.c b/net-mgmt/net-snmp/files/patch-agent__mibgroup__mibII__tcp.c
deleted file mode 100644
index ccff42eeec32..000000000000
--- a/net-mgmt/net-snmp/files/patch-agent__mibgroup__mibII__tcp.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./agent/mibgroup/mibII/tcp.c.orig	2011-11-24 07:57:25.000000000 -0500
-+++ ./agent/mibgroup/mibII/tcp.c	2011-11-24 07:57:51.000000000 -0500
-@@ -92,7 +92,7 @@
- int  hz = 1000;
- #endif
- 
--#ifdef NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS
-+#ifndef NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS
- extern int TCP_Count_Connections( void );
- #endif /* NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS */
-         /*********************
-@@ -373,7 +373,7 @@
- #ifdef NETSNMP_FEATURE_CHECKING
-         netsnmp_feature_want(tcp_count_connections)
- #endif
--#ifdef NETSNMP_FEATURE_HAS_TCP_COUNT_CONNECTIONS
-+#ifndef NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS
-         ret_value = TCP_Count_Connections();
- #else /*  NETSNMP_FEATURE_HAS_TCP_COUNT_CONNECTIONS */
-         ret_value = 0;
diff --git a/net-mgmt/net-snmp/files/patch-agent__mibgroup__sctp-mib__sctpTables_freebsd.c b/net-mgmt/net-snmp/files/patch-agent__mibgroup__sctp-mib__sctpTables_freebsd.c
new file mode 100644
index 000000000000..58e44f82dd89
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-agent__mibgroup__sctp-mib__sctpTables_freebsd.c
@@ -0,0 +1,10 @@
+--- ./agent/mibgroup/sctp-mib/sctpTables_freebsd.c.orig	2011-11-30 18:30:17.000000000 -0500
++++ ./agent/mibgroup/sctp-mib/sctpTables_freebsd.c	2011-11-30 18:30:48.000000000 -0500
+@@ -192,7 +192,6 @@
+   *flags |= SCTP_TABLES_LOAD_FLAG_AUTO_LOOKUP;
+   len = 0;
+   if (sysctlbyname("net.inet.sctp.assoclist", 0, &len, 0, 0) < 0) {
+-	printf("Error %d (%s) could not get the assoclist\n", errno, strerror(errno));
+ 	return(-1);
+   }
+   if ((buf = (caddr_t)malloc(len)) == 0) {
diff --git a/net-mgmt/net-snmp/files/patch-agent_read_config.c b/net-mgmt/net-snmp/files/patch-agent_read_config.c
deleted file mode 100644
index aec3ea4eaab5..000000000000
--- a/net-mgmt/net-snmp/files/patch-agent_read_config.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./agent/agent_read_config.c.orig	2011-07-07 15:30:36.000000000 -0700
-+++ agent/agent_read_config.c	2011-07-07 15:35:57.000000000 -0700
-@@ -5,7 +5,11 @@
- #include <net-snmp/net-snmp-config.h>
- #include <net-snmp/net-snmp-features.h>
- 
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#else
- #include <sys/types.h>
-+#endif
- #if HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
diff --git a/net-mgmt/net-snmp/files/patch-parse.c b/net-mgmt/net-snmp/files/patch-parse.c
deleted file mode 100644
index 77a39dca41fe..000000000000
--- a/net-mgmt/net-snmp/files/patch-parse.c
+++ /dev/null
@@ -1,169 +0,0 @@
---- snmplib/parse.c
-+++ snmplib/parse.c
-@@ -3902,8 +3902,13 @@ read_module_internal(const char *name)
-                 return MODULE_ALREADY_LOADED;
-             }
-             if ((fp = fopen(mp->file, "r")) == NULL) {
-+                int rval;
-+                if (errno == ENOTDIR || errno == ENOENT)
-+                    rval = MODULE_NOT_FOUND;
-+                else
-+                    rval = MODULE_LOAD_FAILED;
-                 snmp_log_perror(mp->file);
--                return MODULE_LOAD_FAILED;
-+                return rval;
-             }
-             mp->no_imports = 0; /* Note that we've read the file */
-             File = mp->file;
-@@ -3917,10 +3922,7 @@ read_module_internal(const char *name)
-             File = oldFile;
-             mibLine = oldLine;
-             current_module = oldModule;
--            if (np != NULL)
--                return MODULE_LOADED_OK;
--            else if (gMibError == MODULE_SYNTAX_ERROR) 
--                return MODULE_SYNTAX_ERROR;
-+            return gMibError ? gMibError : MODULE_LOADED_OK;
-         }
- 
-     return MODULE_NOT_FOUND;
-@@ -4339,6 +4341,7 @@ parse(FILE * fp, struct node *root)
-         case END:
-             if (state != IN_MIB) {
-                 print_error("Error, END before start of MIB", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             } else {
-                 struct module  *mp;
-@@ -4403,6 +4406,7 @@ parse(FILE * fp, struct node *root)
-                 nnp = parse_macro(fp, name);
-                 if (nnp == NULL) {
-                     print_error("Bad parse of MACRO", NULL, type);
-+                    gMibError = MODULE_SYNTAX_ERROR;
-                     /*
-                      * return NULL;
-                      */
-@@ -4427,6 +4431,7 @@ parse(FILE * fp, struct node *root)
-                 type = get_token(fp, token, MAXTOKEN);
-             if (type == ENDOFFILE) {
-                 print_error("Expected \"}\"", token, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             type = get_token(fp, token, MAXTOKEN);
-@@ -4436,6 +4441,7 @@ parse(FILE * fp, struct node *root)
-         case DEFINITIONS:
-             if (state != BETWEEN_MIBS) {
-                 print_error("Error, nested MIBS", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             state = IN_MIB;
-@@ -4460,6 +4466,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_objecttype(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of OBJECT-TYPE", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4467,6 +4474,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_objectgroup(fp, name, OBJECTS, &objects);
-             if (nnp == NULL) {
-                 print_error("Bad parse of OBJECT-GROUP", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4474,6 +4482,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_objectgroup(fp, name, NOTIFICATIONS, &notifs);
-             if (nnp == NULL) {
-                 print_error("Bad parse of NOTIFICATION-GROUP", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4481,6 +4490,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_trapDefinition(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of TRAP-TYPE", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4488,6 +4498,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_notificationDefinition(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of NOTIFICATION-TYPE", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4495,6 +4506,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_compliance(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of MODULE-COMPLIANCE", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4502,6 +4514,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_capabilities(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of AGENT-CAPABILITIES", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4509,6 +4522,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_macro(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of MACRO", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 /*
-                  * return NULL;
-                  */
-@@ -4520,6 +4534,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_moduleIdentity(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of MODULE-IDENTITY", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4527,6 +4542,7 @@ parse(FILE * fp, struct node *root)
-             nnp = parse_objectgroup(fp, name, OBJECTS, &objects);
-             if (nnp == NULL) {
-                 print_error("Bad parse of OBJECT-IDENTITY", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4534,16 +4550,19 @@ parse(FILE * fp, struct node *root)
-             type = get_token(fp, token, MAXTOKEN);
-             if (type != IDENTIFIER) {
-                 print_error("Expected IDENTIFIER", token, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             type = get_token(fp, token, MAXTOKEN);
-             if (type != EQUALS) {
-                 print_error("Expected \"::=\"", token, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             nnp = parse_objectid(fp, name);
-             if (nnp == NULL) {
-                 print_error("Bad parse of OBJECT IDENTIFIER", NULL, type);
-+                gMibError = MODULE_SYNTAX_ERROR;
-                 return NULL;
-             }
-             break;
-@@ -4555,6 +4574,7 @@ parse(FILE * fp, struct node *root)
-             break;
-         default:
-             print_error("Bad operator", token, type);
-+            gMibError = MODULE_SYNTAX_ERROR;
-             return NULL;
-         }
-         if (nnp) {
diff --git a/net-mgmt/net-snmp/files/patch-snmp_vars.c b/net-mgmt/net-snmp/files/patch-snmp_vars.c
deleted file mode 100644
index 7942e52ed384..000000000000
--- a/net-mgmt/net-snmp/files/patch-snmp_vars.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./agent/snmp_vars.c.orig	2011-07-07 15:37:08.000000000 -0700
-+++ agent/snmp_vars.c	2011-07-07 15:37:14.000000000 -0700
-@@ -62,6 +62,9 @@
-  */
- 
- #include <net-snmp/net-snmp-config.h>
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #if HAVE_STRING_H
- #include <string.h>
- #endif
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 3fb0c95986b0..9d320aae2406 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -186,6 +186,8 @@ include/net-snmp/system/mingw32.h
 include/net-snmp/system/mips.h
 include/net-snmp/system/netbsd.h
 include/net-snmp/system/openbsd.h
+include/net-snmp/system/openbsd4.h
+include/net-snmp/system/openbsd5.h
 include/net-snmp/system/osf5.h
 include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.3.h
@@ -236,8 +238,6 @@ lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/NetSNMP.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/NetSNMP.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
@@ -308,6 +308,7 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c-data/generic-get-decl.m2i
 %%DATADIR%%/mib2c-data/generic-get-long.m2i
 %%DATADIR%%/mib2c-data/generic-get-oid.m2i
+%%DATADIR%%/mib2c-data/generic-get-U64.m2i
 %%DATADIR%%/mib2c-data/generic-header-bottom.m2i
 %%DATADIR%%/mib2c-data/generic-header-top.m2i
 %%DATADIR%%/mib2c-data/generic-source-includes.m2i