From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 11 07:00:20 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7E001065670 for ; Fri, 11 Nov 2011 07:00:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B402F8FC08 for ; Fri, 11 Nov 2011 07:00:20 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pAB70KrE096131 for ; Fri, 11 Nov 2011 07:00:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pAB70K8p096130; Fri, 11 Nov 2011 07:00:20 GMT (envelope-from gnats) Resent-Date: Fri, 11 Nov 2011 07:00:20 GMT Resent-Message-Id: <201111110700.pAB70K8p096130@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, dikshie Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B3C8106564A for ; Fri, 11 Nov 2011 06:53:26 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 3B10B8FC0A for ; Fri, 11 Nov 2011 06:53:26 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pAB6rPpF092744 for ; Fri, 11 Nov 2011 06:53:25 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pAB6rPSh092739; Fri, 11 Nov 2011 06:53:25 GMT (envelope-from nobody) Message-Id: <201111110653.pAB6rPSh092739@red.freebsd.org> Date: Fri, 11 Nov 2011 06:53:25 GMT From: dikshie To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/162460: update net-mgmt/smokeping X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2011 07:00:21 -0000 >Number: 162460 >Category: ports >Synopsis: update net-mgmt/smokeping >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 11 07:00:19 UTC 2011 >Closed-Date: >Last-Modified: >Originator: dikshie >Release: FreeBSD-9 >Organization: Keio University >Environment: FreeBSD sfc-monitor.ai3.net 9.0-RC2 FreeBSD 9.0-RC2 #26: Fri Nov 11 13:00:46 JST 2011 dikshie@sfc-monitor.ai3.net:/usr/obj/usr/src/sys/MONITOR amd64 >Description: devel/p5-Config-Grammar has been added yesterday. let's update net-mgmt/smokeping to the latest one. please review the diff. thanks a lot! >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2011-11-10 20:12:42.000000000 +0900 +++ Makefile 2011-11-11 15:44:16.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= smokeping -PORTVERSION= 2.4.2 -PORTREVISION= 6 +PORTVERSION= 2.6.5 CATEGORIES= net-mgmt www MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ http://smokeping.cs.pu.edu.tw/pub/ @@ -17,10 +16,13 @@ RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \ p5-CGI-Session>0:${PORTSDIR}/www/p5-CGI-Session \ - p5-CGI-SpeedyCGI>0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \ p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \ p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ - p5-libwww>0:${PORTSDIR}/www/p5-libwww + p5-libwww>0:${PORTSDIR}/www/p5-libwww \ + p5-CGI.pm>0:${PORTSDIR}/www/p5-CGI.pm \ + p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \ + p5-Config-Grammar>0:${PORTSDIR}/devel/p5-Config-Grammar \ + p5-Socket6>0:${PORTSDIR}/net/p5-Socket6 NO_BUILD= yes USE_PERL5= yes @@ -207,17 +209,15 @@ ${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/lib/Smokeping.pm \ ${WRKSRC}/lib/Smokeping/Examples.pm \ - ${WRKSRC}/bin/smokeping.dist \ - ${WRKSRC}/bin/tSmoke.dist \ - ${WRKSRC}/htdocs/smokeping.cgi.dist \ - ${WRKSRC}/htdocs/tr.cgi.dist \ + ${WRKSRC}/bin/smokeping \ + ${WRKSRC}/bin/tSmoke \ + ${WRKSRC}/bin/smokeping_cgi \ ${WRKSRC}/etc/config.dist \ ${WRKSRC}/lib/Smokeping/probes/*.pm ${FIND} ${WRKSRC} -name \*.bak -delete - ${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping - ${MV} ${WRKSRC}/bin/tSmoke.dist ${WRKSRC}/bin/tSmoke - ${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi - ${MV} ${WRKSRC}/htdocs/tr.cgi.dist ${WRKSRC}/htdocs/tr.cgi + ${MV} ${WRKSRC}/bin/smokeping ${WRKSRC}/bin/smokeping + ${MV} ${WRKSRC}/bin/tSmoke ${WRKSRC}/bin/tSmoke + ${MV} ${WRKSRC}/bin/smokeping_cgi ${WRKSRC}/htdocs/smokeping.cgi do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin --- distinfo.orig 2011-11-10 20:12:46.000000000 +0900 +++ distinfo 2011-11-10 20:14:34.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (smokeping-2.4.2.tar.gz) = ed8680d1b3fdb2b1efde3aa14b37bf7e9aee2c992c5814061dbd78e6eea00d49 -SIZE (smokeping-2.4.2.tar.gz) = 909514 +SHA256 (smokeping-2.6.5.tar.gz) = 69442272fea30b8eb0182bf081352ab303a1a4de7ca6eb55691efb837a9d9174 +SIZE (smokeping-2.6.5.tar.gz) = 421456 --- patch-bin-smokeping.dist 2011-11-10 20:12:36.000000000 +0900 +++ smokeping.diff 2011-11-11 15:23:20.000000000 +0900 @@ -1,24 +1,22 @@ ---- ./bin/smokeping.dist.orig 2008-10-29 15:03:35.000000000 +0100 -+++ ./bin/smokeping.dist 2008-10-29 15:05:17.000000000 +0100 -@@ -1,13 +1,13 @@ --#!/usr/bin/perl -w +--- smokeping.orig 2011-11-10 23:20:19.000000000 +0900 ++++ smokeping 2011-11-10 23:26:05.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl +#!%%PERL%% -w # -*-perl-*- --use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl); --use lib qw(lib); -+use lib qw(%%PREFIX%%/smokeping/lib); use strict; - use warnings; - use Smokeping 2.004002; +@@ -11,7 +11,8 @@ + + use Smokeping; --Smokeping::main("etc/config.dist"); +-Smokeping::main("$FindBin::Bin/../etc/config"); +$0 = "%%PREFIX%%/bin/smokeping"; +Smokeping::main("%%PREFIX%%/etc/smokeping/config"); =head1 NAME -@@ -127,22 +127,8 @@ Please refer to L installation +-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; - -- use lib qw(/home/oetiker/public_html/smokeping/lib); -- --One pointing to the place where you have installed the SmokePing libraries -- -- use Smokeping; -- -- Smokeping::cgi("/home/oetiker/.smokeping/config"); -- --The third path is the argument to the Smokeping::cgi command. It points to --the SmokePing configuration file. -++When installing SmokePing, this file has been adjusted to fit your -++local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT ++my $cfg = (shift @ARGV) || "%%PREFIX%%/etc/smokeping/config"; + while (my $q = new CGI::Fast) { + Smokeping::cgi($cfg,$q); --- patch-bin-tSmoke.dist 2011-11-10 20:12:36.000000000 +0900 +++ tSmoke.diff 2011-11-11 15:23:20.000000000 +0900 @@ -1,31 +1,22 @@ ---- ./bin/tSmoke.dist.orig 2008-10-29 15:06:25.000000000 +0100 -+++ ./bin/tSmoke.dist 2008-10-29 15:07:53.000000000 +0100 +--- tSmoke.orig 2011-11-10 23:21:57.000000000 +0900 ++++ tSmoke 2011-11-10 23:33:39.000000000 +0900 @@ -1,4 +1,4 @@ --#!/usr/bin/perl +-#!/usr/bin/env perl +#!%%PERL%% # #----------------------------------------------- # tSmoke.pl -@@ -51,8 +51,7 @@ use warnings; - # -- Getopt::Long - # - # Point the lib variables to your implementation --use lib qw(lib); --use lib qw(/usr/local/rrdtool-1.0.39/lib/perl); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 2.004002; - use Net::SMTP; -@@ -61,7 +60,7 @@ use Pod::Usage; +@@ -63,8 +63,7 @@ use RRDs; # Point to your Smokeping config file -my $cfgfile = "etc/config.dist"; +- +my $cfgfile = "%%PREFIX%%/etc/config"; - # global variables my $cfg; -@@ -482,33 +481,8 @@ Typical crontab used to invoke this are + +@@ -484,33 +483,8 @@ =head1 SETUP --- patch-etc-config.dist 2011-11-10 20:12:36.000000000 +0900 +++ config.dist.diff 2011-11-11 15:23:28.000000000 +0900 @@ -1,22 +1,21 @@ ---- etc/config.dist.orig 2008-02-04 18:00:46.000000000 +0100 -+++ etc/config.dist 2008-05-01 15:26:00.000000000 +0200 +--- config.dist.orig 2011-11-10 23:26:27.000000000 +0900 ++++ config.dist 2011-11-11 15:04:04.000000000 +0900 @@ -7,13 +7,13 @@ # NOTE: do not put the Image Cache below cgi-bin # since all files under cgi-bin will be executed ... this is not # good for images. --imgcache = /home/oetiker/public_html/smokeping-ms/cache --imgurl = cache --datadir = /tmp/smokeping-ms/data --piddir = /tmp/smokeping-ms/var -+imgcache = %%PREFIX%%/smokeping/htdocs/img -+imgurl = img -+datadir = %%PREFIX%%/var/smokeping -+piddir = %%PREFIX%%/var/smokeping +-imgcache = /tmp/smokeping-10180-build/cache ++imgcache = /opt/smokeping-2.6.5/cache + imgurl = cache +-datadir = /tmp/smokeping-10180-build/data +-piddir = /tmp/smokeping-10180-build/var ++datadir = /opt/smokeping-2.6.5/data ++piddir = /opt/smokeping-2.6.5/var cgiurl = http://some.url/smokeping.cgi --smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist --tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist -+smokemail = %%PREFIX%%/etc/smokeping/smokemail -+tmail = %%PREFIX%%/etc/smokeping/tmail +-smokemail = /tmp/smokeping-10180-build/etc/smokemail.dist +-tmail = /tmp/smokeping-10180-build/etc/tmail.dist ++smokemail = /opt/smokeping-2.6.5/etc/smokemail.dist ++tmail = /opt/smokeping-2.6.5/etc/tmail.dist # specify this to get syslog logging syslogfacility = local0 # each probe is now run in its own process @@ -24,17 +23,17 @@ *** Presentation *** --template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist -+template = %%PREFIX%%/etc/smokeping/basepage.html +-template = /tmp/smokeping-10180-build/etc/basepage.html.dist ++template = /opt/smokeping-2.6.5/etc/basepage.html.dist + charts -@@ -105,7 +105,7 @@ - - + FPing - --binary = /usr/sbin/fping -+binary = %%PREFIX%%/sbin/fping +@@ -108,7 +108,7 @@ + binary = /usr/sbin/fping *** Slaves *** - secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist +-secrets=/tmp/smokeping-10180-build/etc/smokeping_secrets.dist ++secrets=/opt/smokeping-2.6.5/etc/smokeping_secrets.dist + +boomer + display_name=boomer + color=0000ff --- patch-htdocs__tr.cgi.dist 2011-11-10 20:12:36.000000000 +0900 +++ htdocs__tr.cgi.dist 2011-11-11 15:28:32.000000000 +0900 @@ -1,12 +0,0 @@ ---- ./htdocs/tr.cgi.dist.orig 2008-07-09 14:35:43.000000000 +0200 -+++ ./htdocs/tr.cgi.dist 2008-07-09 14:49:01.000000000 +0200 -@@ -1,7 +1,6 @@ --#!/usr/sepp/bin/speedy-5.8.8 -w -+#!%%PREFIX%%/bin/speedy -w - use strict; --use lib qw(/home/oposs/smokeping/software/lib); --use lib qw(perl); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use CGI; - use CGI::Util qw(expires); >Release-Note: >Audit-Trail: >Unformatted: