From root@virtual.accountingreality.com  Tue May 18 19:23:35 2010
Return-Path: <root@virtual.accountingreality.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED4E51065672
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 May 2010 19:23:35 +0000 (UTC)
	(envelope-from root@virtual.accountingreality.com)
Received: from virtual.accountingreality.com (virtual.accountingreality.ca [66.96.20.52])
	by mx1.freebsd.org (Postfix) with ESMTP id AAD008FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 May 2010 19:23:35 +0000 (UTC)
Received: by virtual.accountingreality.com (Postfix, from userid 0)
	id F30365C036; Tue, 18 May 2010 15:06:51 -0400 (EDT)
Message-Id: <20100518190651.F30365C036@virtual.accountingreality.com>
Date: Tue, 18 May 2010 15:06:51 -0400 (EDT)
From: dave@daveg.ca
Reply-To: dave@daveg.ca
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: argus-monitor update (patch included)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         146713
>Category:       ports
>Synopsis:       [patch] net-mgmt/argus-monitor update
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 18 19:30:02 UTC 2010
>Closed-Date:    Thu Feb 03 11:14:17 UTC 2011
>Last-Modified:  Thu Feb  3 11:20:08 UTC 2011
>Originator:     dave@daveg.ca
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
DaveG.ca
>Environment:
System: FreeBSD virtual.accountingreality.com 8.0-STABLE FreeBSD 8.0-STABLE #2: Wed Apr 7 16:27:05 EDT 2010 root@virtual.accountingreality.com:/usr/obj/usr/src/sys/VR amd64


Ports.  All OS Versions
>Description:
argus monitor is using a 2006 version.  Very old.
>How-To-Repeat:
cd /usr/ports/net-mgmt/argus-montor
make install
>Fix:


--- Makefile.orig	2010-05-18 14:55:51.000000000 -0400
+++ Makefile	2010-05-18 14:56:27.000000000 -0400
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	argus-monitor
-PORTVERSION=	20060722
-PORTREVISION=	4
+PORTVERSION=	20100109
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 DISTNAME=	argus-dev-${PORTVERSION}
--- distinfo.orig	2010-05-18 14:57:05.000000000 -0400
+++ distinfo	2010-05-18 15:00:48.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (argus-dev-20060722.tgz) = 8118f8faebb5e54b7e76a842a0716a65
-SHA256 (argus-dev-20060722.tgz) = 9e380e1caa28da06489258952fefee74e92afa896c675013beea5510187c2ba1
-SIZE (argus-dev-20060722.tgz) = 306604
+MD5 (argus-dev-20100109.tgz) = 98ecd7a18c18ce8f310e03e038be988f
+SHA256 (argus-dev-20100109.tgz) = c6879862f282a5f22db705e6c416a4c40aaba3de8e59b373c0d53b35a3d1347c
+SIZE (argus-dev-20100109.tgz) = 389465


>Release-Note:
>Audit-Trail:

From: David Gilbert <dave@daveg.ca>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Tue, 08 Jun 2010 14:13:51 -0400

 it would seem to make sense to get this in before the 8.1 freeze.  I did 
 OK being the maintainer after being asked.
 
State-Changed-From-To: open->feedback 
State-Changed-By: stefan 
State-Changed-When: Thu Jul 1 12:34:11 UTC 2010 
State-Changed-Why:  
Awaiting maintainer's feedback. 


Responsible-Changed-From-To: freebsd-ports-bugs->stefan 
Responsible-Changed-By: stefan 
Responsible-Changed-When: Thu Jul 1 12:34:11 UTC 2010 
Responsible-Changed-Why:  
Track this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146713 

From: Stefan Walter <stefan@freebsd.org>
To: Brock Williams <brock@cotcomsol.com>
Cc: GNATS <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Thu, 1 Jul 2010 14:33:59 +0200

 Dear maintainer of net-mgmt/argus-monitor,
 
 a problem report has been submitted for your port for which your 
 feedback might be required; its contents can be found at [1]. If it 
 contains a patch or suggestions for a change, please send a followup to 
 the PR explaining whether or not you approve it and want it to be 
 committed.
 
 Regards,
 Stefan
 
 [1]: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146713
Responsible-Changed-From-To: stefan->freebsd-ports-bugs 
Responsible-Changed-By: stefan 
Responsible-Changed-When: Mon Aug 2 16:43:49 UTC 2010 
Responsible-Changed-Why:  
Return this PR to the pool - I currently do not have the time to take care of 
it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146713 

From: Tilman Linneweh <arved@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Mon, 9 Aug 2010 18:11:31 +0200

 pkg-plist fails:
 
 Creating bzip'd tar ball in '/usr/ports/packages/All/argus-monitor-20100109.tbz'
 tar: etc/argus-monitor/locale/eubonics: Cannot stat: No such file or directory
 tar: lib/argus-monitor/Argus/BER.pm: Cannot stat: No such file or directory
 tar: lib/argus-monitor/GraphData.pm: Cannot stat: No such file or directory
 tar: lib/argus-monitor/SNMP.pm: Cannot stat: No such file or directory
 tar: sbin/arguscgi: Cannot stat: No such file or directory
 tar: sbin/argusvxml: Cannot stat: No such file or directory
 tar: Error exit delayed from previous errors.
 pkg_create: make_dist: tar command failed with code 256
 

From: Dirk-Willem van Gulik <dirkx@webweaving.org>
To: bug-followup@FreeBSD.org, dave@daveg.ca
Cc:  
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Mon, 30 Aug 2010 13:47:04 +0200

 --Apple-Mail-50--81053636
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 Resent (with corrected subject reference & portlint/echo fix).
 
 Dw.
 
 
 --Apple-Mail-50--81053636
 Content-Disposition: attachment;
 	filename=argus-monitor.shar
 Content-Type: application/octet-stream;
 	x-unix-mode=0644;
 	name="argus-monitor.shar"
 Content-Transfer-Encoding: 7bit
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	argus-monitor
 #	argus-monitor/Makefile
 #	argus-monitor/distinfo
 #	argus-monitor/files
 #	argus-monitor/pkg-descr
 #	argus-monitor/pkg-plist
 #	argus-monitor/files/apache.conf.in
 #	argus-monitor/files/argusd.in
 #	argus-monitor/files/patch.001
 #	argus-monitor/files/pkg-message.in
 #
 echo c - argus-monitor
 mkdir -p argus-monitor > /dev/null 2>&1
 echo x - argus-monitor/Makefile
 sed 's/^X//' >argus-monitor/Makefile << 'END-of-argus-monitor/Makefile'
 X# New ports collection makefile for:	argus-monitor
 X# Date created:				18 November 2006
 X# Whom:					brock@cotcomsol.com
 X#
 X# $FreeBSD: ports/net-mgmt/argus-monitor/Makefile,v 1.5 2010/03/28 06:41:50 dinoex Exp $
 X#
 X
 XPORTNAME=	argus-monitor
 XPORTVERSION=	20100109
 XPORTREVISION=	4
 XCATEGORIES=	net-mgmt
 XMASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 XDISTNAME=	argus-dev-${PORTVERSION}
 XEXTRACT_SUFX=	.tgz
 X
 XMAINTAINER=	brock@cotcomsol.com
 XCOMMENT=	Argus - The All Seeing System and Network Monitoring Software
 X
 XSUB_FILES=	pkg-message apache.conf
 XSUB_LIST=	PORTNAME=${PORTNAME} APACHEETCDIR=${APACHEETCDIR}
 XPKGMESSAGE=	${WRKDIR}/pkg-message
 XEXTRA_PATCHES=	${FILESDIR}/patch.001
 X
 XLICENSE=	ART10
 X
 XWRKSRC=		${WRKDIR}/${DISTNAME}
 XUSE_PERL5=	yes
 XUSE_RC_SUBR=	argusd
 XHAS_CONFIGURE=	yes
 XUSE_APACHE=     1.3+
 XCONFIGURE_SCRIPT=	Configure
 XCONFIGURE_ARGS=	--bin_dir=${PREFIX}/bin --sbin_dir=${PREFIX}/sbin \
 X		--lib_dir=${PREFIX}/lib/argus-monitor --data_dir=${PREFIX}/etc/argus-monitor \
 X		--cgi_dir=${PREFIX}/www/${PORTNAME}/cgi-bin
 X
 XOPTIONS=	QPAGE	"qpage support" Off \
 X		FPING	"fping support" Off \
 X		GD	"GD graphics support" On
 X
 X.include <bsd.port.pre.mk>
 X
 X.if defined(WITH_QPAGE)
 XRUN_DEPENDS+=	qpage:${PORTSDIR}/comms/qpage
 XBUILD_DEPENDS+=	qpage:${PORTSDIR}/comms/qpage
 X.endif
 X
 X.if defined(WITH_FPING)
 XRUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 XBUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
 X.endif
 X
 X.if !defined(WITHOUT_GD)
 XBUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 XRUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 X.endif
 X
 Xpost-install:
 X	${MKDIR} ${PREFIX}/www/${PORTNAME} ${PREFIX}/www/${PORTNAME}/docroot ${PREFIX}/www/${PORTNAME}/docroot/img ${PREFIX}/www/${PORTNAME}/docroot/sound ${PREFIX}/etc/argus-monitor/notify
 X	${CP} ${WRKSRC}/misc/argus.css ${WRKSRC}/misc/argus.js  ${PREFIX}/www/${PORTNAME}/docroot
 X	${CP} ${WRKSRC}/misc/argus.logo.gif ${WRKSRC}/misc/nospkr.gif ${WRKSRC}/misc/sad.gif ${WRKSRC}/misc/sadred.gif ${WRKSRC}/misc/smile.gif	${PREFIX}/www/${PORTNAME}/docroot/img
 X	${CP} ${WRKSRC}/misc/whoopwhoop.wav ${PREFIX}/www/${PORTNAME}/docroot/sound
 X	${TOUCH} ${PREFIX}/etc/argus-monitor/notno ${PREFIX}/etc/argus-monitor/log
 X	${CHMOD} 755 ${PREFIX}/www/${PORTNAME} ${PREFIX}/www/${PORTNAME}/docroot ${PREFIX}/www/${PORTNAME}/docroot/img ${PREFIX}/www/${PORTNAME}/docroot/sound ${PREFIX}/etc/argus-monitor/notify
 X	${CHMOD} 644 ${PREFIX}/www/${PORTNAME}/docroot/argus.* ${PREFIX}/www/${PORTNAME}/docroot/img/*.gif ${PREFIX}/www/${PORTNAME}/docroot/sound/*.wav ${PREFIX}/etc/argus-monitor/notno ${PREFIX}/etc/argus-monitor/log
 X	${INSTALL_DATA} ${WRKDIR}/apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/${PORTNAME}.conf.sample
 X	@${ECHO_CMD}
 X	@${CAT} ${PKGMESSAGE}
 X
 X.include <bsd.port.post.mk>
 END-of-argus-monitor/Makefile
 echo x - argus-monitor/distinfo
 sed 's/^X//' >argus-monitor/distinfo << 'END-of-argus-monitor/distinfo'
 XMD5 (argus-dev-20100109.tgz) = 98ecd7a18c18ce8f310e03e038be988f
 XSHA256 (argus-dev-20100109.tgz) = c6879862f282a5f22db705e6c416a4c40aaba3de8e59b373c0d53b35a3d1347c
 XSIZE (argus-dev-20100109.tgz) = 389465
 END-of-argus-monitor/distinfo
 echo c - argus-monitor/files
 mkdir -p argus-monitor/files > /dev/null 2>&1
 echo x - argus-monitor/pkg-descr
 sed 's/^X//' >argus-monitor/pkg-descr << 'END-of-argus-monitor/pkg-descr'
 X* Argus is a system and network monitoring application.
 X* It will monitor nearly anything you ask it to monitor (TCP + UDP
 X  applications, IP connectivity, SNMP OIDS, Programs, Databases,
 X  etc).
 X* It presents a nice clean, easy to view web interface that will keep both the
 X  managers happy (Red Bad. Green Good.) and the techs happy ("Ah! that's what
 X  the problem is").
 X* It can send alerts numerous ways (such as via pager) and can automatically
 X  escalate if someone falls asleep.
 X
 XWWW: http://argus.tcp4me.com/
 END-of-argus-monitor/pkg-descr
 echo x - argus-monitor/pkg-plist
 sed 's/^X//' >argus-monitor/pkg-plist << 'END-of-argus-monitor/pkg-plist'
 Xbin/argus-config
 Xetc/argus-monitor/config.example
 Xetc/argus-monitor/locale/de_DE
 Xetc/argus-monitor/locale/el_gr
 Xetc/argus-monitor/locale/fr_fr
 Xetc/argus-monitor/locale/lt_LT
 Xetc/argus-monitor/locale/nl_NL
 Xetc/argus-monitor/locale/ru_RU
 Xetc/argus-monitor/locale/piglatin
 Xetc/argus-monitor/locale/sp_ar
 Xetc/argus-monitor/locale/template
 Xetc/argus-monitor/log
 Xetc/argus-monitor/notno
 Xetc/argus-monitor/users.example
 Xlib/argus-monitor/Alias.pm
 Xlib/argus-monitor/Argus/Agent.pm
 Xlib/argus-monitor/Argus/Asterisk.pm
 Xlib/argus-monitor/Argus/Ctl.pm
 Xlib/argus-monitor/Argus/Encode.pm
 Xlib/argus-monitor/Argus/IP.pm
 Xlib/argus-monitor/Argus/RPC.pm
 Xlib/argus-monitor/Argus/RPC/TCP.pm
 Xlib/argus-monitor/Argus/RPC/UDP.pm
 Xlib/argus-monitor/Argus/SIP.pm
 Xlib/argus-monitor/Argus/SIP/TCP.pm
 Xlib/argus-monitor/Argus/SIP/UDP.pm
 Xlib/argus-monitor/Artistic
 Xlib/argus-monitor/BaseIO.pm
 Xlib/argus-monitor/Chart/Strip.pm
 Xlib/argus-monitor/Commands.pm
 Xlib/argus-monitor/Conf.pm
 Xlib/argus-monitor/Configable.pm
 Xlib/argus-monitor/Control.pm
 Xlib/argus-monitor/Cron.pm
 Xlib/argus-monitor/DNS.pm
 Xlib/argus-monitor/DNS/TCP.pm
 Xlib/argus-monitor/DNS/UDP.pm
 Xlib/argus-monitor/DataBase.pm
 Xlib/argus-monitor/Doc.pm
 Xlib/argus-monitor/Error.pm
 Xlib/argus-monitor/Graph.pm
 Xlib/argus-monitor/Group.pm
 Xlib/argus-monitor/LICENSE
 Xlib/argus-monitor/LOCATION
 Xlib/argus-monitor/MonEl.pm
 Xlib/argus-monitor/NotMe.pm
 Xlib/argus-monitor/Notify.pm
 Xlib/argus-monitor/NullConf.pm
 Xlib/argus-monitor/NullCtl.pm
 Xlib/argus-monitor/Override.pm
 Xlib/argus-monitor/Ping.pm
 Xlib/argus-monitor/Prog.pm
 Xlib/argus-monitor/README
 Xlib/argus-monitor/Resolv.pm
 Xlib/argus-monitor/SSL.pm
 Xlib/argus-monitor/Self.pm
 Xlib/argus-monitor/Server.pm
 Xlib/argus-monitor/Service.pm
 Xlib/argus-monitor/Stats.pm
 Xlib/argus-monitor/TCP.pm
 Xlib/argus-monitor/TestPort.pm
 Xlib/argus-monitor/UDP.pm
 Xlib/argus-monitor/UserCron.pm
 Xlib/argus-monitor/Web.pm
 Xlib/argus-monitor/conf.pl
 Xlib/argus-monitor/graphd
 Xlib/argus-monitor/localization.pl
 Xlib/argus-monitor/misc.pl
 Xlib/argus-monitor/picasso
 Xlib/argus-monitor/web_about.pl
 Xlib/argus-monitor/web_acl.pl
 Xlib/argus-monitor/web_auth_file.pl
 Xlib/argus-monitor/web_graph.pl
 Xlib/argus-monitor/web_login.pl
 Xlib/argus-monitor/web_misc.pl
 Xlib/argus-monitor/web_notify.pl
 Xlib/argus-monitor/web_override.pl
 Xlib/argus-monitor/web_page.pl
 Xlib/argus-monitor/web_utils.pl
 Xlib/argus-monitor/Argus/HashDir.pm
 Xlib/argus-monitor/Argus/MonEl/Expand.pm
 Xlib/argus-monitor/Argus/MonEl/Noise.pm
 Xlib/argus-monitor/Argus/MonEl/Trans.pm
 Xlib/argus-monitor/Argus/Archivist.pm
 Xlib/argus-monitor/Argus/Archive.pm
 Xlib/argus-monitor/Argus/Web/Overview.pm
 Xlib/argus-monitor/Argus/ReadConfig.pm
 Xlib/argus-monitor/Argus/Schedule.pm
 Xlib/argus-monitor/Argus/SNMP.pm
 Xlib/argus-monitor/Argus/SNMP/Helper.pm
 Xlib/argus-monitor/Argus/Freeswitch.pm
 Xlib/argus-monitor/Argus/Compute.pm
 Xlib/argus-monitor/Argus/Graph/Data.pm
 Xlib/argus-monitor/Encoding/BER.pm
 Xlib/argus-monitor/Encoding/BER/SNMP.pm
 Xlib/argus-monitor/DARP.pm
 Xlib/argus-monitor/DARP/Master.pm
 Xlib/argus-monitor/DARP/Slave.pm
 Xlib/argus-monitor/DARP/Service.pm
 Xlib/argus-monitor/DARP/Conf.pm
 Xlib/argus-monitor/DARP/Watch.pm
 Xlib/argus-monitor/DARP/Misc.pm
 Xlib/argus-monitor/web_web20.pl
 Xsbin/argus-agent
 Xsbin/argusctl
 Xsbin/argusd
 X%%APACHEETCDIR%%/Includes/argus-monitor.conf.sample
 Xwww/argus-monitor/docroot/argus.css
 Xwww/argus-monitor/docroot/argus.js
 Xwww/argus-monitor/docroot/img/argus.logo.gif
 Xwww/argus-monitor/docroot/img/nospkr.gif
 Xwww/argus-monitor/docroot/img/sad.gif
 Xwww/argus-monitor/docroot/img/sadred.gif
 Xwww/argus-monitor/docroot/img/smile.gif
 Xwww/argus-monitor/docroot/sound/whoopwhoop.wav
 Xwww/argus-monitor/cgi-bin/arguscgi
 Xwww/argus-monitor/cgi-bin/argusvxml
 X@dirrm lib/argus-monitor/DNS
 X@dirrm lib/argus-monitor/Chart
 X@dirrm lib/argus-monitor/Argus/SIP
 X@dirrm lib/argus-monitor/Argus/RPC
 X@dirrm lib/argus-monitor/Argus/MonEl
 X@dirrm lib/argus-monitor/Argus/Web
 X@dirrm lib/argus-monitor/Argus/SNMP
 X@dirrm lib/argus-monitor/Argus/Graph
 X@dirrm lib/argus-monitor/Argus
 X@dirrm lib/argus-monitor/DARP
 X@dirrm lib/argus-monitor/Encoding/BER
 X@dirrm lib/argus-monitor/Encoding
 X@dirrm lib/argus-monitor
 X@dirrm etc/argus-monitor/stats
 X@dirrm etc/argus-monitor/perl
 X@dirrm etc/argus-monitor/notify
 X@dirrm etc/argus-monitor/locale
 X@dirrm etc/argus-monitor/html
 X@dirrm etc/argus-monitor/gdata
 X@dirrm etc/argus-monitor/gcache
 X@dirrm etc/argus-monitor
 X@dirrm www/argus-monitor/docroot/img
 X@dirrm www/argus-monitor/docroot/sound
 X@dirrm www/argus-monitor/docroot
 X@dirrm www/argus-monitor/cgi-bin
 X@dirrm www/argus-monitor
 END-of-argus-monitor/pkg-plist
 echo x - argus-monitor/files/apache.conf.in
 sed 's/^X//' >argus-monitor/files/apache.conf.in << 'END-of-argus-monitor/files/apache.conf.in'
 X
 X
 X# The CGI script is served from the default apache
 X# cgi-bin directory; we single this URL out from
 X# the normal alias parsing below.
 X#
 XScriptAliasMatch ^/argus/$ "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin/arguscgi"
 XScriptAlias ^/argus/cgi-bin/$ "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin/"
 X
 X<Directory "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin">
 X	options ExecCGI
 X	AllowOverride none
 X	allow from all
 X</Directory>
 X
 X# Support for the logo, css and javascript files. The minimal set
 X# needed are /sound/whoopwhoop.wav, /img/argus.logo.gif, /img/smile.gif
 X# /img/sad.gif, /img/nospkr.gif and on top level /argus.css and 
 X# optionally /argus.js.
 X#
 XAlias /argus/ "%%PREFIX%%/www/%%PORTNAME%%/docroot/"
 X
 X<Directory "%%PREFIX%%/www/%%PORTNAME%%/docroot">
 X	options none
 X	AllowOverride none
 X	allow from all
 X</Directory>
 END-of-argus-monitor/files/apache.conf.in
 echo x - argus-monitor/files/argusd.in
 sed 's/^X//' >argus-monitor/files/argusd.in << 'END-of-argus-monitor/files/argusd.in'
 X#!/bin/sh
 X
 X# PROVIDE: argusd
 X#
 X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 X# to enable this service:
 X#
 X# argusd_enable (bool):   Set to NO by default.
 X#               Set it to YES to enable argusd
 X#
 X
 X. /etc/rc.subr
 X
 Xname="argusd"
 Xrcvar=${name}_enable
 X
 Xcommand=%%PREFIX%%/sbin/${name}
 X# pidfile=/var/run/${name}.pid
 Xrequired_files="
 X	%%PREFIX%%/etc/argus-monitor/log \
 X	%%PREFIX%%/etc/argus-monitor/notno \
 X	%%PREFIX%%/etc/argus-monitor/config \
 X	%%PREFIX%%/etc/argus-monitor/users"
 X
 Xstop_cmd="%%PREFIX%%/sbin/argusctl shutdown reason=\"rc.argusd stop\""
 X
 Xstart_precmd="/usr/bin/touch %%PREFIX%%/etc/argus-monitor/log"
 Xextra_commands="console hup"
 Xconsole_cmd="%%PREFIX%%/sbin/argusctl -k console"
 Xhup_cmd="%%PREFIX%%/sbin/argusctl -k hup"
 X
 X
 Xload_rc_config $name
 X
 X: ${argusd_enable="NO"}
 X
 Xrun_rc_command "$1"
 END-of-argus-monitor/files/argusd.in
 echo x - argus-monitor/files/patch.001
 sed 's/^X//' >argus-monitor/files/patch.001 << 'END-of-argus-monitor/files/patch.001'
 XIndex: src/Argus::SNMP.pm
 X===================================================================
 X--- src/Argus::SNMP.pm	(revision 674)
 X+++ src/Argus::SNMP.pm	(revision 677)
 X@@ -19,6 +19,8 @@
 X use Argus::SNMP::Helper;
 X my( $HAVE_MD5, $HAVE_SHA1, $HAVE_HMAC, $HAVE_DES, $HAVE_AES);
 X 
 X+$::path_snmptranslate = 'snmptranslate' unless defined $::path_snmptranslate;
 X+
 X BEGIN {
 X     # these are used for SNMPv3 auth + priv
 X     eval{ require Digest::MD5;     $HAVE_MD5  = 1; };
 X@@ -330,10 +332,13 @@
 X 	$me->{uname} = "SNMP_$table\_$idx\_$me->{ip}{hostname}";
 X 
 X 	$me->helper_init($cf);
 X-    }else{
 X+    } else {
 X 	return $cf->error( "invalid OID ($me->{snmp}{oid})" );
 X-    }
 X-    
 X+    };
 X+
 X+    ($me->{info}) = oid2info($oid)
 X+        unless defined $me->{info};
 X+
 X     $me;
 X }
 X 
 X@@ -1034,26 +1039,96 @@
 X ################################################################
 X # read-config callback
 X # load MIB2SCHEMA format file of name to oid translations
 X+# Typically generated with something like
 X+#       snmptranslate -mALL -Tz
 X+#
 X sub load_mibfile {
 X     my $file = shift;
 X+       
 X+    for my $f (split /\s+/, $file){
 X+        # If the magic name 'auto' is used - try to create an automatic
 X+        # mib2schema file using a net-snmp tool. Cache this file if
 X+        # possible - but regenerate as needed.
 X+        #
 X+        if ($f eq 'auto') {
 X+                $f = "$::path_snmptranslate -mALL -Tz |";
 X+                my $cache = $::datadir.'/gcache/mib2schema.txt';
 X+                if ((!-r $cache) && (open MIB, '>'.$cache) && (open TRS, $f)) {
 X+                        print MIB "# Generated from $f - ".scalar(gmtime(time))."\n";
 X+                        while(<TRS>) { print MIB; };
 X+                        close TRS; 
 X+                        close MIB and $f = $cache;
 X+                };
 X+        };
 X 
 X-    for my $f (split /\s+/, $file){
 X 	unless( open(MIB, $f) ){
 X-	    ::warning("cannot open mibfile '$file': $!");
 X+	    ::warning("cannot open mibfile '$f' (from '$file'): $!");
 X 	    next;
 X 	}
 X-	
 X-	while(<MIB>){
 X+       
 X+        my($name, $oid);
 X+	while(<MIB>) {
 X 	    chop;
 X 	    s/\"//g;
 X-	    my($name, $oid) = split /\s+/;
 X+            s/^\s+//g;
 X+            s/\s+$//g;
 X+            s/\s+/ /g;
 X+	    next unless ($name, $oid) = split /\s+/;
 X 	    $OIDS{$name} = { oid => $oid }; # RSN more...
 X 	}
 X 	close MIB;
 X     }
 X }
 X 
 X+# IF-MIB::ifHCOutOctets
 X+# ifHCOutOctets OBJECT-TYPE
 X+#   -- FROM       IF-MIB
 X+#   SYNTAX        Counter64
 X+#   MAX-ACCESS    read-only
 X+#   STATUS        current
 X+#   DESCRIPTION   "The total number of octets transmitted out of the
 X+#             interface, including framing characters.  This object is a
 X+#             64-bit version of ifOutOctets.
 X+# 
 X+#             Discontinuities in the value of this counter can occur at
 X+#             re-initialization of the management system, and at other
 X+#             times as indicated by the value of
 X+#             ifCounterDiscontinuityTime."
 X+# ::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) ifMIB(31) ifMIBObjects(1) ifXTable(1) ifXEntry(1) 10 }
 X 
 X+my %oid2info = ();
 X+sub oid2info {
 X+        my ($oid) = @_;
 X+
 X+        return () 
 X+                unless $oid =~ m/^[\d\.]+$/;
 X+
 X+        return @{$oid2info{$oid}}
 X+                if defined $oid2info{$oid};
 X+
 X+        my $cache = $::datadir.'/gcache/'.$oid.'.txt';
 X+        return (<FH>) 
 X+                if (open(FH,$cache));
 X+
 X+        # Intentionally ignore errors - so we 'cache' these too.
 X+        #
 X+        open(FH,"$::path_snmptranslate -mALL -Td $oid|");
 X+        my $body = join('',<FH>);
 X+        close(FH);
 X+
 X+        my $syn = $1 if $body =~ m/SYNTAX\s+(\w+)/s;
 X+        my $desc = $1 if $body =~ m/\s+DESCRIPTION\s+\"([^"]+)\"/s;
 X+
 X+        $desc  =~ s/\r?\n\r?\n/<p>/g;
 X+        $desc  =~ s/\s+/ /g;
 X+
 X+        # We also try to cache 'non' results
 X+        if (open(CH,'>'.$cache)) { print CH "$desc\n$syn\n";close(CH); };
 X+        $oid2info{$oid} = \[$desc,$syn];
 X+        return ($desc,$syn);
 X+};
 X+
 X+
 X ################################################################
 X 
 X Doc::register( $doc );
 XIndex: src/Conf.pm
 X===================================================================
 X--- src/Conf.pm	(revision 674)
 X+++ src/Conf.pm	(revision 677)
 X@@ -84,10 +84,10 @@
 X 	},
 X 
 X 	mibfile => {
 X-	    descr => 'pathname of SNMP MIB translation file (MIB2SCHEMA format)',
 X+	    descr => 'pathname of SNMP MIB translation file (MIB2SCHEMA format). Use "auto" to create one on the fly based on "snmptranslate" its mALL MIB collection. "auto" requires the net snmp package to be installed.',
 X 	    attrs => ['config', 'top', 'multi'],
 X 	    versn => '3.5',
 X-	    callback => \&SNMP::load_mibfile,
 X+	    callback => \&Argus::SNMP::load_mibfile,
 X 	},
 X 	
 X 	resolv_timeout => {
 XIndex: src/Service.pm
 X===================================================================
 X--- src/Service.pm	(revision 674)
 X+++ src/Service.pm	(revision 677)
 X@@ -676,7 +676,7 @@
 X 	if( $k eq 'ovstatus' || $k eq 'flags' ){
 X 	    $vv = "<L10N $v>";
 X 	}
 X-	print $fh "<TR><TD><L10N $kk></TD><TD$x>$vv</TD></TR>\n" if defined($v);
 X+	print $fh "<TR><TD VALIGN=TOP><L10N $kk></TD><TD$x>$vv</TD></TR>\n" if defined($v);
 X 	if( $k eq 'ovstatus' && $v eq 'down' && $s->{showreason} && $s->{reason} ){
 X 	    print $fh "<TR><TD>...<L10N because></TD><TD>$me->{srvc}{reason}</TD></TR>\n";
 X 	}
 XIndex: examples/config-new-features
 X===================================================================
 X--- examples/config-new-features	(revision 674)
 X+++ examples/config-new-features	(revision 677)
 X@@ -348,3 +348,13 @@
 X notifyaudit:	auditlog:
 X 
 X 
 X+# Load a MIB2SCHEMA translation file (white space separated OID/human-readable name). Typically
 X+# generated with the 'snmptranslate' command form toolkits such at net-snmp.
 X+#
 X+mibfile: /var/argus/mibs.txt
 X+
 X+# The magic filename 'auto' will generate above (and cache such in gcache) using
 X+# the 'ALL' mibs known to net-snmp. Requires the latter to be installed.
 X+#
 X+mibfile: auto
 X+
 END-of-argus-monitor/files/patch.001
 echo x - argus-monitor/files/pkg-message.in
 sed 's/^X//' >argus-monitor/files/pkg-message.in << 'END-of-argus-monitor/files/pkg-message.in'
 X================================================================================
 XAn apache configuration file has been created which maps /%%PORTNAME%%/:
 X
 X  %%PREFIX%%/%%APACHEETCDIR%%/Includes/%%PORTNAME%%.conf.sample
 X  %%PREFIX%%/%%APACHEETCDIR%%/Includes/%%PORTNAME%%.conf.sample
 X
 XEdit it, move it in place. Next move and edit 
 X
 X	%%PREFIX%%/etc/%%PORTNAME%%/config.example 
 X	%%PREFIX%%/etc/%%PORTNAME%%/users.example 
 X
 Xinto place, then restart apache.
 X
 XEnsure that ensure that argus_enable=YES is set in your rc.conf prior to
 Xstarting the argusd daemon.
 X
 X================================================================================
 END-of-argus-monitor/files/pkg-message.in
 exit
 
 
 --Apple-Mail-50--81053636--

Date: Mon, 30 Aug 2010 10:25:38 +0200
From: Dirk-Willem van Gulik <dirkx@webweaving.org>
To: freebsd-ports-bugs@FreeBSD.org
Cc: David Gilbert <dave@daveg.ca>, brock@cotcomsol.com
Subject: [ports/146713]: [patch] net-mgmt/argus-monitor update

 --Apple-Mail-24--88376253
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 Updated patch.
 
 Dw.
 
 
 --Apple-Mail-24--88376253
 Content-Disposition: attachment;
 	filename=argus-monitor.shar
 Content-Type: application/octet-stream;
 	name="argus-monitor.shar"
 Content-Transfer-Encoding: 7bit
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	argus-monitor
 #	argus-monitor/Makefile
 #	argus-monitor/distinfo
 #	argus-monitor/files
 #	argus-monitor/pkg-descr
 #	argus-monitor/pkg-plist
 #	argus-monitor/files/apache.conf.in
 #	argus-monitor/files/argusd.in
 #	argus-monitor/files/patch.001
 #	argus-monitor/files/pkg-message.in
 #
 echo c - argus-monitor
 mkdir -p argus-monitor > /dev/null 2>&1
 echo x - argus-monitor/Makefile
 sed 's/^X//' >argus-monitor/Makefile << 'END-of-argus-monitor/Makefile'
 X# New ports collection makefile for:	argus-monitor
 X# Date created:				18 November 2006
 X# Whom:					brock@cotcomsol.com
 X#
 X# $FreeBSD: ports/net-mgmt/argus-monitor/Makefile,v 1.5 2010/03/28 06:41:50 dinoex Exp $
 X#
 X
 XPORTNAME=	argus-monitor
 XPORTVERSION=	20100109
 XPORTREVISION=	4
 XCATEGORIES=	net-mgmt
 XMASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 XDISTNAME=	argus-dev-${PORTVERSION}
 XEXTRACT_SUFX=	.tgz
 X
 XMAINTAINER=	brock@cotcomsol.com
 XCOMMENT=	Argus - The All Seeing System and Network Monitoring Software
 X
 XSUB_FILES=	pkg-message apache.conf
 XSUB_LIST=	PORTNAME=${PORTNAME} APACHEETCDIR=${APACHEETCDIR}
 XPKGMESSAGE=	${WRKDIR}/pkg-message
 XEXTRA_PATCHES=	${FILESDIR}/patch.001
 X
 XLICENSE=	ART10
 X
 XWRKSRC=		${WRKDIR}/${DISTNAME}
 XUSE_PERL5=	yes
 XUSE_RC_SUBR=	argusd
 XHAS_CONFIGURE=	yes
 XUSE_APACHE=     1.3+
 XCONFIGURE_SCRIPT=	Configure
 XCONFIGURE_ARGS=	--bin_dir=${PREFIX}/bin --sbin_dir=${PREFIX}/sbin \
 X		--lib_dir=${PREFIX}/lib/argus-monitor --data_dir=${PREFIX}/etc/argus-monitor \
 X		--cgi_dir=${PREFIX}/www/${PORTNAME}/cgi-bin
 X
 XOPTIONS=	QPAGE	"qpage support" Off \
 X		FPING	"fping support" Off \
 X		GD	"GD graphics support" On
 X
 X.include <bsd.port.pre.mk>
 X
 X.if defined(WITH_QPAGE)
 XRUN_DEPENDS+=	qpage:${PORTSDIR}/comms/qpage
 XBUILD_DEPENDS+=	qpage:${PORTSDIR}/comms/qpage
 X.endif
 X
 X.if defined(WITH_FPING)
 XRUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 XBUILD_DEPENDS+=	fping:${PORTSDIR}/net/fping
 X.endif
 X
 X.if !defined(WITHOUT_GD)
 XBUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 XRUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD
 X.endif
 X
 Xpost-install:
 X	${MKDIR} ${PREFIX}/www/${PORTNAME} ${PREFIX}/www/${PORTNAME}/docroot ${PREFIX}/www/${PORTNAME}/docroot/img ${PREFIX}/www/${PORTNAME}/docroot/sound ${PREFIX}/etc/argus-monitor/notify
 X	${CP} ${WRKSRC}/misc/argus.css ${WRKSRC}/misc/argus.js  ${PREFIX}/www/${PORTNAME}/docroot
 X	${CP} ${WRKSRC}/misc/argus.logo.gif ${WRKSRC}/misc/nospkr.gif ${WRKSRC}/misc/sad.gif ${WRKSRC}/misc/sadred.gif ${WRKSRC}/misc/smile.gif	${PREFIX}/www/${PORTNAME}/docroot/img
 X	${CP} ${WRKSRC}/misc/whoopwhoop.wav ${PREFIX}/www/${PORTNAME}/docroot/sound
 X	${TOUCH} ${PREFIX}/etc/argus-monitor/notno ${PREFIX}/etc/argus-monitor/log
 X	${CHMOD} 755 ${PREFIX}/www/${PORTNAME} ${PREFIX}/www/${PORTNAME}/docroot ${PREFIX}/www/${PORTNAME}/docroot/img ${PREFIX}/www/${PORTNAME}/docroot/sound ${PREFIX}/etc/argus-monitor/notify
 X	${CHMOD} 644 ${PREFIX}/www/${PORTNAME}/docroot/argus.* ${PREFIX}/www/${PORTNAME}/docroot/img/*.gif ${PREFIX}/www/${PORTNAME}/docroot/sound/*.wav ${PREFIX}/etc/argus-monitor/notno ${PREFIX}/etc/argus-monitor/log
 X	${INSTALL_DATA} ${WRKDIR}/apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/${PORTNAME}.conf.sample
 X	@{ECHO_CMD}
 X	@${CAT} ${PKGMESSAGE}
 X
 X.include <bsd.port.post.mk>
 END-of-argus-monitor/Makefile
 echo x - argus-monitor/distinfo
 sed 's/^X//' >argus-monitor/distinfo << 'END-of-argus-monitor/distinfo'
 XMD5 (argus-dev-20100109.tgz) = 98ecd7a18c18ce8f310e03e038be988f
 XSHA256 (argus-dev-20100109.tgz) = c6879862f282a5f22db705e6c416a4c40aaba3de8e59b373c0d53b35a3d1347c
 XSIZE (argus-dev-20100109.tgz) = 389465
 END-of-argus-monitor/distinfo
 echo c - argus-monitor/files
 mkdir -p argus-monitor/files > /dev/null 2>&1
 echo x - argus-monitor/pkg-descr
 sed 's/^X//' >argus-monitor/pkg-descr << 'END-of-argus-monitor/pkg-descr'
 X* Argus is a system and network monitoring application.
 X* It will monitor nearly anything you ask it to monitor (TCP + UDP
 X  applications, IP connectivity, SNMP OIDS, Programs, Databases,
 X  etc).
 X* It presents a nice clean, easy to view web interface that will keep both the
 X  managers happy (Red Bad. Green Good.) and the techs happy ("Ah! that's what
 X  the problem is").
 X* It can send alerts numerous ways (such as via pager) and can automatically
 X  escalate if someone falls asleep.
 X
 XWWW: http://argus.tcp4me.com/
 END-of-argus-monitor/pkg-descr
 echo x - argus-monitor/pkg-plist
 sed 's/^X//' >argus-monitor/pkg-plist << 'END-of-argus-monitor/pkg-plist'
 Xbin/argus-config
 Xetc/argus-monitor/config.example
 Xetc/argus-monitor/locale/de_DE
 Xetc/argus-monitor/locale/el_gr
 Xetc/argus-monitor/locale/fr_fr
 Xetc/argus-monitor/locale/lt_LT
 Xetc/argus-monitor/locale/nl_NL
 Xetc/argus-monitor/locale/ru_RU
 Xetc/argus-monitor/locale/piglatin
 Xetc/argus-monitor/locale/sp_ar
 Xetc/argus-monitor/locale/template
 Xetc/argus-monitor/log
 Xetc/argus-monitor/notno
 Xetc/argus-monitor/users.example
 Xlib/argus-monitor/Alias.pm
 Xlib/argus-monitor/Argus/Agent.pm
 Xlib/argus-monitor/Argus/Asterisk.pm
 Xlib/argus-monitor/Argus/Ctl.pm
 Xlib/argus-monitor/Argus/Encode.pm
 Xlib/argus-monitor/Argus/IP.pm
 Xlib/argus-monitor/Argus/RPC.pm
 Xlib/argus-monitor/Argus/RPC/TCP.pm
 Xlib/argus-monitor/Argus/RPC/UDP.pm
 Xlib/argus-monitor/Argus/SIP.pm
 Xlib/argus-monitor/Argus/SIP/TCP.pm
 Xlib/argus-monitor/Argus/SIP/UDP.pm
 Xlib/argus-monitor/Artistic
 Xlib/argus-monitor/BaseIO.pm
 Xlib/argus-monitor/Chart/Strip.pm
 Xlib/argus-monitor/Commands.pm
 Xlib/argus-monitor/Conf.pm
 Xlib/argus-monitor/Configable.pm
 Xlib/argus-monitor/Control.pm
 Xlib/argus-monitor/Cron.pm
 Xlib/argus-monitor/DNS.pm
 Xlib/argus-monitor/DNS/TCP.pm
 Xlib/argus-monitor/DNS/UDP.pm
 Xlib/argus-monitor/DataBase.pm
 Xlib/argus-monitor/Doc.pm
 Xlib/argus-monitor/Error.pm
 Xlib/argus-monitor/Graph.pm
 Xlib/argus-monitor/Group.pm
 Xlib/argus-monitor/LICENSE
 Xlib/argus-monitor/LOCATION
 Xlib/argus-monitor/MonEl.pm
 Xlib/argus-monitor/NotMe.pm
 Xlib/argus-monitor/Notify.pm
 Xlib/argus-monitor/NullConf.pm
 Xlib/argus-monitor/NullCtl.pm
 Xlib/argus-monitor/Override.pm
 Xlib/argus-monitor/Ping.pm
 Xlib/argus-monitor/Prog.pm
 Xlib/argus-monitor/README
 Xlib/argus-monitor/Resolv.pm
 Xlib/argus-monitor/SSL.pm
 Xlib/argus-monitor/Self.pm
 Xlib/argus-monitor/Server.pm
 Xlib/argus-monitor/Service.pm
 Xlib/argus-monitor/Stats.pm
 Xlib/argus-monitor/TCP.pm
 Xlib/argus-monitor/TestPort.pm
 Xlib/argus-monitor/UDP.pm
 Xlib/argus-monitor/UserCron.pm
 Xlib/argus-monitor/Web.pm
 Xlib/argus-monitor/conf.pl
 Xlib/argus-monitor/graphd
 Xlib/argus-monitor/localization.pl
 Xlib/argus-monitor/misc.pl
 Xlib/argus-monitor/picasso
 Xlib/argus-monitor/web_about.pl
 Xlib/argus-monitor/web_acl.pl
 Xlib/argus-monitor/web_auth_file.pl
 Xlib/argus-monitor/web_graph.pl
 Xlib/argus-monitor/web_login.pl
 Xlib/argus-monitor/web_misc.pl
 Xlib/argus-monitor/web_notify.pl
 Xlib/argus-monitor/web_override.pl
 Xlib/argus-monitor/web_page.pl
 Xlib/argus-monitor/web_utils.pl
 Xlib/argus-monitor/Argus/HashDir.pm
 Xlib/argus-monitor/Argus/MonEl/Expand.pm
 Xlib/argus-monitor/Argus/MonEl/Noise.pm
 Xlib/argus-monitor/Argus/MonEl/Trans.pm
 Xlib/argus-monitor/Argus/Archivist.pm
 Xlib/argus-monitor/Argus/Archive.pm
 Xlib/argus-monitor/Argus/Web/Overview.pm
 Xlib/argus-monitor/Argus/ReadConfig.pm
 Xlib/argus-monitor/Argus/Schedule.pm
 Xlib/argus-monitor/Argus/SNMP.pm
 Xlib/argus-monitor/Argus/SNMP/Helper.pm
 Xlib/argus-monitor/Argus/Freeswitch.pm
 Xlib/argus-monitor/Argus/Compute.pm
 Xlib/argus-monitor/Argus/Graph/Data.pm
 Xlib/argus-monitor/Encoding/BER.pm
 Xlib/argus-monitor/Encoding/BER/SNMP.pm
 Xlib/argus-monitor/DARP.pm
 Xlib/argus-monitor/DARP/Master.pm
 Xlib/argus-monitor/DARP/Slave.pm
 Xlib/argus-monitor/DARP/Service.pm
 Xlib/argus-monitor/DARP/Conf.pm
 Xlib/argus-monitor/DARP/Watch.pm
 Xlib/argus-monitor/DARP/Misc.pm
 Xlib/argus-monitor/web_web20.pl
 Xsbin/argus-agent
 Xsbin/argusctl
 Xsbin/argusd
 X%%APACHEETCDIR%%/Includes/argus-monitor.conf.sample
 Xwww/argus-monitor/docroot/argus.css
 Xwww/argus-monitor/docroot/argus.js
 Xwww/argus-monitor/docroot/img/argus.logo.gif
 Xwww/argus-monitor/docroot/img/nospkr.gif
 Xwww/argus-monitor/docroot/img/sad.gif
 Xwww/argus-monitor/docroot/img/sadred.gif
 Xwww/argus-monitor/docroot/img/smile.gif
 Xwww/argus-monitor/docroot/sound/whoopwhoop.wav
 Xwww/argus-monitor/cgi-bin/arguscgi
 Xwww/argus-monitor/cgi-bin/argusvxml
 X@dirrm lib/argus-monitor/DNS
 X@dirrm lib/argus-monitor/Chart
 X@dirrm lib/argus-monitor/Argus/SIP
 X@dirrm lib/argus-monitor/Argus/RPC
 X@dirrm lib/argus-monitor/Argus/MonEl
 X@dirrm lib/argus-monitor/Argus/Web
 X@dirrm lib/argus-monitor/Argus/SNMP
 X@dirrm lib/argus-monitor/Argus/Graph
 X@dirrm lib/argus-monitor/Argus
 X@dirrm lib/argus-monitor/DARP
 X@dirrm lib/argus-monitor/Encoding/BER
 X@dirrm lib/argus-monitor/Encoding
 X@dirrm lib/argus-monitor
 X@dirrm etc/argus-monitor/stats
 X@dirrm etc/argus-monitor/perl
 X@dirrm etc/argus-monitor/notify
 X@dirrm etc/argus-monitor/locale
 X@dirrm etc/argus-monitor/html
 X@dirrm etc/argus-monitor/gdata
 X@dirrm etc/argus-monitor/gcache
 X@dirrm etc/argus-monitor
 X@dirrm www/argus-monitor/docroot/img
 X@dirrm www/argus-monitor/docroot/sound
 X@dirrm www/argus-monitor/docroot
 X@dirrm www/argus-monitor/cgi-bin
 X@dirrm www/argus-monitor
 END-of-argus-monitor/pkg-plist
 echo x - argus-monitor/files/apache.conf.in
 sed 's/^X//' >argus-monitor/files/apache.conf.in << 'END-of-argus-monitor/files/apache.conf.in'
 X
 X
 X# The CGI script is served from the default apache
 X# cgi-bin directory; we single this URL out from
 X# the normal alias parsing below.
 X#
 XScriptAliasMatch ^/argus/$ "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin/arguscgi"
 XScriptAlias ^/argus/cgi-bin/$ "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin/"
 X
 X<Directory "%%PREFIX%%/www/%%PORTNAME%%/cgi-bin">
 X	options ExecCGI
 X	AllowOverride none
 X	allow from all
 X</Directory>
 X
 X# Support for the logo, css and javascript files. The minimal set
 X# needed are /sound/whoopwhoop.wav, /img/argus.logo.gif, /img/smile.gif
 X# /img/sad.gif, /img/nospkr.gif and on top level /argus.css and 
 X# optionally /argus.js.
 X#
 XAlias /argus/ "%%PREFIX%%/www/%%PORTNAME%%/docroot/"
 X
 X<Directory "%%PREFIX%%/www/%%PORTNAME%%/docroot">
 X	options none
 X	AllowOverride none
 X	allow from all
 X</Directory>
 END-of-argus-monitor/files/apache.conf.in
 echo x - argus-monitor/files/argusd.in
 sed 's/^X//' >argus-monitor/files/argusd.in << 'END-of-argus-monitor/files/argusd.in'
 X#!/bin/sh
 X
 X# PROVIDE: argusd
 X#
 X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 X# to enable this service:
 X#
 X# argusd_enable (bool):   Set to NO by default.
 X#               Set it to YES to enable argusd
 X#
 X
 X. /etc/rc.subr
 X
 Xname="argusd"
 Xrcvar=${name}_enable
 X
 Xcommand=%%PREFIX%%/sbin/${name}
 X# pidfile=/var/run/${name}.pid
 Xrequired_files="
 X	%%PREFIX%%/etc/argus-monitor/log \
 X	%%PREFIX%%/etc/argus-monitor/notno \
 X	%%PREFIX%%/etc/argus-monitor/config \
 X	%%PREFIX%%/etc/argus-monitor/users"
 X
 Xstop_cmd="%%PREFIX%%/sbin/argusctl shutdown reason=\"rc.argusd stop\""
 X
 Xstart_precmd="/usr/bin/touch %%PREFIX%%/etc/argus-monitor/log"
 Xextra_commands="console hup"
 Xconsole_cmd="%%PREFIX%%/sbin/argusctl -k console"
 Xhup_cmd="%%PREFIX%%/sbin/argusctl -k hup"
 X
 X
 Xload_rc_config $name
 X
 X: ${argusd_enable="NO"}
 X
 Xrun_rc_command "$1"
 END-of-argus-monitor/files/argusd.in
 echo x - argus-monitor/files/patch.001
 sed 's/^X//' >argus-monitor/files/patch.001 << 'END-of-argus-monitor/files/patch.001'
 XIndex: src/Argus::SNMP.pm
 X===================================================================
 X--- src/Argus::SNMP.pm	(revision 674)
 X+++ src/Argus::SNMP.pm	(revision 677)
 X@@ -19,6 +19,8 @@
 X use Argus::SNMP::Helper;
 X my( $HAVE_MD5, $HAVE_SHA1, $HAVE_HMAC, $HAVE_DES, $HAVE_AES);
 X 
 X+$::path_snmptranslate = 'snmptranslate' unless defined $::path_snmptranslate;
 X+
 X BEGIN {
 X     # these are used for SNMPv3 auth + priv
 X     eval{ require Digest::MD5;     $HAVE_MD5  = 1; };
 X@@ -330,10 +332,13 @@
 X 	$me->{uname} = "SNMP_$table\_$idx\_$me->{ip}{hostname}";
 X 
 X 	$me->helper_init($cf);
 X-    }else{
 X+    } else {
 X 	return $cf->error( "invalid OID ($me->{snmp}{oid})" );
 X-    }
 X-    
 X+    };
 X+
 X+    ($me->{info}) = oid2info($oid)
 X+        unless defined $me->{info};
 X+
 X     $me;
 X }
 X 
 X@@ -1034,26 +1039,96 @@
 X ################################################################
 X # read-config callback
 X # load MIB2SCHEMA format file of name to oid translations
 X+# Typically generated with something like
 X+#       snmptranslate -mALL -Tz
 X+#
 X sub load_mibfile {
 X     my $file = shift;
 X+       
 X+    for my $f (split /\s+/, $file){
 X+        # If the magic name 'auto' is used - try to create an automatic
 X+        # mib2schema file using a net-snmp tool. Cache this file if
 X+        # possible - but regenerate as needed.
 X+        #
 X+        if ($f eq 'auto') {
 X+                $f = "$::path_snmptranslate -mALL -Tz |";
 X+                my $cache = $::datadir.'/gcache/mib2schema.txt';
 X+                if ((!-r $cache) && (open MIB, '>'.$cache) && (open TRS, $f)) {
 X+                        print MIB "# Generated from $f - ".scalar(gmtime(time))."\n";
 X+                        while(<TRS>) { print MIB; };
 X+                        close TRS; 
 X+                        close MIB and $f = $cache;
 X+                };
 X+        };
 X 
 X-    for my $f (split /\s+/, $file){
 X 	unless( open(MIB, $f) ){
 X-	    ::warning("cannot open mibfile '$file': $!");
 X+	    ::warning("cannot open mibfile '$f' (from '$file'): $!");
 X 	    next;
 X 	}
 X-	
 X-	while(<MIB>){
 X+       
 X+        my($name, $oid);
 X+	while(<MIB>) {
 X 	    chop;
 X 	    s/\"//g;
 X-	    my($name, $oid) = split /\s+/;
 X+            s/^\s+//g;
 X+            s/\s+$//g;
 X+            s/\s+/ /g;
 X+	    next unless ($name, $oid) = split /\s+/;
 X 	    $OIDS{$name} = { oid => $oid }; # RSN more...
 X 	}
 X 	close MIB;
 X     }
 X }
 X 
 X+# IF-MIB::ifHCOutOctets
 X+# ifHCOutOctets OBJECT-TYPE
 X+#   -- FROM       IF-MIB
 X+#   SYNTAX        Counter64
 X+#   MAX-ACCESS    read-only
 X+#   STATUS        current
 X+#   DESCRIPTION   "The total number of octets transmitted out of the
 X+#             interface, including framing characters.  This object is a
 X+#             64-bit version of ifOutOctets.
 X+# 
 X+#             Discontinuities in the value of this counter can occur at
 X+#             re-initialization of the management system, and at other
 X+#             times as indicated by the value of
 X+#             ifCounterDiscontinuityTime."
 X+# ::= { iso(1) org(3) dod(6) internet(1) mgmt(2) mib-2(1) ifMIB(31) ifMIBObjects(1) ifXTable(1) ifXEntry(1) 10 }
 X 
 X+my %oid2info = ();
 X+sub oid2info {
 X+        my ($oid) = @_;
 X+
 X+        return () 
 X+                unless $oid =~ m/^[\d\.]+$/;
 X+
 X+        return @{$oid2info{$oid}}
 X+                if defined $oid2info{$oid};
 X+
 X+        my $cache = $::datadir.'/gcache/'.$oid.'.txt';
 X+        return (<FH>) 
 X+                if (open(FH,$cache));
 X+
 X+        # Intentionally ignore errors - so we 'cache' these too.
 X+        #
 X+        open(FH,"$::path_snmptranslate -mALL -Td $oid|");
 X+        my $body = join('',<FH>);
 X+        close(FH);
 X+
 X+        my $syn = $1 if $body =~ m/SYNTAX\s+(\w+)/s;
 X+        my $desc = $1 if $body =~ m/\s+DESCRIPTION\s+\"([^"]+)\"/s;
 X+
 X+        $desc  =~ s/\r?\n\r?\n/<p>/g;
 X+        $desc  =~ s/\s+/ /g;
 X+
 X+        # We also try to cache 'non' results
 X+        if (open(CH,'>'.$cache)) { print CH "$desc\n$syn\n";close(CH); };
 X+        $oid2info{$oid} = \[$desc,$syn];
 X+        return ($desc,$syn);
 X+};
 X+
 X+
 X ################################################################
 X 
 X Doc::register( $doc );
 XIndex: src/Conf.pm
 X===================================================================
 X--- src/Conf.pm	(revision 674)
 X+++ src/Conf.pm	(revision 677)
 X@@ -84,10 +84,10 @@
 X 	},
 X 
 X 	mibfile => {
 X-	    descr => 'pathname of SNMP MIB translation file (MIB2SCHEMA format)',
 X+	    descr => 'pathname of SNMP MIB translation file (MIB2SCHEMA format). Use "auto" to create one on the fly based on "snmptranslate" its mALL MIB collection. "auto" requires the net snmp package to be installed.',
 X 	    attrs => ['config', 'top', 'multi'],
 X 	    versn => '3.5',
 X-	    callback => \&SNMP::load_mibfile,
 X+	    callback => \&Argus::SNMP::load_mibfile,
 X 	},
 X 	
 X 	resolv_timeout => {
 XIndex: src/Service.pm
 X===================================================================
 X--- src/Service.pm	(revision 674)
 X+++ src/Service.pm	(revision 677)
 X@@ -676,7 +676,7 @@
 X 	if( $k eq 'ovstatus' || $k eq 'flags' ){
 X 	    $vv = "<L10N $v>";
 X 	}
 X-	print $fh "<TR><TD><L10N $kk></TD><TD$x>$vv</TD></TR>\n" if defined($v);
 X+	print $fh "<TR><TD VALIGN=TOP><L10N $kk></TD><TD$x>$vv</TD></TR>\n" if defined($v);
 X 	if( $k eq 'ovstatus' && $v eq 'down' && $s->{showreason} && $s->{reason} ){
 X 	    print $fh "<TR><TD>...<L10N because></TD><TD>$me->{srvc}{reason}</TD></TR>\n";
 X 	}
 XIndex: examples/config-new-features
 X===================================================================
 X--- examples/config-new-features	(revision 674)
 X+++ examples/config-new-features	(revision 677)
 X@@ -348,3 +348,13 @@
 X notifyaudit:	auditlog:
 X 
 X 
 X+# Load a MIB2SCHEMA translation file (white space separated OID/human-readable name). Typically
 X+# generated with the 'snmptranslate' command form toolkits such at net-snmp.
 X+#
 X+mibfile: /var/argus/mibs.txt
 X+
 X+# The magic filename 'auto' will generate above (and cache such in gcache) using
 X+# the 'ALL' mibs known to net-snmp. Requires the latter to be installed.
 X+#
 X+mibfile: auto
 X+
 END-of-argus-monitor/files/patch.001
 echo x - argus-monitor/files/pkg-message.in
 sed 's/^X//' >argus-monitor/files/pkg-message.in << 'END-of-argus-monitor/files/pkg-message.in'
 X================================================================================
 XAn apache configuration file has been created which maps /%%PORTNAME%%/:
 X
 X  %%PREFIX%%/%%APACHEETCDIR%%/Includes/%%PORTNAME%%.conf.sample
 X  %%PREFIX%%/%%APACHEETCDIR%%/Includes/%%PORTNAME%%.conf.sample
 X
 XEdit it, move it in place. Next move and edit 
 X
 X	%%PREFIX%%/etc/%%PORTNAME%%/config.example 
 X	%%PREFIX%%/etc/%%PORTNAME%%/users.example 
 X
 Xinto place, then restart apache.
 X
 XEnsure that ensure that argus_enable=YES is set in your rc.conf prior to
 Xstarting the argusd daemon.
 X
 X================================================================================
 END-of-argus-monitor/files/pkg-message.in
 exit
 
 
 --Apple-Mail-24--88376253--

From: Dirk-Willem van Gulik <dirkx@webweaving.org>
To: bug-followup@FreeBSD.org, dave@daveg.ca
Cc:  
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Sun, 5 Sep 2010 16:35:06 +0200

 Note that 'shar-1' should be used- shar-2 arrived out of order and has a =
 erroneous 'ECHO' statement in it.
 
 Dw.=
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Thu Sep 16 23:36:07 UTC 2010 
State-Changed-Why:  
Feedback received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146713 

From: Stefan Walter <stefan@freebsd.org>
To: Dirk-Willem van Gulik <dirkx@webweaving.org>
Cc: GNATS <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/146713: [patch] net-mgmt/argus-monitor update
Date: Thu, 11 Nov 2010 16:21:01 +0100

 Hi Dirk-Willem,
 
 you sent a followup to ports/146713 (see [1]) containing a shar file.
 Updates to existing ports should generally be sent in unified diff format
 (as produced by "diff -u"), not as shar files, as diffs make it easier to
 see what changed. Furthermore, the PR already contained a patch to update
 the port, and you didn't add any comment explaining what is different with
 your update.
 
 Could you send a followup to the PR with a unified diff and with some kind
 of explanation?
 
 Regards,
 Stefan
 
 [1]: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146713
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Thu Feb 3 11:14:12 UTC 2011 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146713 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146713: commit references a PR
Date: Thu,  3 Feb 2011 11:14:00 +0000 (UTC)

 arved       2011-02-03 11:13:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-mgmt/argus-monitor Makefile distinfo pkg-plist 
     net-mgmt/argus-monitor/files argusd.in 
   Added files:
     net-mgmt/argus-monitor/files apache.conf.in patch.001 
                                  pkg-message.in 
   Log:
   Update to 20100109
   
   PR:             146713
   Submitted by:   Dirk-Willem van Gulik
   Feature safe:   yes
   
   Revision  Changes    Path
   1.6       +24 -3     ports/net-mgmt/argus-monitor/Makefile
   1.2       +2 -3      ports/net-mgmt/argus-monitor/distinfo
   1.1       +27 -0     ports/net-mgmt/argus-monitor/files/apache.conf.in (new)
   1.3       +14 -1     ports/net-mgmt/argus-monitor/files/argusd.in
   1.1       +180 -0    ports/net-mgmt/argus-monitor/files/patch.001 (new)
   1.1       +17 -0     ports/net-mgmt/argus-monitor/files/pkg-message.in (new)
   1.2       +50 -6     ports/net-mgmt/argus-monitor/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
