From bdd627127aad17d3e07ae20e1ae03097f0d366d4 Mon Sep 17 00:00:00 2001 From: bacon Date: Fri, 21 Sep 2018 14:48:08 +0000 Subject: www/ganglia-webfrontend: Fix bug in cluster view Emergency fix for a major bug that messes up the cluster view page. Fixed upstream in the next release, but there is another regression in the latest release that still needs to be identified before upgrading. --- www/ganglia-webfrontend/Makefile | 4 ++-- www/ganglia-webfrontend/distinfo | 3 ++- www/ganglia-webfrontend/patches/patch-cluster__view.php | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 www/ganglia-webfrontend/patches/patch-cluster__view.php (limited to 'www') diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile index f1619dcc157..8ec597ff6b8 100644 --- a/www/ganglia-webfrontend/Makefile +++ b/www/ganglia-webfrontend/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2017/03/12 07:20:52 maya Exp $ +# $NetBSD: Makefile,v 1.20 2018/09/21 14:48:08 bacon Exp $ # DISTNAME= ganglia-web-3.7.2 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${DISTNAME:S/web/webfrontend/} CATEGORIES= www parallel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/} diff --git a/www/ganglia-webfrontend/distinfo b/www/ganglia-webfrontend/distinfo index eb197615ed9..665286b5122 100644 --- a/www/ganglia-webfrontend/distinfo +++ b/www/ganglia-webfrontend/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.8 2016/06/17 12:09:08 fhajny Exp $ +$NetBSD: distinfo,v 1.9 2018/09/21 14:48:08 bacon Exp $ SHA1 (ganglia-web-3.7.2.tar.gz) = c19f0446f1bfea71a8482d640ea0bfd5bdda788d RMD160 (ganglia-web-3.7.2.tar.gz) = 2abd57780260ea795a702a877dac63de4dfa669c SHA512 (ganglia-web-3.7.2.tar.gz) = 033b00923a4cf7f342a44de9e37da67411992054e7f103fa09d91bbd125fb9066cc4e77ae5011810d7d926e2997b48d30e3d505d83239cd4c0a6b996a7679f8d Size (ganglia-web-3.7.2.tar.gz) = 704632 bytes SHA1 (patch-Makefile) = c246326e81b3df16b3289891e0b6ad37fb8fca55 +SHA1 (patch-cluster__view.php) = 6a869c46fbbad7d75a3bbfbb7b7a69347653e35a SHA1 (patch-conf__default.php.in) = 0d5d9417d20f74bd1b1e3ab4e83738779a19fda1 SHA1 (patch-eval__conf.php) = ce40cbee4c9867f86a67009074d0d46308dcb561 diff --git a/www/ganglia-webfrontend/patches/patch-cluster__view.php b/www/ganglia-webfrontend/patches/patch-cluster__view.php new file mode 100644 index 00000000000..c58509e5aae --- /dev/null +++ b/www/ganglia-webfrontend/patches/patch-cluster__view.php @@ -0,0 +1,14 @@ +$NetBSD: patch-cluster__view.php,v 1.1 2018/09/21 14:48:08 bacon Exp $ + +# Fix cluster_view display issue +--- cluster_view.php.orig 2018-09-20 15:05:53.000000000 +0000 ++++ cluster_view.php +@@ -23,7 +23,7 @@ if ($refresh) { + } + + function get_picker_metrics($metrics, $reports, $gweb_root, $graph_engine) { +- $context_metrics = ""; ++ $context_metrics = array(); + if (count($metrics)) { + foreach ($metrics as $host_metrics) { + foreach ($host_metrics as $metric_name => $metric_value) { -- cgit v1.2.3