Update to nocol-4.2.2b4

Primary reason was to fix a buffer overrun in portmon which caused a coredump
whem trying to monitor certain webservers.

7 files changed, 90 insertions, 68 deletions

diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 5cff6064dfd..8b7cb011f4d 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1999/10/27 09:18:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/12/06 21:09:12 abs Exp $
 #
 
-DISTNAME=	nocol-4.2beta6
-PKGNAME=	nocol-4.2b6
+DISTNAME=	nocol-4.2.2beta4
+PKGNAME=	nocol-4.2.2b4
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.navya.com/pub/vikas/
 
diff --git a/net/nocol/files/md5 b/net/nocol/files/md5
index 472d7f96749..8c21f1ca96f 100644
--- a/net/nocol/files/md5
+++ b/net/nocol/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:10 agc Exp $
+$NetBSD: md5,v 1.3 1999/12/06 21:09:12 abs Exp $
 
-MD5 (nocol-4.2beta6.tar.gz) = de6a07b6c5cb84f6ab38c8f75d201b04
+MD5 (nocol-4.2.2beta4.tar.gz) = 5cacd363cb313a96c8c31bd4c6353a05
diff --git a/net/nocol/files/patch-sum b/net/nocol/files/patch-sum
index 917e04e2c73..b3e6ee19a9a 100644
--- a/net/nocol/files/patch-sum
+++ b/net/nocol/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:25 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/06 21:09:12 abs Exp $
 
-MD5 (patch-aa) = 88c58d303a9f5a57f5b63dbbdef2a21e
-MD5 (patch-ab) = 00871c94e2b26919952e40200a28e81b
-MD5 (patch-ac) = 2ee72ac43f45b6c12da1e2449f6627ca
+MD5 (patch-aa) = 5d550b170a60e06e279293168727f3cb
+MD5 (patch-ab) = 76ecbdbaf5ffb054006333227398d992
+MD5 (patch-ac) = 2c8818dc2d4dd1835e7607627f49b713
diff --git a/net/nocol/patches/patch-aa b/net/nocol/patches/patch-aa
index 870e50d7d3a..6803256545c 100644
--- a/net/nocol/patches/patch-aa
+++ b/net/nocol/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:48 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/12/06 21:09:12 abs Exp $
 
---- Makefile.head	1998/07/23 14:17:28	1.1
-+++ Makefile.head	1998/07/23 14:21:04
-@@ -37,11 +37,13 @@
+--- Makefile.head.orig	Tue Nov 23 23:16:41 1999
++++ Makefile.head	Tue Nov 23 23:18:40 1999
+@@ -37,6 +37,7 @@
  #	DATADIR		where datafiles for monitoring programs are created
  #	MSGSDIR		for message files that the nocol display shows in
  #			in the 'messages' sub-window
 +#	EXAMPLESDIR	directory in which to store example files
+ #	HELPDIR		where helpfiles for webnocol are kept.
  BINDIR= 	$(ROOTDIR)/bin
  ETCDIR=		$(ROOTDIR)/etc
- PIDDIR=		$(ROOTDIR)/run
+@@ -44,6 +45,7 @@
  DATADIR=	$(ROOTDIR)/data
  MSGSDIR=	$(ROOTDIR)/msgs
+ HELPDIR=	$(ROOTDIR)/help
 +EXAMPLESDIR=	${ROOTDIR}/share/examples/nocol
  
  ##
diff --git a/net/nocol/patches/patch-ab b/net/nocol/patches/patch-ab
index 7c5e4182c5d..6935163601e 100644
--- a/net/nocol/patches/patch-ab
+++ b/net/nocol/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:48 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/12/06 21:09:12 abs Exp $
 
---- Makefile.mid.orig	Thu Dec 18 04:19:01 1997
-+++ Makefile.mid	Thu Jul 23 15:41:03 1998
-@@ -64,7 +64,7 @@
+--- Makefile.mid.orig	Tue Nov  9 05:38:58 1999
++++ Makefile.mid	Tue Nov 23 23:20:21 1999
+@@ -68,7 +68,7 @@
  	-[ -d $(DATADIR) ] || mkdir $(DATADIR)
- 	-[ -d $(ETCDIR) ] || mkdir $(ETCDIR)
- 	-[ -d $(PIDDIR) ] || mkdir $(PIDDIR)
+ 	-[ -d $(ETCDIR) ] ||  mkdir $(ETCDIR)
+ 	-[ -d $(PIDDIR) ] ||  mkdir $(PIDDIR)
 -	-[ -d $(ETCDIR)/samples ] || mkdir $(ETCDIR)/samples
 +	-[ -d $(EXAMPLESDIR) ] || mkdir -p $(EXAMPLESDIR)
- 	-[ -d $(BINDIR) ] || mkdir $(BINDIR)
+ 	-[ -d $(BINDIR) ] ||  mkdir $(BINDIR)
  	-[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR)
- 	@[ -d $(ROOTDIR) ] && [ -d $(DATADIR) ] && [ -d $(ETCDIR) ] \
-@@ -80,9 +80,9 @@
+ 	-[ -d $(HELPDIR) ] || mkdir $(HELPDIR)
+@@ -85,9 +85,9 @@
  	  ( echo "" ; echo "MAKING IN $$i" ; echo "----------" ; cd $$i ; \
  		make $(MFLAGS) install ; ) ;\
  	done
diff --git a/net/nocol/patches/patch-ac b/net/nocol/patches/patch-ac
index 185cf507573..0da97016a19 100644
--- a/net/nocol/patches/patch-ac
+++ b/net/nocol/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:10:48 agc Exp $
+$NetBSD: patch-ac,v 1.3 1999/12/06 21:09:12 abs Exp $
 
---- Makefile.tail	1998/07/23 14:17:28	1.1
-+++ Makefile.tail	1998/07/23 14:22:07
+--- Makefile.tail.orig	Fri Jul 31 19:01:10 1998
++++ Makefile.tail	Tue Nov 23 23:20:28 1999
 @@ -14,6 +14,7 @@
  	@[ -d $(BINDIR) ]  || mkdir $(BINDIR)
  	@[ -d $(DATADIR) ] || mkdir $(DATADIR)
diff --git a/net/nocol/pkg/PLIST b/net/nocol/pkg/PLIST
index 1254c403b2d..8a227e1bce7 100644
--- a/net/nocol/pkg/PLIST
+++ b/net/nocol/pkg/PLIST
@@ -1,17 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 1998/07/24 13:36:53 agc Exp $
-bin/snmpwalk
-bin/eventselect
+@comment $NetBSD: PLIST,v 1.2 1999/12/06 21:09:13 abs Exp $
+bin/apcmon
+bin/armon
+bin/bgpmon
+bin/bpmon
+bin/ciscomon
+bin/crontab.nocol
+bin/display_nocol_datafile
+bin/docrypt.pl
 bin/etherload
+bin/eventselect
 bin/genmon
-bin/netconsole
-bin/noclogd
-bin/nsmon
-bin/ntpmon
+bin/genweb.pl
+bin/hostmon
 bin/hostmon-osclients/hostmon-client
 bin/hostmon-osclients/hostmon-client.aix
 bin/hostmon-osclients/hostmon-client.bsdi
+bin/hostmon-osclients/hostmon-client.freebsd
 bin/hostmon-osclients/hostmon-client.hpux
 bin/hostmon-osclients/hostmon-client.irix5
+bin/hostmon-osclients/hostmon-client.irix6
 bin/hostmon-osclients/hostmon-client.linux
 bin/hostmon-osclients/hostmon-client.osf1
 bin/hostmon-osclients/hostmon-client.seds
@@ -19,72 +26,85 @@ bin/hostmon-osclients/hostmon-client.solaris2
 bin/hostmon-osclients/hostmon-client.sunos4
 bin/hostmon-osclients/hostmon-client.ultrix
 bin/hostmon-osclients/newsys.sh
-bin/apcmon
-bin/armon
-bin/bgpmon
-bin/bpmon
-bin/ciscomon
+bin/ippingmon
+bin/keepalive_monitors
+bin/log-maint
+bin/logstats
 bin/modemmon
+bin/multiping
+bin/ndaemon
+bin/netconsole
+bin/noclogd
+bin/nocollib.pl
+bin/notifier
+bin/notifier.pl
 bin/novellmon
 bin/nrmon
-bin/nocollib.pl
-bin/hostmon
+bin/nsmon
+bin/ntpmon
+bin/osipingmon
+bin/portmon
+bin/radiusmon
+bin/rcisco
+bin/rpcping
+bin/rpcpingmon
+bin/show_nocol_struct_sizes
+bin/smbmon
+bin/snmpgeneric
+bin/snmpget
 bin/snmpmon
 bin/snmpmon-client
+bin/snmpwalk
 bin/syslogmon
-bin/xntpdmon
-bin/rcisco
-bin/ippingmon
-bin/osipingmon
-bin/rpcpingmon
-bin/portmon
+bin/testlog
+bin/tkNocol
 bin/tpmon
 bin/trapmon
-bin/display_nocol_datafile
-bin/keepalive_monitors
-bin/notifier
-bin/log-maint
-bin/logstats
-bin/crontab.nocol
-bin/webnocol.pl
-bin/webnocol.html
-bin/multiping
-bin/rpcping
-man/mann/netconsole.n
-man/mann/perlnocol.n
-man/mann/nocol-prog.n
+bin/upsmon
+bin/webnocol.cgi
+etc/mib-v2.txt
+etc/netconsole-help
+help/default
 man/mann/etherload.n
 man/mann/eventselect.n
 man/mann/genmon.n
 man/mann/multiping.n
+man/mann/netconsole.n
 man/mann/noclogd.n
 man/mann/nocol-overview.n
+man/mann/nocol-prog.n
 man/mann/nocol-utility.n
 man/mann/nsmon.n
+man/mann/perlnocol.n
 man/mann/pingmon.n
 man/mann/portmon.n
 man/mann/tpmon.n
 man/mann/trapmon.n
-share/examples/nocol/etherload-confg
-share/examples/nocol/noclogd-confg
-share/examples/nocol/nsmon-confg
-share/examples/nocol/ntpmon-confg
 share/examples/nocol/apcmon-confg
 share/examples/nocol/armon-confg
 share/examples/nocol/bgpmon-confg
 share/examples/nocol/bpmon-confg
+share/examples/nocol/ciscomon-confg
+share/examples/nocol/etherload-confg
 share/examples/nocol/hostmon-confg
+share/examples/nocol/ippingmon-confg
 share/examples/nocol/modemmon-confg
+share/examples/nocol/noclogd-confg
+share/examples/nocol/notifier-confg
 share/examples/nocol/novellmon-confg
+share/examples/nocol/nsmon-confg
+share/examples/nocol/ntpmon-confg
+share/examples/nocol/pm3dmmon-confg
+share/examples/nocol/pm3t1e1mon-confg
+share/examples/nocol/portmon-confg
+share/examples/nocol/radiusmon-confg
+share/examples/nocol/rpcpingmon-confg
+share/examples/nocol/smbmon-confg
+share/examples/nocol/snmpgeneric-confg
 share/examples/nocol/snmpmon-client-confg
 share/examples/nocol/snmpmon-confg
 share/examples/nocol/syslogmon-confg
-share/examples/nocol/ippingmon-confg
-share/examples/nocol/rpcpingmon-confg
-share/examples/nocol/portmon-confg
 share/examples/nocol/tpmon-confg
-etc/netconsole-help
-etc/mibII.txt
 @dirrm bin/hostmon-osclients
 @dirrm data
 @dirrm share/examples/nocol