noodles pushed to ganglia (el6). "Update to ganglia 3.6.0 and ganglia-web 3.5.8"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 21 05:08:58 UTC 2015
>From d326291a556c7ca4753a325ccbf9a428a5a05390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten at ntnu.no>
Date: Sun, 2 Jun 2013 15:53:25 +0200
Subject: Update to ganglia 3.6.0 and ganglia-web 3.5.8
diff --git a/.gitignore b/.gitignore
index 800af9e..808e8bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ ganglia-3.1.7.tar.gz
/ganglia-3.5.0.tar.gz
/ganglia-web-3.5.4.tar.gz
/ganglia-web-3.5.7.tar.gz
+/ganglia-3.6.0.tar.gz
+/ganglia-web-3.5.8.tar.gz
diff --git a/ganglia-web-3.5.7-xss.patch b/ganglia-web-3.5.7-xss.patch
deleted file mode 100644
index 24d99be..0000000
--- a/ganglia-web-3.5.7-xss.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/get_context.php b/get_context.php
-index c7c3baf..9b5956a 100644
---- a/get_context.php
-+++ b/get_context.php
-@@ -91,7 +91,7 @@ if ( isset($_GET['max_graphs']) && is_numeric($_GET['max_graphs'] ) )
-
- /////////////////////////////////////////////////////////////////////////////
-
--$user['selected_tab'] = isset($_GET["tab"]) ? rawurldecode($_GET["tab"]) : 'm';
-+$user['selected_tab'] = isset($_GET["tab"]) ? clean_string( rawurldecode($_GET["tab"]) ) : 'm';
-
- $user['compare_hosts'] = ($user['selected_tab'] == 'ch') ? 1 : NULL;
-
-diff --git a/graph_all_periods.php b/graph_all_periods.php
-index 605e0b5..c18854d 100644
---- a/graph_all_periods.php
-+++ b/graph_all_periods.php
-@@ -120,8 +120,8 @@ if ( ! isset($_GET['embed'] ) ) {
- ?>
- <script type="text/javascript">
- var default_time = 'hour';
-- var metric = "<?php if (isset($_GET['g'])) echo $_GET['g']; else echo $_GET['m']; ?>";
-- var base_url = "<?php print 'graph.php?flot=1&' . $_GET['m'] . $query_string ?>" + "&r=" + default_time;
-+ var metric = "<?php if (isset($_GET['g'])) echo htmlentities($_GET['g']); else echo htmlentities($_GET['m']); ?>";
-+ var base_url = "<?php print 'graph.php?flot=1&' . htmlentities($_GET['m']) . $query_string ?>" + "&r=" + default_time;
- </script>
- <script type="text/javascript" src="js/create-flot-graphs.js"></script>
- <?php
-diff --git a/tasseo.php b/tasseo.php
-index e9494cd..1a9058c 100644
---- a/tasseo.php
-+++ b/tasseo.php
-@@ -51,7 +51,7 @@ if ( ! isset($_REQUEST['view_name']) ) {
- ?>
- <html>
- <head>
--<title>Live Dashboard for <?php print $user['view_name']; ?></title>
-+<title>Live Dashboard for <?php print htmlentities($user['view_name']); ?></title>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <link rel="stylesheet" type="text/css" href="css/tasseo.css" />
- <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
-@@ -60,7 +60,7 @@ if ( ! isset($_REQUEST['view_name']) ) {
- </head>
- <body>
- <div id='title'>
-- <span><?php print $user['view_name']; ?></span>
-+ <span><?php print htmlentities($user['view_name']); ?></span>
- <div id='toolbar'>
- <ul class='timepanel'>
- <li class='timepanel live selected'>
diff --git a/ganglia-web-3.5.8-xss.patch b/ganglia-web-3.5.8-xss.patch
new file mode 100644
index 0000000..f450e09
--- /dev/null
+++ b/ganglia-web-3.5.8-xss.patch
@@ -0,0 +1,50 @@
+diff --git a/get_context.php b/get_context.php
+index 97f9e46..64ce6f1 100644
+--- a/get_context.php
++++ b/get_context.php
+@@ -93,7 +93,7 @@ if ( isset($_GET['max_graphs']) && is_numeric($_GET['max_graphs'] ) )
+
+ /////////////////////////////////////////////////////////////////////////////
+
+-$user['selected_tab'] = isset($_GET["tab"]) ? rawurldecode($_GET["tab"]) : 'm';
++$user['selected_tab'] = isset($_GET["tab"]) ? clean_string( rawurldecode($_GET["tab"]) ) : 'm';
+
+ $user['compare_hosts'] = ($user['selected_tab'] == 'ch') ? 1 : NULL;
+
+diff --git a/graph_all_periods.php b/graph_all_periods.php
+index bd58bcb..95e31e5 100644
+--- a/graph_all_periods.php
++++ b/graph_all_periods.php
+@@ -122,8 +122,8 @@ if ( ! isset($_GET['embed'] ) ) {
+ ?>
+ <script type="text/javascript">
+ var default_time = 'hour';
+- var metric = "<?php if (isset($_GET['g'])) echo $_GET['g']; else echo $_GET['m']; ?>";
+- var base_url = "<?php print 'graph.php?flot=1&' . $_GET['m'] . $query_string ?>" + "&r=" + default_time;
++ var metric = "<?php if (isset($_GET['g'])) echo htmlentities($_GET['g']); else echo htmlentities($_GET['m']); ?>";
++ var base_url = "<?php print 'graph.php?flot=1&' . htmlentities($_GET['m']) . $query_string ?>" + "&r=" + default_time;
+ </script>
+ <script type="text/javascript" src="js/create-flot-graphs.js"></script>
+ <?php
+diff --git a/tasseo.php b/tasseo.php
+index e9494cd..1a9058c 100644
+--- a/tasseo.php
++++ b/tasseo.php
+@@ -51,7 +51,7 @@ if ( ! isset($_REQUEST['view_name']) ) {
+ ?>
+ <html>
+ <head>
+-<title>Live Dashboard for <?php print $user['view_name']; ?></title>
++<title>Live Dashboard for <?php print htmlentities($user['view_name']); ?></title>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+ <link rel="stylesheet" type="text/css" href="css/tasseo.css" />
+ <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
+@@ -60,7 +60,7 @@ if ( ! isset($_REQUEST['view_name']) ) {
+ </head>
+ <body>
+ <div id='title'>
+- <span><?php print $user['view_name']; ?></span>
++ <span><?php print htmlentities($user['view_name']); ?></span>
+ <div id='toolbar'>
+ <ul class='timepanel'>
+ <li class='timepanel live selected'>
diff --git a/ganglia.spec b/ganglia.spec
index 743e70e..ce00f16 100644
--- a/ganglia.spec
+++ b/ganglia.spec
@@ -1,5 +1,5 @@
-%global gangver 3.5.0
-%global webver 3.5.7
+%global gangver 3.6.0
+%global webver 3.5.8
%if 0%{?fedora} >= 18
%global systemd 1
@@ -13,8 +13,8 @@
Name: ganglia
Version: %{gangver}
-Release: 4%{?dist}
-Summary: Ganglia Distributed Monitoring System
+Release: 1%{?dist}
+Summary: Distributed Monitoring System
Group: Applications/Internet
License: BSD
URL: http://ganglia.sourceforge.net/
@@ -25,7 +25,7 @@ Source3: gmetad.service
Source4: ganglia-httpd24.conf.d
Source5: ganglia-httpd.conf.d
Source6: conf.php
-Patch0: ganglia-web-3.5.7-xss.patch
+Patch0: ganglia-web-3.5.8-xss.patch
Patch1: ganglia-web-3.5.7-statedir.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?systemd}
@@ -36,6 +36,7 @@ BuildRequires: apr-devel >= 1
BuildRequires: libpng-devel
BuildRequires: libart_lgpl-devel
BuildRequires: libconfuse-devel
+BuildRequires: libmemcached-devel
BuildRequires: expat-devel
BuildRequires: python-devel
BuildRequires: freetype-devel
@@ -132,6 +133,10 @@ programmers can use to build scalable cluster or grid applications
%prep
%setup -q
+# fix broken systemd support
+install -m 0644 %{SOURCE2} gmond/gmond.service.in
+install -m 0644 %{SOURCE3} gmetad/gmetad.service.in
+
# web part
%setup -q -T -D -a 1
mv ganglia-web-%{webver} web
@@ -144,6 +149,7 @@ cd web
--enable-setuid=ganglia \
--enable-setgid=ganglia \
--with-gmetad \
+ --with-memcached \
--disable-static \
--enable-shared \
--sysconfdir=%{_sysconfdir}/ganglia
@@ -184,7 +190,8 @@ install -Dp -m 0755 gmetad/gmetad.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/gmet
%endif # systemd
## Build default gmond.conf from gmond using the '-t' flag
-gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf
+LD_LIBRARY_PATH=lib/.libs gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' \
+ > $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/gmond.conf
## Python bits
# Copy the python metric modules and .conf files
@@ -231,6 +238,8 @@ ln -s /usr/share/php/Zend $RPM_BUILD_ROOT/usr/share/ganglia/lib/Zend
# Remove execute bit
chmod 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/header.php
chmod 0644 $RPM_BUILD_ROOT%{_libdir}/%{name}/python_modules/*.py
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/css/smoothness/jquery-ui-1.10.2.custom.css
+chmod 0644 $RPM_BUILD_ROOT%{_datadir}/%{name}/css/smoothness/jquery-ui-1.10.2.custom.min.css
# Remove shebang
%{__sed} -i '1{\@^#!@d}' $RPM_BUILD_ROOT%{_libdir}/%{name}/python_modules/*.py
@@ -245,6 +254,7 @@ rm -rf $RPM_BUILD_ROOT
/sbin/ldconfig
%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%if 0%{?systemd}
%post gmond
@@ -403,6 +413,9 @@ fi
%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}/dwoo/compiled
%changelog
+* Sun Jun 02 2013 Terje Rosten <terje.rosten at ntnu.no> - 3.6.0-1
+- Update to ganglia 3.6.0 and ganglia-web 3.5.8
+
* Thu May 09 2013 Terje Rosten <terje.rosten at ntnu.no> - 3.5.0-4
- Hardened build in FC > 18.
diff --git a/sources b/sources
index 99c64fc..cbf2af2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-51b3a16c5e3f775d9f6f19c4c6cd5610 ganglia-3.5.0.tar.gz
-bdb26d33c7f28dd0179614bd9a844fc2 ganglia-web-3.5.7.tar.gz
+05926bb18c22af508a3718a90b2e9a2c ganglia-3.6.0.tar.gz
+4e99eb06afceb4fee8040f4a3969aa7d ganglia-web-3.5.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ganglia.git/commit/?h=el6&id=d326291a556c7ca4753a325ccbf9a428a5a05390
More information about the scm-commits
mailing list