From 7f3c16365daf0aa38a9253aa907df23776936dd1 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 5 Jan 2012 15:24:00 +0100 Subject: [PATCH] patches: Removed CVE-2010-4336 -- included upstream. --- debian/changelog | 3 ++- debian/patches/00list | 1 - debian/patches/CVE-2010-4336.dpatch | 18 ------------------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/CVE-2010-4336.dpatch diff --git a/debian/changelog b/debian/changelog index 37ad8be..9f4cc09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,9 @@ collectd (4.10.4-1) unstable; urgency=low - Removed bts595756-notify_email-segfault -- included upstream. - Removed bts592623-curl_json-file -- included upstream. - Removed bts596128-reheap-fix -- included upstream. + - Removed CVE-2010-4336 -- included upstream. - -- Sebastian Harl Thu, 05 Jan 2012 15:22:34 +0100 + -- Sebastian Harl Thu, 05 Jan 2012 15:23:40 +0100 collectd (4.10.1-2.1) unstable; urgency=high diff --git a/debian/patches/00list b/debian/patches/00list index 6c064bf..070e1e0 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ rrd_filter_path.dpatch collection_conf_path.dpatch bts559801_plugin_find_fix.dpatch -CVE-2010-4336.dpatch diff --git a/debian/patches/CVE-2010-4336.dpatch b/debian/patches/CVE-2010-4336.dpatch deleted file mode 100644 index a40bdfd..0000000 --- a/debian/patches/CVE-2010-4336.dpatch +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## - -@DPATCH@ ---- ../old/collectd-4.10.1/src/utils_rrdcreate.c 2010-07-09 20:01:59.000000000 +1000 -+++ collectd-4.10.1/src/utils_rrdcreate.c 2010-12-08 17:41:34.000000000 +1100 -@@ -398,10 +398,9 @@ - memcpy (argv + ds_num, rra_def, rra_num * sizeof (char *)); - argv[ds_num + rra_num] = NULL; - -- assert (vl->time > 10); - status = srrd_create (filename, - (cfg->stepsize > 0) ? cfg->stepsize : vl->interval, -- vl->time - 10, -+ (vl->time > 10) ? (vl->time - 10) : vl->time, - argc, (const char **) argv); - - free (argv); -- 2.30.2