From 4b9eece1923c0090e9602e029db453e9681e3c86 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 6 Jan 2010 10:52:59 +0000 Subject: [PATCH] upgrading package: rrdtool 1.3.9 -> 1.4.2 --- rrdtool/rrdtool.patch | 66 +++++++++++++++++++++++++------------------ rrdtool/rrdtool.spec | 6 ++-- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/rrdtool/rrdtool.patch b/rrdtool/rrdtool.patch index 88ccf2c788..d5eac6d382 100644 --- a/rrdtool/rrdtool.patch +++ b/rrdtool/rrdtool.patch @@ -1,6 +1,6 @@ -Index: RRDTool-OO-0.27/Makefile.PL ---- RRDTool-OO-0.27/Makefile.PL.orig 2009-09-27 22:19:17 +0200 -+++ RRDTool-OO-0.27/Makefile.PL 2009-09-28 17:33:53 +0200 +Index: RRDTool-OO-0.28/Makefile.PL +--- RRDTool-OO-0.28/Makefile.PL.orig 2009-11-06 03:35:07 +0100 ++++ RRDTool-OO-0.28/Makefile.PL 2010-01-06 11:47:45 +0100 @@ -2,52 +2,12 @@ use ExtUtils::MakeMaker; use File::Basename; @@ -54,16 +54,16 @@ Index: RRDTool-OO-0.27/Makefile.PL RRDs => 0, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ? ## Add these new keywords supported since 5.005 -Index: RRDTool-OO-0.27/lib/RRDTool/OO.pm ---- RRDTool-OO-0.27/lib/RRDTool/OO.pm.orig 2009-09-27 22:28:16 +0200 -+++ RRDTool-OO-0.27/lib/RRDTool/OO.pm 2009-09-28 17:32:58 +0200 +Index: RRDTool-OO-0.28/lib/RRDTool/OO.pm +--- RRDTool-OO-0.28/lib/RRDTool/OO.pm.orig 2009-11-06 03:48:39 +0100 ++++ RRDTool-OO-0.28/lib/RRDTool/OO.pm 2010-01-06 11:47:45 +0100 @@ -5,7 +5,6 @@ use warnings; use Carp; use RRDs; -use Log::Log4perl qw(:easy); - our $VERSION = '0.26'; + our $VERSION = '0.28'; @@ -188,7 +187,7 @@ # Check if we got all mandatory parameters @@ -85,7 +85,7 @@ Index: RRDTool-OO-0.27/lib/RRDTool/OO.pm } Index: bindings/perl-shared/Makefile.PL --- bindings/perl-shared/Makefile.PL.orig 2008-12-05 16:39:55 +0100 -+++ bindings/perl-shared/Makefile.PL 2009-09-28 17:32:58 +0200 ++++ bindings/perl-shared/Makefile.PL 2010-01-06 11:47:45 +0100 @@ -1,36 +1,7 @@ use ExtUtils::MakeMaker; use Config; @@ -126,7 +126,7 @@ Index: bindings/perl-shared/Makefile.PL 'NAME' => 'RRDs', Index: bindings/python/setup.py --- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100 -+++ bindings/python/setup.py 2009-09-28 17:32:58 +0200 ++++ bindings/python/setup.py 2010-01-06 11:47:45 +0100 @@ -47,7 +47,7 @@ Extension( "rrdtoolmodule", @@ -137,9 +137,9 @@ Index: bindings/python/setup.py include_dirs=[include_dir], ) Index: configure ---- configure.orig 2009-05-19 15:45:23 +0200 -+++ configure 2009-09-28 17:32:58 +0200 -@@ -23293,7 +23293,7 @@ +--- configure.orig 2009-11-15 12:54:58 +0100 ++++ configure 2010-01-06 11:47:45 +0100 +@@ -29655,7 +29655,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -148,7 +148,7 @@ Index: configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23482,7 +23482,7 @@ +@@ -29844,7 +29844,7 @@ fi if test "x$ac_cv_header_pango_pango_h" = x""yes; then @@ -157,7 +157,7 @@ Index: configure fi -@@ -23545,7 +23545,7 @@ +@@ -29907,7 +29907,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -166,7 +166,7 @@ Index: configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25049,9 +25049,9 @@ +@@ -33258,9 +33258,9 @@ $as_echo_n "checking for headers required to compile python extensions... " >&6; } py_prefix=`$PYTHON -c "import sys; print sys.prefix"` py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` @@ -178,10 +178,22 @@ Index: configure fi save_CPPFLAGS="$CPPFLAGS" +Index: src/rrd_daemon.c +--- src/rrd_daemon.c.orig 2009-10-30 23:49:50 +0100 ++++ src/rrd_daemon.c 2010-01-06 11:48:17 +0100 +@@ -107,7 +107,7 @@ + #include + #include + +-#include ++#include + /* }}} */ + + #define RRDD_LOG(severity, ...) syslog ((severity), __VA_ARGS__) Index: src/rrd_open.c ---- src/rrd_open.c.orig 2009-05-19 15:45:05 +0200 -+++ src/rrd_open.c 2009-09-28 17:32:58 +0200 -@@ -219,7 +219,7 @@ +--- src/rrd_open.c.orig 2009-11-15 12:54:23 +0100 ++++ src/rrd_open.c 2010-01-06 11:47:45 +0100 +@@ -259,7 +259,7 @@ #endif if (rdwr & RRD_CREAT) goto out_done; @@ -189,8 +201,8 @@ Index: src/rrd_open.c +#if defined(USE_MADVISE) && defined(MADV_WILLNEED) && defined(MADV_SEQUENTIAL) && defined(MADV_RANDOM) if (rdwr & RRD_COPY) { /* We will read everything in a moment (copying) */ - madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL); -@@ -252,7 +252,7 @@ + madvise(data, rrd_file->file_len, MADV_WILLNEED ); +@@ -294,7 +294,7 @@ rrd->stat_head->version); goto out_nullify_head; } @@ -199,7 +211,7 @@ Index: src/rrd_open.c /* the ds_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(ds_def_t) * rrd->stat_head->ds_cnt, MADV_WILLNEED); -@@ -260,7 +260,7 @@ +@@ -302,7 +302,7 @@ __rrd_read(rrd->ds_def, ds_def_t, rrd->stat_head->ds_cnt); @@ -208,7 +220,7 @@ Index: src/rrd_open.c /* the rra_def will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(rra_def_t) * rrd->stat_head->rra_cnt, MADV_WILLNEED); -@@ -275,7 +275,7 @@ +@@ -317,7 +317,7 @@ rrd_set_error("live_head_t malloc"); goto out_close; } @@ -217,7 +229,7 @@ Index: src/rrd_open.c /* the live_head will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED); #endif -@@ -285,7 +285,7 @@ +@@ -327,7 +327,7 @@ rrd->live_head->last_up = *rrd->legacy_last_up; rrd->live_head->last_up_usec = 0; } else { @@ -226,21 +238,21 @@ Index: src/rrd_open.c /* the live_head will be needed soonish, so hint accordingly */ madvise(data + PAGE_START(offset), sizeof(live_head_t), MADV_WILLNEED); -@@ -415,7 +415,7 @@ +@@ -498,7 +498,7 @@ + rrd->rra_ptr[i].cur_row * rrd->stat_head->ds_cnt * sizeof(rrd_value_t)); if (active_block > dontneed_start) { -#ifdef USE_MADVISE +#if defined(USE_MADVISE) && defined(MADV_DONTNEED) - madvise(rrd_file->file_start + dontneed_start, + madvise(rrd_simple_file->file_start + dontneed_start, active_block - dontneed_start - 1, MADV_DONTNEED); #endif -@@ -440,7 +440,7 @@ +@@ -523,7 +523,7 @@ } if (dontneed_start < rrd_file->file_len) { -#ifdef USE_MADVISE +#if defined(USE_MADVISE) && defined(MADV_DONTNEED) - madvise(rrd_file->file_start + dontneed_start, + madvise(rrd_simple_file->file_start + dontneed_start, rrd_file->file_len - dontneed_start, MADV_DONTNEED); #endif diff --git a/rrdtool/rrdtool.spec b/rrdtool/rrdtool.spec index 24627ac467..d7e4c9f360 100644 --- a/rrdtool/rrdtool.spec +++ b/rrdtool/rrdtool.spec @@ -22,8 +22,8 @@ ## # package version -%define V_rrdtool 1.3.9 -%define V_rrdtool_oo 0.27 +%define V_rrdtool 1.4.2 +%define V_rrdtool_oo 0.28 %define V_rrdtool_creator 0.9 %define V_rrd_simple 1.44 @@ -38,7 +38,7 @@ Class: BASE Group: Database License: LGPL Version: %{V_rrdtool} -Release: 20091025 +Release: 20100106 # package options %option with_perl no