[ganglia] Update to ganglia 3.6.0 and ganglia-web 3.5.8
terjeros
terjeros at fedoraproject.org
Sun Jun 2 13:53:43 UTC 2013
commit d326291a556c7ca4753a325ccbf9a428a5a05390
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Sun Jun 2 15:53:25 2013 +0200
Update to ganglia 3.6.0 and ganglia-web 3.5.8
.gitignore | 2 +
...-3.5.7-xss.patch => ganglia-web-3.5.8-xss.patch | 8 +++---
ganglia.spec | 25 +++++++++++++++----
sources | 4 +-
4 files changed, 27 insertions(+), 12 deletions(-)
---
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.8-xss.patch
similarity index 91%
rename from ganglia-web-3.5.7-xss.patch
rename to ganglia-web-3.5.8-xss.patch
index 24d99be..f450e09 100644
--- a/ganglia-web-3.5.7-xss.patch
+++ b/ganglia-web-3.5.8-xss.patch
@@ -1,8 +1,8 @@
diff --git a/get_context.php b/get_context.php
-index c7c3baf..9b5956a 100644
+index 97f9e46..64ce6f1 100644
--- a/get_context.php
+++ b/get_context.php
-@@ -91,7 +91,7 @@ if ( isset($_GET['max_graphs']) && is_numeric($_GET['max_graphs'] ) )
+@@ -93,7 +93,7 @@ if ( isset($_GET['max_graphs']) && is_numeric($_GET['max_graphs'] ) )
/////////////////////////////////////////////////////////////////////////////
@@ -12,10 +12,10 @@ index c7c3baf..9b5956a 100644
$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
+index bd58bcb..95e31e5 100644
--- a/graph_all_periods.php
+++ b/graph_all_periods.php
-@@ -120,8 +120,8 @@ if ( ! isset($_GET['embed'] ) ) {
+@@ -122,8 +122,8 @@ if ( ! isset($_GET['embed'] ) ) {
?>
<script type="text/javascript">
var default_time = 'hour';
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
More information about the scm-commits
mailing list