Upgrade to v3.6.1 and apply some patches. But this version still has

kvm_read() problem on some RELENG_3 system.

No response from:	maintainer
PR:			ports/7330, ports/8908, ports/8909

8 files changed, 89 insertions, 31 deletions

diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 16f24935b2c0..d53646ea0792 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	ucd-snmp
-# Version required:			3.5
+# Version required:			3.6.1
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.23 1998/11/14 09:43:27 asami Exp $
+# $Id: Makefile,v 1.24 1999/04/06 19:00:36 fenner Exp $
 #
 
-DISTNAME=	ucd-snmp-3.5.3
+DISTNAME=	ucd-snmp-3.6.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -23,12 +23,14 @@ CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
+CFLAGS=		-g
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
 		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
-MAN3=		mib_api.3 snmp_api.3
-MAN5=		snmpd.conf.5 variables.5
+MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
+MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
+		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
 BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
@@ -38,7 +40,6 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 
 .include <bsd.port.pre.mk>
 
-
 .if ${PORTOBJFORMAT} == "aout"
 SHLIB_VERSION=3.5
 PATCHDIR=patches.aout
@@ -47,10 +48,13 @@ SHLIB_VERSION=3
 .endif
 MAKE_ENV+= SHLIB_VERSION=${SHLIB_VERSION}
 
+post-patch:
+	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
 	( cd ${PREFIX}/sbin && strip ${SBIN} )
-	( cd ${PREFIX}/lib && ${LN} -f libsnmp.so libsnmp.so.${SHLIB_VERSION} )
+	( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
@@ -63,3 +67,6 @@ post-install:
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
+
+CFLAGS=		-g
+
diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo
index e05322c5e4f7..d3bd2ef7d60a 100644
--- a/net-mgmt/net-snmp4/distinfo
+++ b/net-mgmt/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.5.3.tar.gz) = af2e8d7a4975d9ef207d9342391249a6
+MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
diff --git a/net-mgmt/net-snmp4/files/freebsd4.h b/net-mgmt/net-snmp4/files/freebsd4.h
new file mode 100644
index 000000000000..e0774c7e4cd6
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/freebsd4.h
@@ -0,0 +1 @@
+#include "freebsd3.h"
diff --git a/net-mgmt/net-snmp4/files/patch-aa b/net-mgmt/net-snmp4/files/patch-aa
index 26a99aa30842..ce70b47986cb 100644
--- a/net-mgmt/net-snmp4/files/patch-aa
+++ b/net-mgmt/net-snmp4/files/patch-aa
@@ -1,14 +1,13 @@
---- snmplib/Makefile.in.orig	Mon Sep  7 16:19:24 1998
-+++ snmplib/Makefile.in	Mon Oct 19 16:16:19 1998
-@@ -23,7 +23,10 @@
- all: $(TARG)
+--- snmplib/Makefile.in~	Tue Mar 16 01:49:10 1999
++++ snmplib/Makefile.in	Sat Apr  3 13:30:11 1999
+@@ -41,6 +41,10 @@
  
- libsnmp.$(SHLIB_EXTENSION):    ${OBJS}
--	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION) ${OBJS}
-+	ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION) \
+ libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${OBJS}
+ 	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
++	ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
 +		-o libsnmp.$(SHLIB_EXTENSION) ${OBJS}
 +	ln -f libsnmp.$(SHLIB_EXTENSION) \
-+		libsnmp.$(SHLIB_EXTENSION).$(SHLIB_VERSION)
- 	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)
++		libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
  
  installdirs:
diff --git a/net-mgmt/net-snmp4/files/patch-ab b/net-mgmt/net-snmp4/files/patch-ab
index d48c2330f5cc..4658da4119df 100644
--- a/net-mgmt/net-snmp4/files/patch-ab
+++ b/net-mgmt/net-snmp4/files/patch-ab
@@ -1,6 +1,6 @@
---- agent/mibgroup/ucd-snmp/disk.c.orig	Mon Mar 22 20:16:32 1999
-+++ agent/mibgroup/ucd-snmp/disk.c	Mon Mar 22 20:20:36 1999
-@@ -76,6 +76,7 @@
+--- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
++++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
+@@ -79,6 +79,7 @@
  #define statvfs statfs
  #endif
  #if HAVE_VM_SWAP_PAGER_H
@@ -8,9 +8,9 @@
  #include <vm/swap_pager.h>
  #endif
  #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/errormib.c.orig	Mon Mar 22 20:22:21 1999
-+++ agent/mibgroup/ucd-snmp/errormib.c	Mon Mar 22 20:22:38 1999
-@@ -90,6 +90,7 @@
+--- agent/mibgroup/ucd-snmp/errormib.c~	Tue Mar  2 05:27:30 1999
++++ agent/mibgroup/ucd-snmp/errormib.c	Sat Apr  3 13:33:44 1999
+@@ -93,6 +93,7 @@
  #define statvfs statfs
  #endif
  #if HAVE_VM_SWAP_PAGER_H
@@ -18,9 +18,9 @@
  #include <vm/swap_pager.h>
  #endif
  #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/extensible.c.orig	Mon Mar 22 20:21:49 1999
-+++ agent/mibgroup/ucd-snmp/extensible.c	Mon Mar 22 20:22:02 1999
-@@ -78,6 +78,7 @@
+--- agent/mibgroup/ucd-snmp/extensible.c~	Fri Mar  5 08:45:01 1999
++++ agent/mibgroup/ucd-snmp/extensible.c	Sat Apr  3 13:34:13 1999
+@@ -81,6 +81,7 @@
  #define statvfs statfs
  #endif
  #if HAVE_VM_SWAP_PAGER_H
@@ -28,9 +28,9 @@
  #include <vm/swap_pager.h>
  #endif
  #if HAVE_SYS_FIXPOINT_H
---- agent/mibgroup/ucd-snmp/loadave.c.orig	Mon Mar 22 20:21:05 1999
-+++ agent/mibgroup/ucd-snmp/loadave.c	Mon Mar 22 20:21:21 1999
-@@ -77,6 +77,7 @@
+--- agent/mibgroup/ucd-snmp/loadave.c~	Tue Mar 16 08:21:02 1999
++++ agent/mibgroup/ucd-snmp/loadave.c	Sat Apr  3 13:34:39 1999
+@@ -80,6 +80,7 @@
  #define statvfs statfs
  #endif
  #if HAVE_VM_SWAP_PAGER_H
diff --git a/net-mgmt/net-snmp4/files/patch-ad b/net-mgmt/net-snmp4/files/patch-ad
new file mode 100644
index 000000000000..f47168018a61
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-ad
@@ -0,0 +1,29 @@
+--- agent/mibgroup/mibII/interfaces.c~	Tue Mar 16 08:46:12 1999
++++ agent/mibgroup/mibII/interfaces.c	Sat Apr  3 13:49:28 1999
+@@ -1745,10 +1745,18 @@
+ 			physaddrbuf = 0;
+ 		}
+ 		ifm = (struct if_msghdr *)rtm;
++#if defined(freebsd3) || defined(freebsd4)
++		if (physaddrs != 0) physaddrs[naddrs] = (void*)(ifm + 1);
++		naddrs++;
++#endif
+ 		ilen -= ifm->ifm_msglen;
+ 		cp += ifm->ifm_msglen;
+ 		rtm = (struct rt_msghdr *)cp;
+ 		while (ilen > 0 && rtm->rtm_type == RTM_NEWADDR) {
++#if defined(freebsd3) || defined(freebsd4)
++			ilen -= rtm->rtm_msglen;
++			cp += rtm->rtm_msglen;
++#else
+ 			int is_alias = 0;
+ 			ifam = (struct ifa_msghdr *)rtm;
+ 			ilen -= sizeof(*ifam);
+@@ -1771,6 +1779,7 @@
+ 				}
+ 				sa = (struct sockaddr *)cp;
+ 			}
++#endif
+ 			rtm = (struct rt_msghdr *)cp;
+ 		}
+ 	}
diff --git a/net-mgmt/net-snmp4/files/patch-af b/net-mgmt/net-snmp4/files/patch-af
new file mode 100644
index 000000000000..2f197dc4c0c0
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-af
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd_snmp.h.orig	Fri Feb 26 03:03:41 1999
++++ agent/mibgroup/ucd_snmp.h	Sun Apr  4 13:52:23 1999
+@@ -18,5 +18,9 @@
+ config_arch_require(bsdi3, ucd-snmp/memory)
+ config_arch_require(linux, ucd-snmp/vmstat)
+ config_arch_require(freebsd2, ucd-snmp/vmstat_freebsd2)
++config_arch_require(freebsd3, ucd-snmp/vmstat_freebsd2)
++config_arch_require(freebsd4, ucd-snmp/vmstat_freebsd2)
+ config_arch_require(freebsd2, ucd-snmp/memory_freebsd2)
++config_arch_require(freebsd3, ucd-snmp/memory_freebsd2)
++config_arch_require(freebsd4, ucd-snmp/memory_freebsd2)
+ config_add_mib(UCD-SNMP-MIB) 
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index 284e144e9a09..7945090e103b 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -13,14 +13,23 @@ bin/snmptable
 bin/snmpcheck
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
+include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
+include/ucd-snmp/context.h
+include/ucd-snmp/int64.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/party.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
 include/ucd-snmp/snmp.h
-include/ucd-snmp/parse.h
-include/ucd-snmp/mib.h
+include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
+include/ucd-snmp/ucd-snmp-includes.h
+include/ucd-snmp/version.h
+include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
 lib/libsnmp.so.3.5
@@ -32,6 +41,7 @@ share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
+share/snmp/mibs/DLMOD-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
 share/snmp/mibs/SNMPv2-CONF.txt