ganglia-webfrontend: Upgrade to 3.7.4, fixes cluster_view.php issue

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ganglia-webfrontend: Upgrade to 3.7.4, fixes cluster_view.php issue
From: Jason Bacon <bacon%NetBSD.org@localhost>
Date: Wed, 19 Sep 2018 20:43:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed Sep 19 15:43:20 2018 -0500
Changeset:	1c55bbabe06cb9c14fa5609f425380933ad608ce

Modified Files:
	ganglia-webfrontend/PLIST
	ganglia-webfrontend/distinfo
	ganglia-webfrontend/patches/patch-Makefile

Log Message:
ganglia-webfrontend: Upgrade to 3.7.4, fixes cluster_view.php issue

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c55bbabe06cb9c14fa5609f425380933ad608ce

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ganglia-webfrontend/PLIST                  | 18 ++++++++++++++++--
 ganglia-webfrontend/distinfo               |  2 +-
 ganglia-webfrontend/patches/patch-Makefile | 14 +++++++-------
 3 files changed, 24 insertions(+), 10 deletions(-)

diffs:
diff --git a/ganglia-webfrontend/PLIST b/ganglia-webfrontend/PLIST
index 9d3498e49a..fd1600ab44 100644
--- a/ganglia-webfrontend/PLIST
+++ b/ganglia-webfrontend/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/06/17 12:09:08 fhajny Exp $
+@comment $NetBSD$
 share/examples/ganglia/apache.conf
 share/examples/ganglia/conf.php
 share/examples/ganglia/default.json
@@ -6,6 +6,7 @@ share/examples/ganglia/event_color.json
 share/examples/ganglia/events.json
 share/examples/ganglia/nginx.conf
 share/examples/ganglia/sql/ganglia.mysql
+share/examples/ganglia/sql/ganglia.sqlite
 share/examples/ganglia/view_default.json
 share/ganglia/actions.php
 share/ganglia/aggregate_graphs.php
@@ -108,6 +109,7 @@ share/ganglia/dwoo/Dwoo/Security/Policy.php
 share/ganglia/dwoo/Dwoo/Smarty/Adapter.php
 share/ganglia/dwoo/Dwoo/Template/File.php
 share/ganglia/dwoo/Dwoo/Template/String.php
+share/ganglia/dwoo/LICENSE
 share/ganglia/dwoo/dwooAutoload.php
 share/ganglia/dwoo/plugins/builtin/blocks/a.php
 share/ganglia/dwoo/plugins/builtin/blocks/auto_escape.php
@@ -187,11 +189,17 @@ share/ganglia/graph.d/apache_report.json
 share/ganglia/graph.d/apache_response_report.json
 share/ganglia/graph.d/cpu_report.json
 share/ganglia/graph.d/cpu_report.php
+share/ganglia/graph.d/disk_report.json
+share/ganglia/graph.d/disk_report.php
+share/ganglia/graph.d/io_report.json
 share/ganglia/graph.d/load_all_report.json
 share/ganglia/graph.d/load_report.json
 share/ganglia/graph.d/mem_report.json
 share/ganglia/graph.d/mem_report.php
 share/ganglia/graph.d/metric.php
+share/ganglia/graph.d/moab_cores_report.json
+share/ganglia/graph.d/moab_jobs_report.json
+share/ganglia/graph.d/moab_nodes_report.json
 share/ganglia/graph.d/network_report.json
 share/ganglia/graph.d/nfs_v3_client_report.json
 share/ganglia/graph.d/packet_report.json
@@ -219,15 +227,17 @@ share/ganglia/js/combobox.js
 share/ganglia/js/create-flot-graphs.js
 share/ganglia/js/excanvas.js
 share/ganglia/js/excanvas.min.js
+share/ganglia/js/flot_graph.js
 share/ganglia/js/fullcalendar.js
 share/ganglia/js/ganglia.js
 share/ganglia/js/jquery-ui-timepicker-addon.js
 share/ganglia/js/jquery-ui.min.js
 share/ganglia/js/jquery.ba-bbq.js
 share/ganglia/js/jquery.ba-bbq.min.js
-share/ganglia/js/jquery.buttonsetv.js
 share/ganglia/js/jquery.cookie.js
+share/ganglia/js/jquery.flot.dashes.js
 share/ganglia/js/jquery.flot.events.js
+share/ganglia/js/jquery.flot.ganglia-time.js
 share/ganglia/js/jquery.flot.js
 share/ganglia/js/jquery.gangZoom.js
 share/ganglia/js/jquery.livesearch.js
@@ -243,6 +253,7 @@ share/ganglia/lib/Cache/Driver_Json.php
 share/ganglia/lib/Cache/Driver_Memcache.php
 share/ganglia/lib/Events/Driver_Json.php
 share/ganglia/lib/Events/Driver_Mdb2.php
+share/ganglia/lib/Events/Driver_Pdo.php
 share/ganglia/lib/GangliaAcl.php
 share/ganglia/lib/GangliaAuth.php
 share/ganglia/lib/Services/JSON.php
@@ -301,6 +312,7 @@ share/ganglia/templates/default/cluster_view.tpl
 share/ganglia/templates/default/compare_hosts.tpl
 share/ganglia/templates/default/decompose_graph.tpl
 share/ganglia/templates/default/footer.tpl
+share/ganglia/templates/default/graph_all_periods.tpl
 share/ganglia/templates/default/grid_tree.tpl
 share/ganglia/templates/default/header-nobanner.tpl
 share/ganglia/templates/default/header.tpl
@@ -330,11 +342,13 @@ share/ganglia/templates/default/meta_view.tpl
 share/ganglia/templates/default/metric_group_view.tpl
 share/ganglia/templates/default/node_extra.tpl
 share/ganglia/templates/default/physical_view.tpl
+share/ganglia/templates/default/scripts.tpl
 share/ganglia/templates/default/show_node.tpl
 share/ganglia/templates/default/view_content.tpl
 share/ganglia/templates/default/views_view.tpl
 share/ganglia/test/GangliaAclTest.php
 share/ganglia/test/GangliaAuthTest.php
+share/ganglia/test/TestCase.php
 share/ganglia/test/phpcs-ganglia-web.xml
 share/ganglia/trend_navigation.php
 share/ganglia/version.php
diff --git a/ganglia-webfrontend/distinfo b/ganglia-webfrontend/distinfo
index ae43ff7659..8ff632597e 100644
--- a/ganglia-webfrontend/distinfo
+++ b/ganglia-webfrontend/distinfo
@@ -4,6 +4,6 @@ SHA1 (3.7.4.tar.gz) = 0d2cfe080b0c28c0ba9e60c9441099e1dccea15e
 RMD160 (3.7.4.tar.gz) = 5f4371b3b255ef7751255badcc928d38a2ffb356
 SHA512 (3.7.4.tar.gz) = bcec0d7388c7055b79c356901302d934555a5a61ad41a3e97ba6bcb9f7afb89798c497abf4b7d57f76d93fe82ab2f4b7c4a02fa8c19126d151e44ab4e8016765
 Size (3.7.4.tar.gz) = 709630 bytes
-SHA1 (patch-Makefile) = c246326e81b3df16b3289891e0b6ad37fb8fca55
+SHA1 (patch-Makefile) = 510427fb04c5ebf7844caeefecc418945edb2064
 SHA1 (patch-conf__default.php.in) = 0d5d9417d20f74bd1b1e3ab4e83738779a19fda1
 SHA1 (patch-eval__conf.php) = ce40cbee4c9867f86a67009074d0d46308dcb561
diff --git a/ganglia-webfrontend/patches/patch-Makefile b/ganglia-webfrontend/patches/patch-Makefile
index cd92e93de2..1cf930c44c 100644
--- a/ganglia-webfrontend/patches/patch-Makefile
+++ b/ganglia-webfrontend/patches/patch-Makefile
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile,v 1.1 2016/02/16 13:05:23 fhajny Exp $
+$NetBSD$
 
-Assert proper paths.
+# Assert proper paths
 
---- Makefile.orig	2015-10-01 15:47:41.000000000 +0000
+--- Makefile.orig	2018-09-19 20:38:59.201524924 +0000
 +++ Makefile
-@@ -33,7 +33,7 @@ clean:
+@@ -66,7 +66,7 @@ clean:
  	rm -rf $(TARGETS) $(DIST_DIR) $(DIST_TARBALL) rpmbuild
  
  conf_default.php:	conf_default.php.in
 -	sed -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
-+	sed -e "s|@etcdir@|$(GCONFDIR)|" -e "s|@vargmetadir@|$(GMETAD_ROOTDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
++	sed -e "s|@etcdir@|$(GCONFDIR)|" -e "s|@vargwebstatedir@|$(GWEB_STATEDIR)|g" conf_default.php.in > conf_default.php
  
  ganglia-web.spec:	ganglia-web.spec.in
  	sed -e s/@GWEB_VERSION@/$(GWEB_VERSION)/ -e "s|@vargwebdir@|$(GWEB_STATEDIR)|" -e "s|@varapacheuser@|$(APACHE_USER)|g" -e "s|@etcdir@|$(GCONFDIR)|g" ganglia-web.spec.in > ganglia-web.spec
-@@ -51,10 +51,9 @@ install:	dist-dir
+@@ -84,10 +84,9 @@ install:	dist-dir
  	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/compiled && \
  	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR)/dwoo/cache && \
  	mkdir -p $(DESTDIR)/$(GWEB_STATEDIR) && \
@@ -21,7 +21,7 @@ Assert proper paths.
 +	rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GCONFDIR) && \
  	mkdir -p $(DESTDIR)/$(GDESTDIR) && \
 -	rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR) && \
--	chown -R $(APACHE_USER):$(APACHE_USER) $(DESTDIR)/$(GWEB_STATEDIR)
+-	chown -R $(APACHE_USER):$(APACHE_GROUP) $(DESTDIR)/$(GWEB_STATEDIR)
 +	rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR)
  
  dist-gzip:	dist-dir
Prev by Date: kibana: Add a reference to CVE-2018-3830
Next by Date: ganglia-monitor-core: Testing patches to parallel/ganglia-monitor-core
Previous by Thread: kibana: Add a reference to CVE-2018-3830
Next by Thread: ganglia-monitor-core: Testing patches to parallel/ganglia-monitor-core
Indexes:
Home | Main Index | Thread Index | Old Index