From 33fce7f218b669af8226331f07260329c91cc88f Mon Sep 17 00:00:00 2001
From: Veit Scharf <vscharf@kip.uni-heidelberg.de>
Date: Sat, 15 Feb 2014 16:10:56 +0100
Subject: [PATCH 1/2] Fixed usage of ${buildroot} instead of %{buildroot} which
 breaks rpmbuild.

---
 specs/ganglia/ganglia.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specs/ganglia/ganglia.spec b/specs/ganglia/ganglia.spec
index afc6555fd..14fa945e4 100644
--- a/specs/ganglia/ganglia.spec
+++ b/specs/ganglia/ganglia.spec
@@ -192,7 +192,7 @@ gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > %{buildroot}%{_sysconfdir}
 ## Install binaries
 %{__make} install DESTDIR="%{buildroot}"
 ## House cleaning
-%{__rm} -f ${buildroot}%{_datadir}/ganglia/{Makefile.am,version.php.in}
+%{__rm} -f %{buildroot}%{_datadir}/ganglia/{Makefile.am,version.php.in}
 
 %clean
 %{__rm} -rf %{buildroot}

From eccf19678ed8de302ad0b0c9f0e7f6469b383514 Mon Sep 17 00:00:00 2001
From: Veit Scharf <vscharf@kip.uni-heidelberg.de>
Date: Sat, 15 Feb 2014 16:12:55 +0100
Subject: [PATCH 2/2] Fix bug, which sets the 'DMAX' value of metric to 0
 independent of the requested value.

---
 specs/ganglia/ganglia.spec     |  4 +++-
 specs/ganglia/gmond-dmax.patch | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 specs/ganglia/gmond-dmax.patch

diff --git a/specs/ganglia/ganglia.spec b/specs/ganglia/ganglia.spec
index 14fa945e4..ba2636154 100644
--- a/specs/ganglia/ganglia.spec
+++ b/specs/ganglia/ganglia.spec
@@ -3,7 +3,7 @@
 Summary: Ganglia Distributed Monitoring System
 Name: ganglia
 Version: 3.1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://ganglia.sourceforge.net/
@@ -14,6 +14,7 @@ Source0: http://dl.sf.net/project/ganglia/ganglia%20monitoring%20core/%{version}
 Patch0: diskusage-pcre.patch
 Patch1: setuserid-fix.patch
 Patch2: diskmetrics.patch
+Patch3: gmond-dmax.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: apr-devel >= 1
@@ -103,6 +104,7 @@ programmers can use to build scalable cluster or grid applications
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
diff --git a/specs/ganglia/gmond-dmax.patch b/specs/ganglia/gmond-dmax.patch
new file mode 100644
index 000000000..19a3f0271
--- /dev/null
+++ b/specs/ganglia/gmond-dmax.patch
@@ -0,0 +1,19 @@
+diff -uNr ganglia-3.1.7/gmond/gmond.c ganglia-3.1.7-patch/gmond/gmond.c
+--- ganglia-3.1.7/gmond/gmond.c	2010-02-17 12:05:39.000000000 +0100
++++ ganglia-3.1.7-patch/gmond/gmond.c	2014-02-15 15:16:29.000000000 +0100
+@@ -1575,13 +1575,14 @@
+     }
+   
+   len = apr_snprintf(metricxml, 1024,
+-          "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"0\" SLOPE=\"%s\">\n",
++          "<METRIC NAME=\"%s\" VAL=\"%s\" TYPE=\"%s\" UNITS=\"%s\" TN=\"%d\" TMAX=\"%d\" DMAX=\"%d\" SLOPE=\"%s\">\n",
+               metricName,
+               gmetric_value_to_str(&(val->message_u.v_message)),
+               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.type,
+               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.units,
+               (int)((now - val->last_heard_from) / APR_USEC_PER_SEC),
+               data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.tmax,
++              data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.dmax,
+               slope_to_cstr(data->message_u.f_message.Ganglia_metadata_msg_u.gfull.metric.slope));
+ 
+   if (metricName) free(metricName);