From eb4467e7cb13b8e91058a3a04bc1deec2d7f7dc0 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 20 Dec 2008 14:40:45 +0100 Subject: [PATCH] debian/patches: Removed bts498183-segfault-madvise. This patch has been included upstream. --- debian/changelog | 3 ++- debian/patches/bts498183-segfault-madvise | 21 --------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/bts498183-segfault-madvise diff --git a/debian/changelog b/debian/changelog index b2a309f..f9ceba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ rrdtool (1.3.5-1) unstable; urgency=low memory. - Removed bts493553-pango-utf-8 - included upstream. - Removed bts496847-error-handling - included upstream. + - Removed bts498183-segfault-madvise - included upstream. - -- Sebastian Harl Sat, 20 Dec 2008 14:39:01 +0100 + -- Sebastian Harl Sat, 20 Dec 2008 14:40:20 +0100 rrdtool (1.3.1-4) unstable; urgency=high diff --git a/debian/patches/bts498183-segfault-madvise b/debian/patches/bts498183-segfault-madvise deleted file mode 100644 index b0697bf..0000000 --- a/debian/patches/bts498183-segfault-madvise +++ /dev/null @@ -1,21 +0,0 @@ -diff a/src/rrd_open.c b/src/rrd_open.c ---- a/src/rrd_open.c -+++ b/src/rrd_open.c -@@ -363,6 +363,8 @@ void rrd_dontneed( - rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt * - sizeof(rrd_value_t); - } -+ -+ if (dontneed_start < rrd_file->file_len) { - #ifdef USE_MADVISE - madvise(rrd_file->file_start + dontneed_start, - rrd_file->file_len - dontneed_start, MADV_DONTNEED); -@@ -371,6 +373,8 @@ void rrd_dontneed( - posix_fadvise(rrd_file->fd, dontneed_start, - rrd_file->file_len - dontneed_start, POSIX_FADV_DONTNEED); - #endif -+ } -+ - #if defined DEBUG && DEBUG > 1 - mincore_print(rrd_file, "after"); - #endif diff --git a/debian/patches/series b/debian/patches/series index c64c5b1..fb2d7b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,5 @@ no-rpath-for-ruby no-rpath-for-perl implicit-decl-fix bts499350-data-corruption -bts498183-segfault-madvise bts499349-memleaks typo-ruby -- 2.30.2