From 1d1c0d448094aa0aec753dec8fc2752a438dbafc Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 2 Jun 2009 21:14:46 +0200 Subject: [PATCH] patches: Removed rrdtool_uninitialized_fix.dpatch. This patch has been included upstream. --- debian/changelog | 3 ++- debian/patches/00list | 1 - .../patches/rrdtool_uninitialized_fix.dpatch | 21 ------------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100755 debian/patches/rrdtool_uninitialized_fix.dpatch diff --git a/debian/changelog b/debian/changelog index 5ee8603..2991c1a 100644 --- 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 Tue, 02 Jun 2009 21:11:22 +0200 + -- Sebastian Harl 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 de7db35..332b35c 100644 --- 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 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 -## -## 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) -- 2.30.2