OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Oct-2008 09:48:45
Branch: HEAD Handle: 2008100508484400
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
Log:
upgrading package: rrdtool 1.3.3 -> 1.3.4
Summary:
Revision Changes Path
1.26 +28 -29 openpkg-src/rrdtool/rrdtool.patch
1.117 +2 -2 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.25 -r1.26 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 7 Sep 2008 17:59:25 -0000 1.25
+++ openpkg-src/rrdtool/rrdtool.patch 5 Oct 2008 07:48:44 -0000 1.26
@@ -1,6 +1,6 @@
Index: RRDTool-OO-0.22/Makefile.PL
--- RRDTool-OO-0.22/Makefile.PL.orig 2008-01-24 04:29:54 +0100
-+++ RRDTool-OO-0.22/Makefile.PL 2008-09-07 19:55:24 +0200
++++ RRDTool-OO-0.22/Makefile.PL 2008-10-05 09:39:11 +0200
@@ -2,55 +2,12 @@
use ExtUtils::MakeMaker;
use File::Basename;
@@ -59,7 +59,7 @@
($] >= 5.005 ? ## Add these new keywords supported since 5.005
Index: RRDTool-OO-0.22/lib/RRDTool/OO.pm
--- RRDTool-OO-0.22/lib/RRDTool/OO.pm.orig 2008-05-20 11:17:57 +0200
-+++ RRDTool-OO-0.22/lib/RRDTool/OO.pm 2008-09-07 19:55:24 +0200
++++ RRDTool-OO-0.22/lib/RRDTool/OO.pm 2008-10-05 09:39:11 +0200
@@ -5,7 +5,6 @@
use warnings;
use Carp;
@@ -87,14 +87,14 @@
}
}
Index: bindings/perl-shared/Makefile.PL
---- bindings/perl-shared/Makefile.PL.orig 2008-03-15 11:39:48 +0100
-+++ bindings/perl-shared/Makefile.PL 2008-09-07 19:55:24 +0200
-@@ -1,30 +1,8 @@
+--- bindings/perl-shared/Makefile.PL.orig 2008-09-19 22:34:42 +0200
++++ bindings/perl-shared/Makefile.PL 2008-10-05 09:40:49 +0200
+@@ -1,30 +1,7 @@
use ExtUtils::MakeMaker;
use Config;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
--
+
-# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
-# path to librrd.so then the Makefile will be written such that RRDs.so
knows
-# where to find librrd.so later on ...
@@ -106,6 +106,7 @@
- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
- /hpux/ && do{ $R = "+b$rp"};
- /solaris/ && do{ $R = "-R$rp"};
+- /bsd/ && do{ $R = "-R$rp"};
- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
- }
-}
@@ -116,15 +117,13 @@
-# to the perl shared object.
-
-my $librrd = "-L../../src/.libs/ $R -lrrd";
-
+my $librrd = "-L../../src/.libs/ -lrrd -L$Config{prefix}/lib -lfreetype
-lpng -lz -lart_lgpl";
-+
+
WriteMakefile(
'NAME' => 'RRDs',
- 'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
Index: bindings/python/setup.py
--- bindings/python/setup.py.orig 2008-03-15 11:39:48 +0100
-+++ bindings/python/setup.py 2008-09-07 19:55:24 +0200
++++ bindings/python/setup.py 2008-10-05 09:39:11 +0200
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@@ -135,9 +134,9 @@
include_dirs=[include_dir],
)
Index: configure
---- configure.orig 2008-09-06 16:26:14 +0200
-+++ configure 2008-09-07 19:55:56 +0200
-@@ -30681,7 +30681,7 @@
+--- configure.orig 2008-10-04 18:04:20 +0200
++++ configure 2008-10-05 09:39:11 +0200
+@@ -30688,7 +30688,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -146,7 +145,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30864,7 +30864,7 @@
+@@ -30871,7 +30871,7 @@
fi
if test $ac_cv_header_pango_pango_h = yes; then
@@ -155,7 +154,7 @@
fi
-@@ -30920,14 +30920,14 @@
+@@ -30927,14 +30927,14 @@
LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-L pangocairo`
LDFLAGS=${LDFLAGS}" "`$PKGCONFIG --libs-only-other pangocairo`
LIBS=${LIBS}" "`$PKGCONFIG --libs-only-l pangocairo`
@@ -172,7 +171,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32403,9 +32403,9 @@
+@@ -32412,9 +32412,9 @@
echo $ECHO_N "checking for headers required to compile python extensions...
$ECHO_C" >&6; }
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
@@ -185,9 +184,9 @@
save_CPPFLAGS="$CPPFLAGS"
Index: src/rrd_open.c
---- src/rrd_open.c.orig 2008-09-06 16:24:43 +0200
-+++ src/rrd_open.c 2008-09-07 19:55:24 +0200
-@@ -174,7 +174,7 @@
+--- src/rrd_open.c.orig 2008-10-04 18:04:04 +0200
++++ src/rrd_open.c 2008-10-05 09:41:48 +0200
+@@ -188,7 +188,7 @@
#endif
if (rdwr & RRD_CREAT)
goto out_done;
@@ -196,7 +195,7 @@
if (rdwr & RRD_COPY) {
/* We will read everything in a moment (copying) */
madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
-@@ -207,7 +207,7 @@
+@@ -221,7 +221,7 @@
rrd->stat_head->version);
goto out_nullify_head;
}
@@ -205,7 +204,7 @@
/* 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);
-@@ -215,7 +215,7 @@
+@@ -229,7 +229,7 @@
__rrd_read(rrd->ds_def, ds_def_t,
rrd->stat_head->ds_cnt);
@@ -214,7 +213,7 @@
/* 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);
-@@ -230,7 +230,7 @@
+@@ -244,7 +244,7 @@
rrd_set_error("live_head_t malloc");
goto out_close;
}
@@ -223,7 +222,7 @@
/* the live_head will be needed soonish, so hint accordingly */
madvise(data + PAGE_START(offset), sizeof(time_t), MADV_WILLNEED);
#endif
-@@ -240,7 +240,7 @@
+@@ -254,7 +254,7 @@
rrd->live_head->last_up = *rrd->legacy_last_up;
rrd->live_head->last_up_usec = 0;
} else {
@@ -232,7 +231,7 @@
/* the live_head will be needed soonish, so hint accordingly */
madvise(data + PAGE_START(offset),
sizeof(live_head_t), MADV_WILLNEED);
-@@ -340,7 +340,7 @@
+@@ -377,7 +377,7 @@
+ rrd->rra_ptr[i].cur_row
* rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
if (active_block > dontneed_start) {
@@ -241,12 +240,12 @@
madvise(rrd_file->file_start + dontneed_start,
active_block - dontneed_start - 1, MADV_DONTNEED);
#endif
-@@ -363,7 +363,7 @@
- rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt *
- sizeof(rrd_value_t);
+@@ -402,7 +402,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,
- rrd_file->file_len - dontneed_start, MADV_DONTNEED);
+ madvise(rrd_file->file_start + dontneed_start,
+ rrd_file->file_len - dontneed_start, MADV_DONTNEED);
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.116 -r1.117 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 27 Sep 2008 13:35:38 -0000 1.116
+++ openpkg-src/rrdtool/rrdtool.spec 5 Oct 2008 07:48:44 -0000 1.117
@@ -22,7 +22,7 @@
##
# package version
-%define V_rrdtool 1.3.3
+%define V_rrdtool 1.3.4
%define V_rrdtool_oo 0.22
%define V_rrdtool_creator 0.9
%define V_rrd_simple 1.44
@@ -38,7 +38,7 @@
Group: Database
License: LGPL
Version: %{V_rrdtool}
-Release: 20080927
+Release: 20081005
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
