From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 11 14:20:03 2010 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 9C2B41065672 for ; Thu, 11 Feb 2010 14:20:03 +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 5CE848FC16 for ; Thu, 11 Feb 2010 14:20:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1BEK3T5097706 for ; Thu, 11 Feb 2010 14:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1BEK3mM097705; Thu, 11 Feb 2010 14:20:03 GMT (envelope-from gnats) Resent-Date: Thu, 11 Feb 2010 14:20:03 GMT Resent-Message-Id: <201002111420.o1BEK3mM097705@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, Florian Smeets Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E3631065672 for ; Thu, 11 Feb 2010 14:19:15 +0000 (UTC) (envelope-from flo@mail.solomo.de) Received: from mail.solomo.de (mail.solomo.de [85.214.124.163]) by mx1.freebsd.org (Postfix) with ESMTP id 25D1A8FC0A for ; Thu, 11 Feb 2010 14:19:14 +0000 (UTC) Received: from mail.solomo.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id CA22661C9B; Thu, 11 Feb 2010 15:19:13 +0100 (CET) Received: from mail.solomo.de ([127.0.0.1]) by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id o11t5vtR3Odm; Thu, 11 Feb 2010 15:19:11 +0100 (CET) Received: by mail.solomo.de (Postfix, from userid 1001) id AB8C361C88; Thu, 11 Feb 2010 15:19:11 +0100 (CET) Message-Id: <20100211141911.AB8C361C88@mail.solomo.de> Date: Thu, 11 Feb 2010 15:19:11 +0100 (CET) From: Florian Smeets To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: des@FreeBSD.org Subject: ports/143804: [PATCH] sysutils/munin-node: fix network throughput and errorcollision graphs on head and recent 8-STABLE 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: Thu, 11 Feb 2010 14:20:03 -0000 >Number: 143804 >Category: ports >Synopsis: [PATCH] sysutils/munin-node: fix network throughput and errorcollision graphs on head and recent 8-STABLE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 11 14:20:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Florian Smeets >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD mail.solomo.de 8.0-STABLE FreeBSD 8.0-STABLE #9: Tue Jan 26 11:59:01 CET 2010 >Description: netstat -i -b grew an additional column Idrop, this caused the scripts to use wrong columns when Idrop was in the output. fix this by adding a new check in the 2 scripts which call netstat I ignored the portlint and port test warnings as I only wanted to fix this issue and not mess with the rest of the port, as it seems to be working fine. Added file(s): - files/patch-node-node.d.freebsd-if_.in.diff - files/patch-node-node.d.freebsd-if_errcoll_.in.diff Port maintainer (des@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- munin-node-1.2.6_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node.orig/Makefile /usr/ports/sysutils/munin-node/Makefile --- /usr/ports/sysutils/munin-node.orig/Makefile 2010-02-11 14:50:14.000000000 +0100 +++ /usr/ports/sysutils/munin-node/Makefile 2010-02-11 14:52:06.000000000 +0100 @@ -7,7 +7,7 @@ PORTNAME= munin PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -node diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node.orig/files/patch-node-node.d.freebsd-if_.in.diff /usr/ports/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff --- /usr/ports/sysutils/munin-node.orig/files/patch-node-node.d.freebsd-if_.in.diff 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/munin-node/files/patch-node-node.d.freebsd-if_.in.diff 2010-02-11 14:51:05.000000000 +0100 @@ -0,0 +1,17 @@ +--- node/node.d.freebsd/if_.in.orig 2010-01-28 17:44:27.000000000 +0100 ++++ node/node.d.freebsd/if_.in 2010-01-28 17:45:40.000000000 +0100 +@@ -81,9 +81,13 @@ + if (NF == 10) { + print "rbytes.value", $6; + print "obytes.value", $9; +- } else { ++ } ++ if (NF == 11) { + print "rbytes.value", $7; + print "obytes.value", $10; ++ } else { ++ print "rbytes.value", $8; ++ print "obytes.value", $11; + } + }' + fi diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node.orig/files/patch-node-node.d.freebsd-if_errcoll_.in.diff /usr/ports/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff --- /usr/ports/sysutils/munin-node.orig/files/patch-node-node.d.freebsd-if_errcoll_.in.diff 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/munin-node/files/patch-node-node.d.freebsd-if_errcoll_.in.diff 2010-02-11 14:51:05.000000000 +0100 @@ -0,0 +1,18 @@ +--- node/node.d.freebsd/if_errcoll_.in.orig 2010-01-28 17:44:33.000000000 +0100 ++++ node/node.d.freebsd/if_errcoll_.in 2010-01-28 17:48:46.000000000 +0100 +@@ -59,9 +59,14 @@ + print "ierrors.value", $5; + print "oerrors.value", $8; + print "collisions.value", $10; +- } else { ++ } ++ if (NF == 11) { + print "ierrors.value", $6; + print "oerrors.value", $9; + print "collisions.value", $11; ++ } else { ++ print "ierrors.value", $6; ++ print "oerrors.value", $10; ++ print "collisions.value", $12; + } + }' --- munin-node-1.2.6_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: