From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 15 Oct 2009 17:25:36 +0000 (+0200)
Subject: patches: Added gmond-fix-compile-error.dpatch.
X-Git-Tag: collectd-4.8.1-1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a29a8259d3de6e86e4dd01ecf24e179bdc046c5d;p=pkg-collectd.git

patches: Added gmond-fix-compile-error.dpatch.

This is an upstream patch fixing a compile error in the gmond plugin.
---

diff --git a/debian/changelog b/debian/changelog
index c35b50c..a9ef0f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,10 +29,12 @@ collectd (4.8.1-1) unstable; urgency=medium
     - Removed libvirt-reconnect.dpatch - included upstream.
     - Removed network-fix-cacheflush.dpatch - included upstream.
     - Removed plugin-fix-unregister.dpatch - included upstream.
+    - Added gmond-fix-compile-error.dpatch - upstream patch fixing a compile
+      error in the gmond plugin.
   * debian/control:
     - Build depend on libyajl-dev, which is required by the curl_json plugin.
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 11 Oct 2009 20:00:06 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 15 Oct 2009 19:25:02 +0200
 
 collectd (4.7.2-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 332b35c..b21ebd3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+gmond-fix-compile-error.dpatch
 
diff --git a/debian/patches/gmond-fix-compile-error.dpatch b/debian/patches/gmond-fix-compile-error.dpatch
new file mode 100644
index 0000000..c4f8e72
--- /dev/null
+++ b/debian/patches/gmond-fix-compile-error.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gmond-fix-compile-error.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: gmond plugin: Fixed a typo.
+## DP:
+## DP: For some reason, the value_t members "derive" and "absolute" had been
+## DP: spelled in all capital letters, obviously resulting in a build error.
+
+@DPATCH@
+
+diff a/src/gmond.c b/src/gmond.c
+--- a/src/gmond.c
++++ b/src/gmond.c
+@@ -542,9 +542,9 @@ static int staging_entry_update (const char *host, const char *name, /* {{{ */
+   else if (ds_type == DS_TYPE_GAUGE)
+     se->vl.values[ds_index].gauge = value.gauge;
+   else if (ds_type == DS_TYPE_DERIVE)
+-    se->vl.values[ds_index].DERIVE += value.derive;
++    se->vl.values[ds_index].derive += value.derive;
+   else if (ds_type == DS_TYPE_ABSOLUTE)
+-    se->vl.values[ds_index].ABSOLUTE = value.absolute;
++    se->vl.values[ds_index].absolute = value.absolute;
+ 
+   se->flags |= (0x01 << ds_index);
+