From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 9 19:20:03 2007 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 0E16716A420 for ; Thu, 9 Aug 2007 19: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 D8CE013C469 for ; Thu, 9 Aug 2007 19:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l79JK2WS050107 for ; Thu, 9 Aug 2007 19:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l79JK2NV050106; Thu, 9 Aug 2007 19:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 9 Aug 2007 19:20:02 GMT Resent-Message-Id: <200708091920.l79JK2NV050106@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, Michael Fuckner Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B490A16A468; Thu, 9 Aug 2007 19:18:47 +0000 (UTC) (envelope-from root@g33.rebootking.de) Received: from dedihh.fuckner.net (dedihh.fuckner.net [81.209.183.161]) by mx1.freebsd.org (Postfix) with ESMTP id 198CD13C483; Thu, 9 Aug 2007 19:18:47 +0000 (UTC) (envelope-from root@g33.rebootking.de) Received: from localhost (localhost [127.0.0.1]) by dedihh.fuckner.net (Postfix) with ESMTP id A3CA661CD2; Thu, 9 Aug 2007 21:00:25 +0200 (CEST) Received: from dedihh.fuckner.net ([127.0.0.1]) by localhost (dedihh.fuckner.net [127.0.0.1]) (amavisd-new, port 10024) with SMTP id FE-5VM08ply4; Thu, 9 Aug 2007 21:00:20 +0200 (CEST) Received: from g33.rebootking.de (e176156190.adsl.alicedsl.de [85.176.156.190]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by dedihh.fuckner.net (Postfix) with ESMTP id 7FB8E61CD1; Thu, 9 Aug 2007 21:00:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by g33.rebootking.de (Postfix) with ESMTP id 90A3AB847; Thu, 9 Aug 2007 21:00:17 +0200 (CEST) Received: from g33.rebootking.de ([127.0.0.1]) by localhost (g33.rebootking.de [127.0.0.1]) (amavisd-new, port 10024) with SMTP id 3Guv6IDnww7d; Thu, 9 Aug 2007 21:00:12 +0200 (CEST) Received: by g33.rebootking.de (Postfix, from userid 0) id A3770B839; Thu, 9 Aug 2007 21:00:12 +0200 (CEST) Message-Id: <20070809190012.A3770B839@g33.rebootking.de> Date: Thu, 9 Aug 2007 21:00:12 +0200 (CEST) From: Michael Fuckner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: brooks@FreeBSD.org Subject: ports/115363: [PATCH] sysutils/ganglia-webfrontend: update to 3.0.4 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, 09 Aug 2007 19:20:03 -0000 >Number: 115363 >Category: ports >Synopsis: [PATCH] sysutils/ganglia-webfrontend: update to 3.0.4 >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: Thu Aug 09 19:20:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Michael Fuckner >Release: FreeBSD 7.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD g33.rebootking.de 7.0-CURRENT FreeBSD 7.0-CURRENT #9: Sun Aug 5 09:56:48 CEST >Description: - Update to 3.0.4 Added file(s): - files/version.php - ganglia-webfrontend-3.0.4.tbz Removed file(s): - files/patch-cluster__view.php - files/patch-ganglia.php Port maintainer (brooks@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- ganglia-webfrontend-3.0.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/Makefile /usr/ports/sysutils/ganglia-webfrontend.new/Makefile --- /usr/ports/sysutils/ganglia-webfrontend/Makefile 2007-08-08 19:20:49.000000000 +0200 +++ /usr/ports/sysutils/ganglia-webfrontend.new/Makefile 2007-08-09 20:55:41.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= webfrontend -PORTVERSION= 3.0.1 -PORTREVISION= 3 +PORTVERSION= 3.0.4 CATEGORIES= sysutils net parallel www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ganglia @@ -15,7 +14,7 @@ DISTNAME= ganglia-${PORTVERSION} MAINTAINER= brooks@FreeBSD.org -COMMENT= "Ganglia cluster monitor, web frontend" +COMMENT= Ganglia cluster monitor, web frontend RUN_DEPENDS+= ${LOCALBASE}/sbin/gmetad:${PORTSDIR}/sysutils/ganglia-monitor-core @@ -28,7 +27,6 @@ PLIST_SUB+= WEBFRONTDIR="${WEBFRONTDIR}" USE_PHP= gd pcre xml -USE_BZIP2= yes WANT_PHP_MOD= yes WRKSRC= ${WRKDIR}/${DISTNAME}/web @@ -72,6 +70,7 @@ -a -prune -o -print \ | ${TAR} cTf - - | ${TAR} xUCf ${TMP_WEBFRONTDIR} - @${CP} ${WRKSRC}/conf.php ${TMP_WEBFRONTDIR}/conf.php.sample + @${CP} ${FILESDIR}/version.php ${TMP_WEBFRONTDIR}/version.php do-install: @${MKDIR} -m 0755 ${PREFIX}/${WEBFRONTDIR} @@ -86,14 +85,14 @@ build-plist: ${RM} ${PLIST} - @${ECHO_CMD} '@unexec cmp -s %D/%%WEBFRONTDIR%%/conf.php %D/%%WEBFRONTDIR%%/conf.php.sample && rm -f %D/%%WEBFRONTDIR%%/conf.php' >> ${PLIST} + @${ECHO_CMD} '@unexec cmp -s %D/%%WEBFRONTDIR%%/conf.php %D/%%WEBFRONTDIR%%/conf.php.sample && ${RM} -f %D/%%WEBFRONTDIR%%/conf.php' >> ${PLIST} @${FIND} ${TMP_WEBFRONTDIR}/* -type f | \ ${SED} -e 's|${TMP_WEBFRONTDIR}|%%WEBFRONTDIR%%|' | \ ${SORT} >> ${PLIST} @${FIND} ${TMP_WEBFRONTDIR}/* -type d | \ ${SED} -e 's|${TMP_WEBFRONTDIR}|@dirrm %%WEBFRONTDIR%%|' | \ ${SORT} -r >> ${PLIST} - @${ECHO_CMD} '@dirrmtry rmdir %D/%%WEBFRONTDIR%%' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry ${RMDIR} %D/%%WEBFRONTDIR%%' >> ${PLIST} @${ECHO_CMD} '@unexec (test -d %D/%%WEBFRONTDIR%% && (echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove %D/%%WEBFRONTDIR%% and its contents manually.")) || true' >> ${PLIST} .include diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/distinfo /usr/ports/sysutils/ganglia-webfrontend.new/distinfo --- /usr/ports/sysutils/ganglia-webfrontend/distinfo 2007-08-08 19:20:49.000000000 +0200 +++ /usr/ports/sysutils/ganglia-webfrontend.new/distinfo 2007-08-08 19:35:49.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (ganglia-3.0.1.tar.bz2) = 14f086834f91899d921bf7e7fe44b536 -SHA256 (ganglia-3.0.1.tar.bz2) = 5806fef3d43e57988032b2ce757e6e12a24d68185664868a5b5c6781b7f0656e -SIZE (ganglia-3.0.1.tar.bz2) = 2649342 +MD5 (ganglia-3.0.4.tar.gz) = 9a51023accb59b6ba76c10d7cb7322fa +SHA256 (ganglia-3.0.4.tar.gz) = a63c802392d211e8c4beabb9eb175292d72b650a6192bbc332feebd9bb5f3ec4 +SIZE (ganglia-3.0.4.tar.gz) = 2842708 diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-cluster__view.php --- /usr/ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php 2007-08-08 19:20:49.000000000 +0200 +++ /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-cluster__view.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ - -$FreeBSD: ports/sysutils/ganglia-webfrontend/files/patch-cluster__view.php,v 1.1 2005/04/27 20:36:33 brooks Exp $ - ---- cluster_view.php.orig -+++ cluster_view.php -@@ -6,11 +6,11 @@ - - $tpl->assign("images","./templates/$template_name/images"); - --$cpu_num = !$showhosts ? $metrics["cpu_num"][SUM] : cluster_sum("cpu_num", $metrics); --$load_one_sum = !$showhosts ? $metrics["load_one"][SUM] : cluster_sum("load_one", $metrics); --$load_five_sum = !$showhosts ? $metrics["load_five"][SUM] : cluster_sum("load_five", $metrics); --$load_fifteen_sum = !$showhosts ? $metrics["load_fifteen"][SUM] : cluster_sum("load_fifteen", $metrics); --$units = !$showhosts ? $metrics[$metricname][UNITS] : $metrics[key($metrics)][$metricname][UNITS]; -+$cpu_num = cluster_sum("cpu_num", $metrics); -+$load_one_sum = cluster_sum("load_one", $metrics); -+$load_five_sum = cluster_sum("load_five", $metrics); -+$load_fifteen_sum = cluster_sum("load_fifteen", $metrics); -+$units = $metrics[key($metrics)][$metricname][UNITS]; - - $tpl->assign("num_nodes", intval($cluster[HOSTS_UP])); - $tpl->assign("num_dead_nodes", intval($cluster[HOSTS_DOWN])); diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-ganglia.php --- /usr/ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php 2007-08-08 19:20:49.000000000 +0200 +++ /usr/ports/sysutils/ganglia-webfrontend.new/files/patch-ganglia.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ - -$FreeBSD: ports/sysutils/ganglia-webfrontend/files/patch-ganglia.php,v 1.1 2005/04/27 20:36:33 brooks Exp $ - ---- ganglia.php.orig -+++ ganglia.php -@@ -260,8 +260,8 @@ - $request = "/$clustername"; - break; - case "cluster-summary": -- xml_set_element_handler($parser, "start_cluster_summary", "end_all"); -- $request = "/$clustername?filter=summary"; -+ xml_set_element_handler($parser, "start_cluster", "end_all"); -+ $request = "/$clustername"; - break; - case "node": - case "host": diff -ruN --exclude=CVS /usr/ports/sysutils/ganglia-webfrontend/files/version.php /usr/ports/sysutils/ganglia-webfrontend.new/files/version.php --- /usr/ports/sysutils/ganglia-webfrontend/files/version.php 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/sysutils/ganglia-webfrontend.new/files/version.php 2007-08-08 19:38:17.000000000 +0200 @@ -0,0 +1,11 @@ + Files /usr/ports/sysutils/ganglia-webfrontend/ganglia-webfrontend-3.0.4.tbz and /usr/ports/sysutils/ganglia-webfrontend.new/ganglia-webfrontend-3.0.4.tbz differ --- ganglia-webfrontend-3.0.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: