|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
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
|
|
|
|
|
+++ RRDTool-OO-0.28/Makefile.PL 2010-01-19 14:08:56 +0100
|
|
|
|
|
@@ -2,52 +2,12 @@
|
|
|
|
|
use ExtUtils::MakeMaker;
|
|
|
|
|
use File::Basename;
|
|
|
|
|
@ -56,7 +56,7 @@ Index: RRDTool-OO-0.28/Makefile.PL
|
|
|
|
|
($] >= 5.005 ? ## Add these new keywords supported since 5.005
|
|
|
|
|
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
|
|
|
|
|
+++ RRDTool-OO-0.28/lib/RRDTool/OO.pm 2010-01-19 14:08:56 +0100
|
|
|
|
|
@@ -5,7 +5,6 @@
|
|
|
|
|
use warnings;
|
|
|
|
|
use Carp;
|
|
|
|
|
@ -85,7 +85,7 @@ Index: RRDTool-OO-0.28/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 2010-01-06 11:47:45 +0100
|
|
|
|
|
+++ bindings/perl-shared/Makefile.PL 2010-01-19 14:08:56 +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 2010-01-06 11:47:45 +0100
|
|
|
|
|
+++ bindings/python/setup.py 2010-01-19 14:08:56 +0100
|
|
|
|
|
@@ -47,7 +47,7 @@
|
|
|
|
|
Extension(
|
|
|
|
|
"rrdtoolmodule",
|
|
|
|
|
@ -138,7 +138,42 @@ Index: bindings/python/setup.py
|
|
|
|
|
)
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2009-11-15 12:54:58 +0100
|
|
|
|
|
+++ configure 2010-01-06 11:47:45 +0100
|
|
|
|
|
+++ configure 2010-01-19 14:09:51 +0100
|
|
|
|
|
@@ -29105,13 +29105,13 @@
|
|
|
|
|
if test "x""" != "x"; then
|
|
|
|
|
CPPFLAGS="$CPPFLAGS -I"""
|
|
|
|
|
fi
|
|
|
|
|
- { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib-2.0" >&5
|
|
|
|
|
-$as_echo_n "checking for glib_check_version in -lglib-2.0... " >&6; }
|
|
|
|
|
+ { $as_echo "$as_me:$LINENO: checking for glib_check_version in -lglib2" >&5
|
|
|
|
|
+$as_echo_n "checking for glib_check_version in -lglib2... " >&6; }
|
|
|
|
|
if test "${ac_cv_lib_glib_2_0_glib_check_version+set}" = set; then
|
|
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
|
else
|
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
|
-LIBS="-lglib-2.0 $LIBS"
|
|
|
|
|
+LIBS="-lglib2 $LIBS"
|
|
|
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
|
|
|
/* confdefs.h. */
|
|
|
|
|
_ACEOF
|
|
|
|
|
@@ -29300,7 +29300,7 @@
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
if test "x$ac_cv_header_glib_h" = x""yes; then
|
|
|
|
|
- LIBS="-lglib-2.0 ${LIBS}";EX_CHECK_STATE=YES
|
|
|
|
|
+ LIBS="-lglib2 ${LIBS}";EX_CHECK_STATE=YES
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -29363,7 +29363,7 @@
|
|
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
|
else
|
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
|
-LIBS="-lglib-2.0 $LIBS"
|
|
|
|
|
+LIBS="-lglib2 $LIBS"
|
|
|
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
|
|
|
/* confdefs.h. */
|
|
|
|
|
_ACEOF
|
|
|
|
|
@@ -29655,7 +29655,7 @@
|
|
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
|
else
|
|
|
|
|
@ -180,7 +215,7 @@ Index: configure
|
|
|
|
|
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
|
|
|
|
|
+++ src/rrd_daemon.c 2010-01-19 14:08:56 +0100
|
|
|
|
|
@@ -107,7 +107,7 @@
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <libgen.h>
|
|
|
|
|
@ -192,7 +227,7 @@ Index: src/rrd_daemon.c
|
|
|
|
|
#define RRDD_LOG(severity, ...) syslog ((severity), __VA_ARGS__)
|
|
|
|
|
Index: src/rrd_open.c
|
|
|
|
|
--- src/rrd_open.c.orig 2009-11-15 12:54:23 +0100
|
|
|
|
|
+++ src/rrd_open.c 2010-01-06 11:47:45 +0100
|
|
|
|
|
+++ src/rrd_open.c 2010-01-19 14:08:56 +0100
|
|
|
|
|
@@ -259,7 +259,7 @@
|
|
|
|
|
#endif
|
|
|
|
|
if (rdwr & RRD_CREAT)
|
|
|
|
|
|
