Update to argus 3.7

* Version 3.7 [2013 Feb 14]
  holt-winters aberrant behavior detection
  work around bug in some versions of mod_perl
  TCP/Freeswitch
  Ticket system integration
  better/faster resolver
  custom dashboards
  style, css
  schedules
  bugfixes

Also patches to work with CGI >= 4.0

10 files changed, 260 insertions, 10 deletions

diff --git a/net/argus/Makefile b/net/argus/Makefile
index 5bdd4828c14..60c78243eae 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2014/05/29 23:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/11/30 10:09:09 markd Exp $
 
-DISTNAME=	argus-3.6
-PKGREVISION=	4
+DISTNAME=	argus-3.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +27,7 @@ CONFIGURE_ARGS+=	--sbin_dir ${PREFIX}/sbin
 CONFIGURE_ARGS+=	--lib_dir ${PREFIX}/lib/argus
 CONFIGURE_ARGS+=	--cgi_dir ${PREFIX}/libexec/cgi-bin
 CONFIGURE_ARGS+=	--data_dir ${VARBASE}/argus
+CONFIGURE_ARGS+=	--www_dir ${VARBASE}/argus/www/htdocs
 CONFIGURE_ENV+=		PERL=${TOOLS_PERL5:Q}
 
 REPLACE_PERL+=		${WRKSRC}/built/argus-config
diff --git a/net/argus/PLIST b/net/argus/PLIST
index ba9cc413cb4..7bae1f9d57d 100644
--- a/net/argus/PLIST
+++ b/net/argus/PLIST
@@ -1,27 +1,47 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:06 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/11/30 10:09:09 markd Exp $
 bin/argus-config
 lib/argus/Alias.pm
 lib/argus/Argus/Agent.pm
 lib/argus/Argus/Archive.pm
 lib/argus/Argus/Archivist.pm
 lib/argus/Argus/Asterisk.pm
+lib/argus/Argus/Color.pm
 lib/argus/Argus/Compute.pm
 lib/argus/Argus/Ctl.pm
+lib/argus/Argus/Dashboard.pm
+lib/argus/Argus/Dashboard/Col.pm
+lib/argus/Argus/Dashboard/Graph.pm
+lib/argus/Argus/Dashboard/Iframe.pm
+lib/argus/Argus/Dashboard/Overview.pm
+lib/argus/Argus/Dashboard/Row.pm
+lib/argus/Argus/Dashboard/Status.pm
+lib/argus/Argus/Dashboard/Text.pm
+lib/argus/Argus/Dashboard/Widget.pm
 lib/argus/Argus/Encode.pm
+lib/argus/Argus/Freeswitch.pm
 lib/argus/Argus/Graph/Data.pm
+lib/argus/Argus/HWAB.pm
 lib/argus/Argus/HashDir.pm
 lib/argus/Argus/IP.pm
+lib/argus/Argus/Interpolate.pm
+lib/argus/Argus/MHWAB.pm
 lib/argus/Argus/MonEl/Expand.pm
 lib/argus/Argus/MonEl/Noise.pm
 lib/argus/Argus/MonEl/Trans.pm
 lib/argus/Argus/RPC.pm
 lib/argus/Argus/RPC/TCP.pm
 lib/argus/Argus/RPC/UDP.pm
+lib/argus/Argus/ReadConfig.pm
+lib/argus/Argus/Resolv.pm
+lib/argus/Argus/Resolv/IP.pm
 lib/argus/Argus/SIP.pm
 lib/argus/Argus/SIP/TCP.pm
 lib/argus/Argus/SIP/UDP.pm
 lib/argus/Argus/SNMP.pm
+lib/argus/Argus/SNMP/Conf.pm
 lib/argus/Argus/SNMP/Helper.pm
+lib/argus/Argus/Schedule.pm
+lib/argus/Argus/Ticket.pm
 lib/argus/Argus/Web/Overview.pm
 lib/argus/Artistic
 lib/argus/BaseIO.pm
@@ -34,7 +54,7 @@ lib/argus/Cron.pm
 lib/argus/DARP.pm
 lib/argus/DARP/Conf.pm
 lib/argus/DARP/Master.pm
-lib/argus/DARP/Misc.pm
+lib/argus/DARP/MonEl.pm
 lib/argus/DARP/Service.pm
 lib/argus/DARP/Slave.pm
 lib/argus/DARP/Watch.pm
@@ -59,7 +79,6 @@ lib/argus/Override.pm
 lib/argus/Ping.pm
 lib/argus/Prog.pm
 lib/argus/README
-lib/argus/Resolv.pm
 lib/argus/SSL.pm
 lib/argus/Self.pm
 lib/argus/Server.pm
@@ -70,6 +89,7 @@ lib/argus/TestPort.pm
 lib/argus/UDP.pm
 lib/argus/UserCron.pm
 lib/argus/Web.pm
+lib/argus/common.pl
 lib/argus/conf.pl
 lib/argus/graphd
 lib/argus/localization.pl
diff --git a/net/argus/distinfo b/net/argus/distinfo
index dac772fb609..c26bd115815 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.6 2009/07/25 11:44:49 markd Exp $
+$NetBSD: distinfo,v 1.7 2014/11/30 10:09:09 markd Exp $
 
-SHA1 (argus-3.6.tgz) = 132b0ee35a0c4523a65c93673ba838ce8dbe9e09
-RMD160 (argus-3.6.tgz) = a53283ef6162c94864438d90d79de43916032b0f
-Size (argus-3.6.tgz) = 380302 bytes
+SHA1 (argus-3.7.tgz) = 3aaf2d6db097441fa79cde2e272fcf543a439aa6
+RMD160 (argus-3.7.tgz) = f8f9eeb6ca5451475594262efcdd571bda931f32
+Size (argus-3.7.tgz) = 435683 bytes
 SHA1 (patch-aa) = 85725be47608b8f7a7f675c50e90b763fb6cfbe9
+SHA1 (patch-src_web_about.pl) = 88a627c60f667dfc8640c358fa18f37f27bfdc19
+SHA1 (patch-src_web_graph.pl) = 4b87bc3a4cac48b05d72112b9d669af94ad32875
+SHA1 (patch-src_web_login.pl) = b025eae58b1a92f4573fd519bf79d088e8f6ffc9
+SHA1 (patch-src_web_notify.pl) = 9abee193d3df127092dc530e577860c3371e19a2
+SHA1 (patch-src_web_override.pl) = dd403b9f57b6551e2dba6750081acd49d8d1644c
+SHA1 (patch-src_web_page.pl) = e8cf75abf9baa4a1fc80d047ef31fb23e1c34f99
+SHA1 (patch-src_web_utils.pl) = cac3477ce20c5d22754bdf965a9e0093fd886cb2
diff --git a/net/argus/patches/patch-src_web_about.pl b/net/argus/patches/patch-src_web_about.pl
new file mode 100644
index 00000000000..34440b212c5
--- /dev/null
+++ b/net/argus/patches/patch-src_web_about.pl
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_web_about.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_about.pl.orig	2011-11-03 02:13:41.000000000 +0000
++++ src/web_about.pl
+@@ -20,7 +20,7 @@ sub web_about {
+     my $me = shift;
+     my( $obj, $r, $k, $v );
+ 
+-    $obj  = decode( $me->{q}->param('object') );
++    $obj  = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'about', 1);
+ 
+     $r = $argusd->command( func => 'about',
diff --git a/net/argus/patches/patch-src_web_graph.pl b/net/argus/patches/patch-src_web_graph.pl
new file mode 100644
index 00000000000..aafcf54794e
--- /dev/null
+++ b/net/argus/patches/patch-src_web_graph.pl
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_web_graph.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_graph.pl.orig	2012-10-02 01:38:26.000000000 +0000
++++ src/web_graph.pl
+@@ -20,7 +20,7 @@ sub web_graph {
+     my( $file, $ht, $r, $buf, $i );
+ 
+     my $q   = $me->{q};
+-    my $obj = decode( $q->param('object') );
++    my $obj = decode( scalar $q->param('object') );
+     my $tag = $q->param('tag');
+     my $which = $q->param('which');
+     my $size  = $q->param('size');
+@@ -142,7 +142,7 @@ sub web_graphpage {
+     my $me = shift;
+     my( $obj, $which, $size, $r, $back, @opt );
+ 
+-    $obj = decode( $me->{q}->param('object') );
++    $obj = decode( scalar $me->{q}->param('object') );
+     my $tag = $me->{q}->param('tag');
+     my $url = $me->{q}->url();
+ 
diff --git a/net/argus/patches/patch-src_web_login.pl b/net/argus/patches/patch-src_web_login.pl
new file mode 100644
index 00000000000..2eb7b64681a
--- /dev/null
+++ b/net/argus/patches/patch-src_web_login.pl
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_web_login.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_login.pl.orig	2012-09-03 15:24:54.000000000 +0000
++++ src/web_login.pl
+@@ -54,7 +54,7 @@ sub web_login {
+ 	return ;
+     }
+     
+-    my @a = $me->authenticate( $user, $q->param('passwd') );
++    my @a = $me->authenticate( $user, scalar $q->param('passwd') );
+ 
+     unless(@a){
+ 	my $emsg = l10n('Authentication Failed');
+@@ -104,15 +104,15 @@ sub web_login_form {
+     print "<H2><FONT COLOR=\"#FF0000\">", l10n('ERROR'), ": $emsg</FONT></H2>\n" if $emsg;
+     print "<TABLE WIDTH=\"95%\" cellspacing=0 cellpadding=5>\n<TR><TD VALIGN=TOP>\n";
+ 
+-    print $q->startform(), "\n";
++    print $q->start_form(), "\n";
+     print "<INPUT TYPE=HIDDEN NAME=func VALUE=login>\n";
+-    print "<INPUT TYPE=HIDDEN NAME=next VALUE=\"", $q->param('next'), "\">\n";
++    print "<INPUT TYPE=HIDDEN NAME=next VALUE=\"", scalar $q->param('next'), "\">\n";
+     print "<TABLE>\n";
+     print "<TR><TH>", l10n("Username"), ": </TH><TD>", $q->textfield('name', '', 32, 32), "</TD></TR>\n";
+     print "<TR><TH>", l10n("Password"), ": </TH><TD>", $q->password_field('passwd', '', 32, 32), "</TD></TR>\n";
+     print "<TR><TD COLSPAN=2>", $q->submit(-name=>l10n('Login')), "</TD></TR>\n";
+     print "</TABLE><P>\n";
+-    print $q->endform(), "\n";
++    print $q->end_form(), "\n";
+     print "</TD></TR></TABLE>\n";
+ 
+     print "</TD></TR>\n";
diff --git a/net/argus/patches/patch-src_web_notify.pl b/net/argus/patches/patch-src_web_notify.pl
new file mode 100644
index 00000000000..1fb0af2155c
--- /dev/null
+++ b/net/argus/patches/patch-src_web_notify.pl
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_web_notify.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_notify.pl.orig	2011-11-03 02:13:41.000000000 +0000
++++ src/web_notify.pl
+@@ -60,7 +60,7 @@ sub notify_list {
+                        mainclass => 'notifiesmain',
+                        branding  => decode($r->{branding}) );
+ 
+-    print $q->startform(-method=>'get'), "\n" if $ackp;
++    print $q->start_form(-method=>'get'), "\n" if $ackp;
+     print "<TR><TD colspan=2><TABLE class=notifylist WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=0>\n";
+ 
+     foreach my $nd (@{$res->{data}}){
+@@ -90,7 +90,7 @@ sub notify_list {
+ 	print "<BR><INPUT TYPE=HIDDEN NAME=func VALUE=ntfyack>\n";
+ 	print $q->submit(l10n("Ack Checked")), "\n";
+ 	print $q->submit(l10n("Ack All")), "\n";
+-	print $q->endform(), "\n";
++	print $q->end_form(), "\n";
+     }
+ 
+     unless( $n ){
diff --git a/net/argus/patches/patch-src_web_override.pl b/net/argus/patches/patch-src_web_override.pl
new file mode 100644
index 00000000000..19f269f8b11
--- /dev/null
+++ b/net/argus/patches/patch-src_web_override.pl
@@ -0,0 +1,78 @@
+$NetBSD: patch-src_web_override.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_override.pl.orig	2011-10-31 04:16:59.000000000 +0000
++++ src/web_override.pl
+@@ -15,7 +15,7 @@ sub web_override {
+     my $me = shift;
+     my( $q, $st, $r, $obj );
+     
+-    $obj = decode( $me->{q}->param('object') );
++    $obj = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'override', 1);
+     $q = $me->{q};
+     
+@@ -43,7 +43,7 @@ sub web_override {
+ 			       text => encode($txt),
+ 			       mode => $mode,
+ 			       expires => $q->param('expires') ? ($^T + $q->param('expires')) : 0,
+-			       ticket => encode($q->param('ticket')),
++			       ticket => encode(scalar $q->param('ticket')),
+ 			       );
+ 	return $me->error( "unable to connect to server" ) unless $r;
+ 	return $me->error( "Unable to access <I>$obj</I><BR>$r->{resultcode} $r->{resultmsg}" )
+@@ -56,7 +56,7 @@ sub web_override {
+     $st = get_status($obj);
+     my $tkt = $argusd->command( func => 'use_tkt', object => encode($obj) );
+ 
+-    print $q->startform(-method=>'get'), "\n";
++    print $q->start_form(-method=>'get'), "\n";
+     print "<INPUT TYPE=HIDDEN NAME=func VALUE=override>\n";
+     print "<INPUT TYPE=HIDDEN NAME=phase VALUE=1>\n";
+     print "<INPUT TYPE=HIDDEN NAME=object VALUE=", encode($obj), ">\n";
+@@ -97,7 +97,7 @@ sub web_override {
+                                       [ sort {$a<=>$b} keys %exp ], 4 * 60 * 60, \%exp );
+     print "<P>\n";
+     print $q->submit(), "\n";
+-    print $q->endform(), "\n";
++    print $q->end_form(), "\n";
+     print "<HR>\n<I>NB:";
+     print l10n("auto mode - disengage override when status returns to up"), "<BR>\n";
+     print l10n("manual mode - require override be disengaged manually"), "<BR>\n";
+@@ -111,7 +111,7 @@ sub web_rmoverride {
+     my $me = shift;
+     my( $r, $obj );
+     
+-    $obj = decode( $me->{q}->param('object') );
++    $obj = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'override', 1);
+ 
+     if( $me->can('override_policy') ){
+@@ -134,7 +134,7 @@ sub web_annotate {
+     my $me = shift;
+     my( $obj, $r, $q );
+ 
+-    $obj = decode( $me->{q}->param('object') );
++    $obj = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'annotate', 1);
+     if( $me->{q}->param('phase') ){
+ 	my $txt = $me->{q}->param('text');
+@@ -156,7 +156,7 @@ sub web_annotate {
+     $me->startpage( title => l10n("Annotate") . " $obj" );
+     $q = $me->{q}; 
+ 
+-    print $q->startform(-method=>'get'), "\n";
++    print $q->start_form(-method=>'get'), "\n";
+     print "<INPUT TYPE=HIDDEN NAME=func VALUE=annotate>\n";
+     print "<INPUT TYPE=HIDDEN NAME=phase VALUE=1>\n";
+     print "<INPUT TYPE=HIDDEN NAME=object VALUE=", encode($obj), ">\n";
+@@ -165,7 +165,7 @@ sub web_annotate {
+     # QQQ - include note that javascript is not properly installed/configured?
+ 
+     print $q->submit(), "\n";
+-    print $q->endform(), "\n";
++    print $q->end_form(), "\n";
+     $me->endpage();
+ }
+ 
diff --git a/net/argus/patches/patch-src_web_page.pl b/net/argus/patches/patch-src_web_page.pl
new file mode 100644
index 00000000000..5dbc1206ef3
--- /dev/null
+++ b/net/argus/patches/patch-src_web_page.pl
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_web_page.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_page.pl.orig	2012-10-02 01:38:26.000000000 +0000
++++ src/web_page.pl
+@@ -19,7 +19,7 @@ sub web_page {
+     my( $r, $file, $warning, $siren_icon, $cached );
+ 
+     my $cakestale = $CAKESTALE;
+-    my $obj  = decode( $me->{q}->param('object') );
++    my $obj  = decode( scalar $me->{q}->param('object') );
+     my $topp = $me->{q}->param('top');
+     my $url  = $me->{q}->url( -path_info => 1 );
+     my $user = $me->{auth}{user};
diff --git a/net/argus/patches/patch-src_web_utils.pl b/net/argus/patches/patch-src_web_utils.pl
new file mode 100644
index 00000000000..6bcae23dfde
--- /dev/null
+++ b/net/argus/patches/patch-src_web_utils.pl
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_web_utils.pl,v 1.1 2014/11/30 10:09:09 markd Exp $
+
+fix usage with CGI >= 4.09
+
+--- src/web_utils.pl.orig	2011-10-30 21:00:29.000000000 +0000
++++ src/web_utils.pl
+@@ -15,7 +15,7 @@ sub web_getconf {
+     my $me = shift;
+     my( $obj, $r, $k, $v );
+ 
+-    $obj  = decode( $me->{q}->param('object') );
++    $obj  = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'getconf', 1);
+     my $rd = $argusd->command( func => 'logindata' ) || {};
+     return $me->error( "unable to connect to server" ) unless $rd;
+@@ -59,7 +59,7 @@ sub web_getconf {
+ sub web_flushcache {
+     my $me = shift;
+ 
+-    my $obj = decode( $me->{q}->param('object') );
++    my $obj = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'flush', 1);
+     my $r = $argusd->command( func   => 'flushpage',
+ 			      object => encode($obj),
+@@ -75,7 +75,7 @@ sub web_flushcache {
+ sub web_checknow {
+     my $me = shift;
+ 
+-    my $obj = decode( $me->{q}->param('object') );
++    my $obj = decode( scalar $me->{q}->param('object') );
+     return unless $me->check_acl_func($obj, 'checknow', 1);
+     my $r = $argusd->command( func   => 'checknow',
+ 			      object => encode($obj),