patches: Removed CVE-2010-4336 -- included upstream.

diff --git a/debian/changelog b/debian/changelog
index 37ad8beed36ad0dbc44bff021ffa8b5b7a83056e..9f4cc096b676a89f1fb06e3c9cf5d56c189d4d7d 100644 (file)
--- 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 <tokkee@debian.org>  Thu, 05 Jan 2012 15:22:34 +0100
+ -- Sebastian Harl <tokkee@debian.org>  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 6c064bf4ef926d7fef2db2730ca1677743520684..070e1e06050c5577e7ac7cea3251b636e5404a1a 100644 (file)
--- 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 (file)
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);