openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: rrdtool 1.4.4 -> 1.4.5

master
Dr. Ralf S. Engelschall 15 years ago
parent
9a77a8c2c7
commit
927b105e3d
1 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      rrdtool/rrdtool.patch

58
rrdtool/rrdtool.patch
Unescape View File

@ -1,6 +1,6 @@
Index: RRDTool-OO-0.31/Makefile.PL
--- RRDTool-OO-0.31/Makefile.PL.orig 2010-01-09 00:50:31.000000000 +0100
+++ RRDTool-OO-0.31/Makefile.PL 2010-07-06 19:45:42.000000000 +0200
+++ RRDTool-OO-0.31/Makefile.PL 2010-12-27 08:45:34.000000000 +0100
@@ -10,52 +10,12 @@
}
};
@ -56,7 +56,7 @@ Index: RRDTool-OO-0.31/Makefile.PL
$ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (),
Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
--- RRDTool-OO-0.31/lib/RRDTool/OO.pm.orig 2010-05-26 02:26:34.000000000 +0200
+++ RRDTool-OO-0.31/lib/RRDTool/OO.pm 2010-07-06 19:45:42.000000000 +0200
+++ RRDTool-OO-0.31/lib/RRDTool/OO.pm 2010-12-27 08:45:34.000000000 +0100
@@ -5,7 +5,6 @@
use warnings;
use Carp;
@ -84,8 +84,8 @@ Index: RRDTool-OO-0.31/lib/RRDTool/OO.pm
}
}
Index: bindings/perl-shared/Makefile.PL
--- bindings/perl-shared/Makefile.PL.orig 2008-12-05 16:39:55.000000000 +0100
+++ bindings/perl-shared/Makefile.PL 2010-07-06 19:45:42.000000000 +0200
--- bindings/perl-shared/Makefile.PL.orig 2010-12-17 17:10:20.000000000 +0100
+++ bindings/perl-shared/Makefile.PL 2010-12-27 08:47:23.000000000 +0100
@@ -1,36 +1,7 @@
use ExtUtils::MakeMaker;
use Config;
@ -104,7 +104,7 @@ Index: bindings/perl-shared/Makefile.PL
- /hpux/ && do{ $R = "+b$rp"};
- /solaris/ && do{ $R = "-R$rp"};
- /bsd/ && do{ $R = "-R$rp"};
- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
- /aix/ && do{ $R = "-blibpath:$rp"};
- }
-}
-
@ -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.000000000 +0100
+++ bindings/python/setup.py 2010-07-06 19:45:42.000000000 +0200
+++ bindings/python/setup.py 2010-12-27 08:45:34.000000000 +0100
@@ -47,7 +47,7 @@
Extension(
"rrdtoolmodule",
@ -137,9 +137,9 @@ Index: bindings/python/setup.py
include_dirs=[include_dir],
)
Index: configure
--- configure.orig 2010-07-05 21:31:49.000000000 +0200
+++ configure 2010-07-06 19:47:00.000000000 +0200
@@ -24698,13 +24698,13 @@
--- configure.orig 2010-12-26 20:51:06.000000000 +0100
+++ configure 2010-12-27 08:45:34.000000000 +0100
@@ -24785,13 +24785,13 @@
if test "x""" != "x"; then
CPPFLAGS="$CPPFLAGS -I"""
fi
@ -156,7 +156,7 @@ Index: configure
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24893,7 +24893,7 @@
@@ -24980,7 +24980,7 @@
fi
if test "x$ac_cv_header_glib_h" = x""yes; then
@ -165,7 +165,7 @@ Index: configure
fi
@@ -24956,7 +24956,7 @@
@@ -25043,7 +25043,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -174,7 +174,7 @@ Index: configure
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25248,7 +25248,7 @@
@@ -25335,7 +25335,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -183,7 +183,7 @@ Index: configure
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25437,7 +25437,7 @@
@@ -25524,7 +25524,7 @@
fi
if test "x$ac_cv_header_pango_pango_h" = x""yes; then
@ -192,7 +192,7 @@ Index: configure
fi
@@ -25500,7 +25500,7 @@
@@ -25587,7 +25587,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -201,7 +201,7 @@ Index: configure
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -28851,9 +28851,9 @@
@@ -28938,9 +28938,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"`
@ -214,11 +214,11 @@ Index: configure
save_CPPFLAGS="$CPPFLAGS"
Index: src/rrd_daemon.c
--- src/rrd_daemon.c.orig 2010-04-26 14:38:11.000000000 +0200
+++ src/rrd_daemon.c 2010-07-06 19:45:42.000000000 +0200
@@ -109,7 +109,7 @@
#include <libgen.h>
#include <grp.h>
--- src/rrd_daemon.c.orig 2010-12-21 17:06:32.000000000 +0100
+++ src/rrd_daemon.c 2010-12-27 08:45:34.000000000 +0100
@@ -113,7 +113,7 @@
#include <tcpd.h>
#endif /* HAVE_LIBWRAP */
-#include <glib-2.0/glib.h>
+#include <glib2/glib.h>
@ -226,9 +226,9 @@ Index: src/rrd_daemon.c
#define RRDD_LOG(severity, ...) \
Index: src/rrd_open.c
--- src/rrd_open.c.orig 2010-07-05 17:38:22.000000000 +0200
+++ src/rrd_open.c 2010-07-06 19:45:42.000000000 +0200
@@ -263,7 +263,7 @@
--- src/rrd_open.c.orig 2010-12-26 20:24:48.000000000 +0100
+++ src/rrd_open.c 2010-12-27 08:45:34.000000000 +0100
@@ -265,7 +265,7 @@
#endif
if (rdwr & RRD_CREAT)
goto out_done;
@ -237,7 +237,7 @@ Index: src/rrd_open.c
if (rdwr & RRD_COPY) {
/* We will read everything in a moment (copying) */
madvise(data, rrd_file->file_len, MADV_WILLNEED );
@@ -298,7 +298,7 @@
@@ -300,7 +300,7 @@
rrd->stat_head->version);
goto out_nullify_head;
}
@ -246,7 +246,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);
@@ -306,7 +306,7 @@
@@ -308,7 +308,7 @@
__rrd_read(rrd->ds_def, ds_def_t,
rrd->stat_head->ds_cnt);
@ -255,7 +255,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);
@@ -321,7 +321,7 @@
@@ -323,7 +323,7 @@
rrd_set_error("live_head_t malloc");
goto out_close;
}
@ -264,7 +264,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
@@ -331,7 +331,7 @@
@@ -333,7 +333,7 @@
rrd->live_head->last_up = *rrd->legacy_last_up;
rrd->live_head->last_up_usec = 0;
} else {
@ -273,7 +273,7 @@ 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);
@@ -502,7 +502,7 @@
@@ -504,7 +504,7 @@
+ rrd->rra_ptr[i].cur_row
* rrd->stat_head->ds_cnt * sizeof(rrd_value_t));
if (active_block > dontneed_start) {
@ -282,7 +282,7 @@ Index: src/rrd_open.c
madvise(rrd_simple_file->file_start + dontneed_start,
active_block - dontneed_start - 1, MADV_DONTNEED);
#endif
@@ -527,7 +527,7 @@
@@ -529,7 +529,7 @@
}
if (dontneed_start < rrd_file->file_len) {

Write Preview
Loading…
Cancel
Save