patches: Added network-fix-cacheflush.dpatch.

This is an upstream patch to fix the handling the CacheFlush config option of
the network plugin.

diff --git a/debian/changelog b/debian/changelog
index f5e6e47df9eab2bbb3af999cf688dc6b9174a340..e892a1b0f39a8b00af0603eb50ecdf0daa8af2d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ collectd (4.7.2-1) unstable; urgency=low
     - Install collectd-java.5.
   * debian/patches:
     - Removed libcollectdclient_static_sstrerror.dpatch - included upstream.
+    - Added network-fix-cacheflush.dpatch - upstream patch to fix the handling
+      the CacheFlush config option of the network plugin.
   * debian/README.Debian:
     - Removed the note about how to get collectd2html.pl working with
       version 4 of collectd - the script now supports the --recursive option
@@ -52,7 +54,7 @@ collectd (4.7.2-1) unstable; urgency=low
     - Set the 'apache' plugin's URL according to the default used by Debian's
       Apache; thanks to Joey Hess for reporting this (Closes: #541888).
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 18 Aug 2009 22:51:12 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 27 Aug 2009 22:49:24 +0200
 
 collectd (4.6.3-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f..57edf94ab3c0bc08b15f741d4308428ddc62cc1b 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
+network-fix-cacheflush.dpatch
 

diff --git a/debian/patches/network-fix-cacheflush.dpatch b/debian/patches/network-fix-cacheflush.dpatch
new file mode 100755 (executable)
index 0000000..252aea8
--- /dev/null
+++ b/debian/patches/network-fix-cacheflush.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## network-fix-cacheflush.dpatch by Florian Forster <octo@verplant.org>
+##
+## DP: network plugin: Fix an incorrectly used configuration variable.
+## DP:
+## DP: The `CacheFlush' option was assigned to the `TTL' variable.
+
+@DPATCH@
+
+diff a/src/network.c b/src/network.c
+--- a/src/network.c
++++ b/src/network.c
+@@ -2768,7 +2768,7 @@ static int network_config_set_cache_flush (const oconfig_item_t *ci) /* {{{ */
+ 
+   tmp = (int) ci->values[0].value.number;
+   if (tmp > 0)
+-    network_config_ttl = tmp;
++    cache_flush_interval = tmp;
+ 
+   return (0);
+ } /* }}} int network_config_set_cache_flush */