debian/patches: Updated bts428778-floating-point-exception.

The patch now correctly applies to the latest version of rrdtool. Use
rrd_free2() instead of rrd_free() to not leak memory.

diff --git a/debian/changelog b/debian/changelog
index e9e99e1e6e2de8299f93c7d611aa24276102b323..bec6892f0658e133822fc35f6e63035e7c88f4d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 rrdtool (1.3.5-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Updated bts428778-floating-point-exception to apply to the latest
+      version of rrdtool; use rrd_free2() instead of rrd_free() to not leak
+      memory.
 
- -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 14:31:25 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 20 Dec 2008 14:32:12 +0100
 
 rrdtool (1.3.1-4) unstable; urgency=high
 

diff --git a/debian/patches/bts428778-floating-point-exception b/debian/patches/bts428778-floating-point-exception
index e03890b8bb55ac8d1383e4a1a1a088522ebf4dc8..cefb3ddbc77e115804c1cd9a040b9b0f33575d82 100644 (file)
--- a/debian/patches/bts428778-floating-point-exception
+++ b/debian/patches/bts428778-floating-point-exception
@@ -10,8 +10,8 @@ diff a/src/rrd_create.c b/src/rrd_create.c
 +            if (rrd->rra_def[i].pdp_cnt == 0)
 +            {
 +                rrd_set_error("Invalid step: must be greater than 0.");
-+                rrd_free(rrd);
-+                fclose(rrd_file);
++                rrd_free2(rrd);
++                close(rrd_file);
 +                return(-1);
 +            }
              /* startup missing pdp count */