patches: Removed rrdtool_uninitialized_fix.dpatch.

This patch has been included upstream.

diff --git a/debian/changelog b/debian/changelog
index 5ee8603591895e4bb900ff360d1bc8afc15f32be..2991c1a13ebbf9901f2863e8e85d92894a6489ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ collectd (4.6.3-1) unstable; urgency=low
     - Removed battery_acpi_complain.dpatch - included upstream.
     - Removed include_empty_files.dpatch - included upstream.
     - Removed ntpd_type_pun_fix.dpatch - included upstream.
+    - Removed rrdtool_uninitialized_fix.dpatch - included upstream.
   * debian/rules:
     - Install collectd-network.py to /usr/share/doc/collectd/examples/.
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 02 Jun 2009 21:11:22 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 02 Jun 2009 21:14:21 +0200
 
 collectd (4.6.2-3) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index de7db354c739296500bd04c2ea593e4bc1c114cb..332b35c8333c22b54c6ead8e9d0f6750c3bfbc7f 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 rrd_filter_path.dpatch
 collection_conf_path.dpatch
-rrdtool_uninitialized_fix.dpatch
 

diff --git a/debian/patches/rrdtool_uninitialized_fix.dpatch b/debian/patches/rrdtool_uninitialized_fix.dpatch
deleted file mode 100755 (executable)
index 1f13a41..0000000
--- a/debian/patches/rrdtool_uninitialized_fix.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rrdtool_uninitialized_fix.dpatch by Florian Forster <octo@verplant.org>
-##
-## DP: rrdtool plugin: Make absolutely sure two local variables are
-## DP: initialized.
-
-@DPATCH@
-
-diff a/src/rrdtool.c b/src/rrdtool.c
---- a/src/rrdtool.c
-+++ b/src/rrdtool.c
-@@ -624,6 +624,9 @@ static void *rrd_queue_thread (void *data)
-               int    status;
-               int    i;
- 
-+              values = NULL;
-+              values_num = 0;
-+
-                 pthread_mutex_lock (&queue_lock);
-                 /* Wait for values to arrive */
-                 while (true)