![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3a03e55)
raw | patch | inline | side by side (parent: 3a03e55)
| author | Sebastian Harl <sh@tokkee.org> | |
| Wed, 23 Jul 2008 19:40:04 +0000 (21:40 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Wed, 23 Jul 2008 19:40:04 +0000 (21:40 +0200) |
103 files changed:
index 059edeebd35475359c52c220e8649b5f03925b7b..c4e90626834f15b1b29599f2ac572a2a126d256a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
+2008-07-23 13:02 oetiker
+
+ * bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
+ configure.ac, doc/rrdbuild.pod, rrdtool.spec, src/pngsize.c,
+ src/rrd.h, src/rrd_cgi.c, src/rrd_create.c, src/rrd_datalang.c,
+ src/rrd_diff.c, src/rrd_dump.c, src/rrd_error.c, src/rrd_fetch.c,
+ src/rrd_first.c, src/rrd_format.c, src/rrd_format.h,
+ src/rrd_gfx.c, src/rrd_graph.c, src/rrd_graph_helper.c,
+ src/rrd_hw.c, src/rrd_hw.h, src/rrd_i18n.h, src/rrd_info.c,
+ src/rrd_is_thread_safe.h, src/rrd_last.c, src/rrd_lastupdate.c,
+ src/rrd_not_thread_safe.c, src/rrd_open.c, src/rrd_resize.c,
+ src/rrd_restore.c, src/rrd_rpncalc.c, src/rrd_rpncalc.h,
+ src/rrd_thread_safe.c, src/rrd_thread_safe_nt.c, src/rrd_tool.c,
+ src/rrd_tool.h, src/rrd_tune.c, src/rrd_update.c,
+ src/rrd_version.c, src/rrd_xport.c, src/rrd_xport.h,
+ src/rrdupdate.c: prepare for the release of rrdtool-1.3.1
+
+2008-07-23 12:45 oetiker
+
+ * src/rrd_restore.c: added support for restoring rrdtool 1.0.x files
+ ... removed support for old HW patched rrd format created by an
+ early patched version of 1.0.x
+
+2008-07-22 15:15 oetiker
+
+ * branches/1.2/program/src/rrd_create.c, src/rrd_create.c: Fix for
+ #167 - rrdcreate is arguably missing a check for 'step>=1' for
+ RRAs with AVERAGE as a CF. I ran into this when specifying 0.6 as
+ a step value, assuming floats were also accepted. Patch attached
+ here. -- Bogdan
+
+2008-07-01 06:35 oetiker
+
+ * doc/rrdbuild.pod: header-fix
+
+2008-07-01 06:34 oetiker
+
+ * doc/rrdbuild.pod: improve layout
+
+2008-06-29 16:23 oetiker
+
+ * src/rrd_update.c: added rrd filename to illegal update message --
+ he at uninett.no
+
+2008-06-29 14:08 oetiker
+
+ * rrdtool.spec: rrdtool.spec fix by Anton Blanchard to build without
+ php patch
+
+2008-06-29 13:57 oetiker
+
+ * doc/rrdgraph.pod, src/rrd_graph.c: make sure image-with and
+ image-height get returned even when rrdtool is called with --lazy
+ as reported in bug #163
+
+2008-06-27 06:08 zaucker
+
+ * trunk/tutorial/lisa2008/abstract-rrdexample.txt,
+ trunk/tutorial/lisa2008/abstract-rrdtut.txt: Etwas ueberarbeitet
+
+2008-06-24 15:05 oetiker
+
+ * trunk/tutorial/lisa2008,
+ trunk/tutorial/lisa2008/abstract-rrdexample.txt,
+ trunk/tutorial/lisa2008/abstract-rrdtut.txt: intial
+
+2008-06-19 13:18 oetiker
+
+ * branches/1.2/program/bindings/python/rrdtoolmodule.c,
+ bindings/python/rrdtoolmodule.c: rrdtool.fetch is returning an
+ extra, bogus, data point. Attached is a patch to correct this. -
+ Gilad Raphaelli. Fix for #161
+
+2008-06-12 13:54 oetiker
+
+ * doc/rrdgraph_graph.pod: added note on %S
+
+2008-06-11 15:49 oetiker
+
+ * NEWS: made news the same as the announcement
+
2008-06-10 23:12 oetiker
* bindings/perl-piped/RRDp.pm, bindings/perl-shared/RRDs.pm,
index ec85692d9a480391f86f76925dd3aab8dac37a43..5497a671bc39f122c1484967171ef684873f5e6f 100644 (file)
--- a/NEWS
+++ b/NEWS
Major Changes between 1.2.x and 1.3.x
-------------------------------------
-RRdtool dump / restore Incompatibilities
-----------------------------------------
-rrdtool dump 1.3 does emit completely legal xml. Basically this means that
-it contains an xml header and a DOCTYPE definition. Unfortunately this
-causes older versions of rrdtool restore to be unhappy.
-
-To restore a new dump with ann old rrdtool restore version, either remove
-the xml header and the doctype by hand (both on the first line of the dump)
-or use rrdtool dump --no-header.
-
-NEW File access methods (Bernhard Fischer)
--------------------
+NEW Fast file access methods (Bernhard Fischer / Tobi Oetiker)
+----------------------------
* introduced file-accessor functions rrd_read/rrd_seek/rrd_write
-* implemented full mmap-based file access with madvise hints for improved
- scalability, much reduced memory-footprint and much less blocking on
- disk
-* implemented optional full file-descriptor access instead of FILE* access
+
+* implemented full mmap-based file access with madvise hints for
+ improved scalability, much reduced memory-footprint and much less
+ blocking while accessing the disk
+
+* implemented optional full file-descriptor access instead of FILE*
+ access
NEW Graphing (Tobi Oetiker)
---------
+------------
* libart has been replaced by cairo/pango
+
* pango markup is supported (--pango-markup)
-* full gridfitting
-* --graph-render-mode=mono for non antialiased graphing
-* --font-render-mode=mono for non antialiased fonts
-* fonts come through fontconfig, use the Pango fontnameing
- scheme -> 'Times 20' ... it is not possible to use
- truetype fonts directly anymore.
+
+* full grid fitting
+
+* --graph-render-mode=mono for non anti aliased graphing
+
+* --font-render-mode=mono for non anti aliased fonts
+
+* fonts come through fontconfig, use the Pango font nameing scheme
+ -> 'Times 20' ... it is not possible to use truetype fonts
+ directly anymore.
+
* Tabs are position independent.
-* TRENDNAN filter that ignores NAN values while caculating the TREND data. (Timo Stripf)
-* --full-size-mode to specify the outer border of the image and not just of the graphing canvas (Matthew Chambers)
-* TEXTALIGN command to alter default text alignment behaviour
+
+* TRENDNAN filter that ignores NAN values while calculating the
+ TREND data. (Timo Stripf)
+
+* --full-size-mode to specify the outer border of the image and not
+ just of the graphing canvas (Matthew Chambers)
+
+* TEXTALIGN command to alter default text alignment behavior
+
* C API in-memory graphing with rrd_graph_v (Evan Miller)
+
* draw dashed lines in graphs (Thomas Gutzler)
-* new interface graphv which returns inforamation using the rrd_info
+
+* new interface graphv which returns information using the rrd_info
interface (Tobi Oetiker and Mark Plaksin)
-* improved horizontal grid. Have a bit more grid lines and y-axis labels
- while keeping them fahr enough apart to not run into each other.
+
+* improved horizontal grid. Have a bit more grid lines and y-axis
+ labels while keeping them far enough apart to not run into each
+ other.
NEW Forecasting (Evan Miller)
------------
-* the new MHWPREDICT consolidation function uses a variation of the Holt-Winters
- method. It is a drop-in replacement for HWPREDICT, and is better suited for
- data whose seasonal variations grow or shrink in proportion to the average.
+---------------
+* the new MHWPREDICT consolidation function uses a variation of the
+ Holt-Winters method. It is a drop-in replacement for HWPREDICT,
+ and is better suited for data whose seasonal variations grow or
+ shrink in proportion to the average.
-* If you create an RRD with the new MHWPREDICT function, the resulting
- rrdfile will be version 0004 and can only be used in rrdtool 1.3.
+* If you create an RRD with the new MHWPREDICT function, the
+ resulting rrd file will be version 0004 and can only be used in
+ rrdtool 1.3.
Rewrites
--------
-* rrd_restore now uses libxml for parsing which makes things much more
- tolerant towards xml variations. The old code could mostly just parse the
- xml as it was output by rrdtool dump. See also: 'incompatibilities' at the
- top of this document. (by Florian octo Forster)
+* rrd_restore now uses libxml for parsing which makes things much
+ more tolerant towards xml variations. The old code could mostly
+ just parse the XML as it was output by rrdtool dump. See also:
+ the note at the bottom of this document. (by Florian octo
+ Forster)
-* rrd_update rewritten to make it more modular. Fixed two longstanding
- HW bugs in the process (Evan Miller)
+* rrd_update rewritten to make it more modular. Fixed two
+ longstanding HW bugs in the process (Evan Miller)
Internationalization (Takao Fujiwara and Tobi Oetiker)
--------------------
-* The help output by rrdtool has been internationalized. There are no real
- translations included with rrdtool yet, contributions are welcome.
-* The internationalization will only be compiled if libintl and friends are
- available on your system. Use the configure option --disable-libintl if
- you want to disable this feature
+* The help output by rrdtool has been internationalized. There are
+ no real translations included with rrdtool yet, contributions are
+ welcome.
+
+* The internationalization will only be compiled if libintl and
+ friends are available on your system. Use the configure option
+ --disable-libintl if you want to disable this feature
Language Bindings
-----------------
* ruby rrd_fetch will return step as a last property -- Mike Perham
-* python rrdtool.info does now conform with the data structure returned
- by the other language bindings. This is incompatible with the
- previous (broken) version --tobi
-
-* python bindings got updatev support --tobi
+RRDtool dump / restore incompatibility
+--------------------------------------
+* rrdtool dump 1.3 does emit completely legal XML. Basically this
+ means that it contains an XML header and a DOCTYPE definition.
+ Unfortunately this causes older versions of rrdtool restore to be
+ unhappy.
-* ruby, perl, python bindings support the new graphv interface --tobi
+* To restore a new dump with an old rrdtool restore version, either
+ remove the XML header and the doctype by hand (both on the first
+ line of the dump) or use rrdtool dump --no-header.
-Locale Independent Numeric Input
---------------------------------
-* Regardles of locale you are in, rrdtool always expects input to be numbers
- (LC_NUMERIC) in C or POSIX locale for numbers. (not 1,1 but 1.1) this is
- necessary to make things like RPN work as it uses , as a separator.
######################################################################################
Major Changes between 1.0.x and 1.2.x
index a99e56e78affb146a66e3b188347e822bdd62cc0..0a28506c28fe8533a1d03a1746a5faa6105cb658 100644 (file)
sub end ();
sub read ();
-$VERSION=1.3000;
+$VERSION=1.3001;
sub start ($){
croak "rrdtool is already running"
index d151db4ef328e4dc20f5b0042ff8f7ea2d10ca3b..df115c1cdb248aeed702888ae379bba2ed91228e 100644 (file)
require DynaLoader;
-$VERSION=1.3000;
+$VERSION=1.3001;
bootstrap RRDs $VERSION;
index 1b85f965550e1dbc8a15779dceeabb76bdd9834a..2771720711310ab670cfc1e0ac2589122cae0c2d 100644 (file)
unsigned long i, j, row;
rrd_value_t dv;
- row = ((end - start) / step + 1);
+ row = (end - start) / step;
r = PyTuple_New(3);
range_tup = PyTuple_New(3);
diff --git a/configure b/configure
index 3985c27b2de75472a7616624244c1d3690c971e4..38cd899e9fbdecf218294d961776dc9be2dd26a4 100755 (executable)
--- a/configure
+++ b/configure
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for rrdtool 1.3.0.
+# Generated by GNU Autoconf 2.61 for rrdtool 1.3.1.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# Identity of this package.
PACKAGE_NAME='rrdtool'
PACKAGE_TARNAME='rrdtool'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='rrdtool 1.3.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='rrdtool 1.3.1'
PACKAGE_BUGREPORT=''
ac_default_prefix=/usr/local/rrdtool-$PACKAGE_VERSION
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rrdtool 1.3.0 to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rrdtool 1.3.0:";;
+ short | recursive ) echo "Configuration of rrdtool 1.3.1:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rrdtool configure 1.3.0
+rrdtool configure 1.3.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rrdtool $as_me 1.3.0, which was
+It was created by rrdtool $as_me 1.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-NUMVERS=1.3000
+NUMVERS=1.3001
LIBVERS=4:0:0
# Define the identity of the package.
PACKAGE='rrdtool'
- VERSION='1.3.0'
+ VERSION='1.3.1'
cat >>confdefs.h <<_ACEOF
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rrdtool $as_me 1.3.0, which was
+This file was extended by rrdtool $as_me 1.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-rrdtool config.status 1.3.0
+rrdtool config.status 1.3.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 7a15b5c14911bd66e8b50dde96f8c22b73e5d9e2..80ada6012203dbaf8e672e6f6a76ff74280e854a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl the official version number is
dnl a.b.c
-AC_INIT([rrdtool],[1.3.0])
+AC_INIT([rrdtool],[1.3.1])
dnl for testing a numberical version number comes handy
dnl the released version are
dnl a.bccc
dnl the devel versions will be something like
dnl a.b999yymmddhh
-NUMVERS=1.3000
+NUMVERS=1.3001
AC_SUBST(NUMVERS)
dnl for the linker to understand which version the library is compatible with
diff --git a/doc/bin_dec_hex.1 b/doc/bin_dec_hex.1
index dd06561ce4b791753211656fc9d077bc8aa9e9ad..f6ba28b0e80ee846d3a0baedad9ebbba0c42ed7b 100644 (file)
--- a/doc/bin_dec_hex.1
+++ b/doc/bin_dec_hex.1
.\" ========================================================================
.\"
.IX Title "BIN_DEC_HEX 1"
-.TH BIN_DEC_HEX 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH BIN_DEC_HEX 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
bin_dec_hex \- How to use binary, decimal, and hexadecimal notation.
.SH "DESCRIPTION"
diff --git a/doc/bin_dec_hex.txt b/doc/bin_dec_hex.txt
index 3fe4075b93ba827eebef93b3816bf2a0acf03244..f4f7acbe84bf3988fc010849064a37dc015d4f08 100644 (file)
--- a/doc/bin_dec_hex.txt
+++ b/doc/bin_dec_hex.txt
-1.3.0 2008-03-15 BIN_DEC_HEX(1)
+1.3.1 2008-03-15 BIN_DEC_HEX(1)
diff --git a/doc/cdeftutorial.1 b/doc/cdeftutorial.1
index dd5d9c9cdeb2fd503cd1db753a7644741c49e4bb..0da42ffca59d55f1b8a8f65e7483b3202135b815 100644 (file)
--- a/doc/cdeftutorial.1
+++ b/doc/cdeftutorial.1
.\" ========================================================================
.\"
.IX Title "CDEFTUTORIAL 1"
-.TH CDEFTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH CDEFTUTORIAL 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
cdeftutorial \- Alex van den Bogaerdt's CDEF tutorial
.SH "DESCRIPTION"
diff --git a/doc/cdeftutorial.txt b/doc/cdeftutorial.txt
index 0b0ec476deb99bc37294e626a8fa2056023073ac..7365bac1990535283071cc118c370a5a16d2e8b4 100644 (file)
--- a/doc/cdeftutorial.txt
+++ b/doc/cdeftutorial.txt
-1.3.0 2008-03-15 CDEFTUTORIAL(1)
+1.3.1 2008-03-15 CDEFTUTORIAL(1)
diff --git a/doc/rpntutorial.1 b/doc/rpntutorial.1
index 8cdfbaaeecc5cb4b6607ed263df2b7da0129327c..ae733c0cbb63ff19d4acb67d454243f77a31b9c7 100644 (file)
--- a/doc/rpntutorial.1
+++ b/doc/rpntutorial.1
.\" ========================================================================
.\"
.IX Title "RPNTUTORIAL 1"
-.TH RPNTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RPNTUTORIAL 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rpntutorial \- Reading RRDtool RPN Expressions by Steve Rader
.SH "DESCRIPTION"
diff --git a/doc/rpntutorial.txt b/doc/rpntutorial.txt
index 9605c4ba901c18d7d011c4efe3ef95aadf35c382..690693bf1ed1c6736bf00d797abbcae12daea5d9 100644 (file)
--- a/doc/rpntutorial.txt
+++ b/doc/rpntutorial.txt
-1.3.0 2008-03-15 RPNTUTORIAL(1)
+1.3.1 2008-03-15 RPNTUTORIAL(1)
diff --git a/doc/rrd-beginners.1 b/doc/rrd-beginners.1
index 906e235f7def3e745c32e54490c412cc794be4cf..8534a1f2b77ebd49acd497cf25c2b074b19df4cb 100644 (file)
--- a/doc/rrd-beginners.1
+++ b/doc/rrd-beginners.1
.\" ========================================================================
.\"
.IX Title "RRD-BEGINNERS 1"
-.TH RRD-BEGINNERS 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRD-BEGINNERS 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrd\-beginners \- RRDtool Beginners' Guide
.SH "SYNOPSIS"
diff --git a/doc/rrd-beginners.txt b/doc/rrd-beginners.txt
index 27ae8552d2ede699ae77ba7ba0b59099029a4693..9d2aed1d63ef22e1d496fc1c0f71d3f46cccac83 100644 (file)
--- a/doc/rrd-beginners.txt
+++ b/doc/rrd-beginners.txt
-1.3.0 2008-03-15 RRD-BEGINNERS(1)
+1.3.1 2008-03-15 RRD-BEGINNERS(1)
diff --git a/doc/rrdbuild.1 b/doc/rrdbuild.1
index 1ba620ba897e0e87f0daa4d7765500d58182239f..80dae58885c77e9f066af3943edeb247a69783e3 100644 (file)
--- a/doc/rrdbuild.1
+++ b/doc/rrdbuild.1
.\" ========================================================================
.\"
.IX Title "RRDBUILD 1"
-.TH RRDBUILD 1 "2008-06-11" "1.3.0" "rrdtool"
+.TH RRDBUILD 1 "2008-07-23" "1.3.1" "rrdtool"
.SH "NAME"
rrdbuild \- Instructions for building RRDtool
.SH "OVERVIEW"
.PP
.Vb 2
\& BUILD_DIR=/tmp/rrdbuild
-\& INSTALL_DIR=/usr/local/rrdtool\-1.3.0
+\& INSTALL_DIR=/usr/local/rrdtool\-1.3.1
.Ve
.PP
If your \fI/tmp\fR is mounted with the option noexec (\s-1RHEL\s0 seems todo that) you have to choose
pre\-installed.
.PP
.Vb 4
-\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3.0.tar.gz
-\& gunzip \-c rrdtool\-1.3.0.tar.gz | tar xf \-
-\& cd rrdtool\-1.3.0
+\& wget http://oss.oetiker.ch/rrdtool/pub/rrdtool\-1.3.1.tar.gz
+\& gunzip \-c rrdtool\-1.3.1.tar.gz | tar xf \-
+\& cd rrdtool\-1.3.1
\& ./configure \-\-prefix=$INSTALL_DIR && make && make install
.Ve
.PP
system anyway. Freetype, Fontinst, Cairo, Pango may be installed, but it is
possible that they are pretty old and thus don't live up to our
expectations, so you may want to compile their latest versions.
-.PP
-\fIBuild Tips for \s-1AIX\s0\fR
-.IX Subsection "Build Tips for AIX"
-.PP
+.Sh "General build tips for \s-1AIX\s0"
+.IX Subsection "General build tips for AIX"
If you are working with \s-1AIX\s0, you may find the the \fB\-\-disable\-shared\fR option
will cause things to break for you. In that case you may have to install the
shared libraries into the rrdtool \s-1PREFIX\s0 and work with \fB\-\-disable\-static\fR
@@ -273,33 +271,32 @@ Another hint to get rrdtool working on \s-1AIX\s0 is to use the \s-1IBM\s0 \s-1X
.Ve
.PP
(Better instructions for \s-1AIX\s0 welcome!)
-.Sh "Building Libraries"
-.IX Subsection "Building Libraries"
-In order to build the libraries you need a compiler on your system.
-Unfortunately compilers are not all alike. This has an effect on the \s-1CFLAGS\s0
-you want to set. The examples below are for the popular \s-1GCC\s0 compiler suite.
-If you have an other compilers here are some ides:
+.Sh "Build Instructions"
+.IX Subsection "Build Instructions"
+In order to build rrdtool need a compiler on your system. Unfortunately
+compilers are not all alike. This has an effect on the \s-1CFLAGS\s0 you want to
+set. The examples below are for the popular \s-1GCC\s0 compiler suite. If you have
+an other compilers here are some ides:
.IP "Sun Forte" 4
.IX Item "Sun Forte"
.Vb 1
\& CFLAGS="\-xO3 \-kPIC"
.Ve
-.Sp
-.RS 4
+.PP
Some libraries want to know where other libraries are. For this to work,
set the following environment variable
-.Sp
+.PP
.Vb 2
\& export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig
\& export PATH=$INSTALL_DIR/bin:$PATH
.Ve
-.Sp
-This relies on the presence of the \fIpkgconfig\fR program. Below you find instructions
-on how to compile pkgconfig as well.
-.Sp
-Since we are compiling libraries dynamically, they must know
-where to find each other. This is done by setting an appropriate \s-1LDFLAGS\s0.
-Unfortunately, the syntax again differs from system to system:
+.PP
+The above relies on the presence of the \fIpkgconfig\fR program. Below you find instructions
+on how to compile pkgconfig.
+.PP
+Since we are compiling libraries dynamically, they must know where to find
+each other. This is done by setting an appropriate \s-1LDFLAGS\s0. Unfortunately,
+the syntax again differs from system to system:
.IP "Solaris" 4
.IX Item "Solaris"
.Vb 1
.Vb 1
\& export LDFLAGS="\-Wl,\-blibpath:${INSTALL_DIR}/lib"
.Ve
-.RE
-.RS 4
-.Sp
+.PP
If you have GNUmake installed and it is not called 'make',
then do
-.Sp
+.PP
.Vb 2
\& export MAKE=gmake
\& export GNUMAKE=gmake
.Ve
-.Sp
+.PP
otherwise just do
-.Sp
+.PP
.Vb 1
\& export MAKE=make
.Ve
-.RE
-.IP "Building pkgconfig" 4
-.IX Item "Building pkgconfig"
+.PP
+\fIBuilding pkgconfig\fR
+.IX Subsection "Building pkgconfig"
+.PP
As mentioned above, without pkgconfig the whole build process will be lots
of pain and suffering, so make sure you have a copy on your system. If it is
not available natively, here is how to compile it.
-.Sp
+.PP
.Vb 6
\& wget http://pkgconfig.freedesktop.org/releases/pkg\-config\-0.23.tar.gz
\& gunzip \-c pkg\-config\-0.23.tar.gz | tar xf \-
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building zlib" 4
-.IX Item "Building zlib"
+.PP
+\fIBuilding zlib\fR
+.IX Subsection "Building zlib"
+.PP
Chances are very high that you already have that on your system ...
-.Sp
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/zlib\-1.2.3.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building libpng" 4
-.IX Item "Building libpng"
+.PP
+\fIBuilding libpng\fR
+.IX Subsection "Building libpng"
+.PP
Libpng itself requires zlib to build, so we need to help a bit. If you
already have a copy of zlib on your system (which is very likely) you can
drop the settings of \s-1LDFLAGS\s0 and \s-1CPPFLAGS\s0. Note that the backslash (\e) at
the end of line 4 means that line 4 and line 5 are on one line.
-.Sp
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/libpng\-1.2.18.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building freetype" 4
-.IX Item "Building freetype"
+.PP
+\fIBuilding freetype\fR
+.IX Subsection "Building freetype"
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/freetype\-2.3.5.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.Sp
+.PP
If you run into problems building freetype on Solaris, you may want to try to
add the following at the start the configure line:
-.Sp
+.PP
.Vb 1
\& env EGREP=egrep
.Ve
-.IP "Building LibXML2" 4
-.IX Item "Building LibXML2"
+.PP
+\fIBuilding LibXML2\fR
+.IX Subsection "Building LibXML2"
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/libxml2\-sources\-2.6.31.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building fontconfig" 4
-.IX Item "Building fontconfig"
+.PP
+\fIBuilding fontconfig\fR
+.IX Subsection "Building fontconfig"
+.PP
Note that fontconfig has a run time configuration file in INSTALL_DIR/etc you
may want to adjust that so that fontconfig finds the fonts on your system.
Run the fc-cache program to build the fontconfig cache after changing the
config file.
-.Sp
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/fontconfig\-2.4.2.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building Pixman" 4
-.IX Item "Building Pixman"
+.PP
+\fIBuilding Pixman\fR
+.IX Subsection "Building Pixman"
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/pixman\-0.10.0.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building Cairo" 4
-.IX Item "Building Cairo"
+.PP
+\fIBuilding Cairo\fR
+.IX Subsection "Building Cairo"
+.PP
.Vb 11
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/cairo\-1.6.4.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building Glib" 4
-.IX Item "Building Glib"
+.PP
+\fIBuilding Glib\fR
+.IX Subsection "Building Glib"
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/glib\-2.15.4.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.IP "Building Pango" 4
-.IX Item "Building Pango"
+.PP
+\fIBuilding Pango\fR
+.IX Subsection "Building Pango"
+.PP
.Vb 7
\& cd $BUILD_DIR
\& wget http://oss.oetiker.ch/rrdtool/pub/libs/pango\-1.21.1.tar.gz
\& $MAKE
\& $MAKE install
.Ve
-.PP
+.Sh "Building rrdtool (second try)"
+.IX Subsection "Building rrdtool (second try)"
Now all the dependent libraries are built and you can try again. This time
you tell configure where it should be looking for libraries and include
files. This is done via environment variables. Depending on the shell you
their current state.
.PP
.Vb 5
-\& cd $BUILD_DIR/rrdtool\-1.3.0
+\& cd $BUILD_DIR/rrdtool\-1.3.1
\& ./configure \-\-prefix=$INSTALL_DIR \-\-disable\-tcl \-\-disable\-python
\& $MAKE clean
\& $MAKE
.Ve
.PP
\&\s-1SOLARIS\s0 \s-1HINT:\s0 if you want to build the perl module for the native perl (the
-one shipping with Solaris) you will need the sun forte compiler installed on
+one shipping with Solaris) you will need the Sun Forte compiler installed on
your box or you have to hand-tune bindings/perl\-shared/Makefile while
building!
.PP
diff --git a/doc/rrdbuild.html b/doc/rrdbuild.html
index 01a9efca6fcf761134d2e8e4f163c3a7ba46b2fe..c003c105f30d5a1cda1e673259dcca0f07026873 100644 (file)
--- a/doc/rrdbuild.html
+++ b/doc/rrdbuild.html
<li><a href="#building_dependencies">BUILDING DEPENDENCIES</a></li>
<ul>
+ <li><a href="#general_build_tips_for_aix">General build tips for AIX</a></li>
+ <li><a href="#build_instructions">Build Instructions</a></li>
<ul>
- <li><a href="#build_tips_for_aix">Build Tips for AIX</a></li>
+ <li><a href="#building_pkgconfig">Building pkgconfig</a></li>
+ <li><a href="#building_zlib">Building zlib</a></li>
+ <li><a href="#building_libpng">Building libpng</a></li>
+ <li><a href="#building_freetype">Building freetype</a></li>
+ <li><a href="#building_libxml2">Building LibXML2</a></li>
+ <li><a href="#building_fontconfig">Building fontconfig</a></li>
+ <li><a href="#building_pixman">Building Pixman</a></li>
+ <li><a href="#building_cairo">Building Cairo</a></li>
+ <li><a href="#building_glib">Building Glib</a></li>
+ <li><a href="#building_pango">Building Pango</a></li>
</ul>
- <li><a href="#building_libraries">Building Libraries</a></li>
+ <li><a href="#building_rrdtool__second_try_">Building rrdtool (second try)</a></li>
</ul>
<li><a href="#author">AUTHOR</a></li>
<p>Once you have decided. Save the two locations into environment variables.</p>
<pre>
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3.0</pre>
+ INSTALL_DIR=/usr/local/rrdtool-1.3.1</pre>
<p>If your <em>/tmp</em> is mounted with the option noexec (RHEL seems todo that) you have to choose
a different directory!</p>
<p>Now make sure the BUILD_DIR exists and go there:</p>
<p>Lets first assume you already have all the necessary libraries
pre-installed.</p>
<pre>
- wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz</a>
- gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
- cd rrdtool-1.3.0
+ wget <a href="http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.1.tar.gz">http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.1.tar.gz</a>
+ gunzip -c rrdtool-1.3.1.tar.gz | tar xf -
+ cd rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR && make && make install</pre>
<p>Ok, this was very optimistic. This try will probably have ended with
<strong>configure</strong> complaining about several missing libraries.</p>
expectations, so you may want to compile their latest versions.</p>
<p>
</p>
-<h3><a name="build_tips_for_aix">Build Tips for AIX</a></h3>
+<h2><a name="general_build_tips_for_aix">General build tips for AIX</a></h2>
<p>If you are working with AIX, you may find the the <strong>--disable-shared</strong> option
will cause things to break for you. In that case you may have to install the
shared libraries into the rrdtool PREFIX and work with <strong>--disable-static</strong>
<p>(Better instructions for AIX welcome!)</p>
<p>
</p>
-<h2><a name="building_libraries">Building Libraries</a></h2>
-<p>In order to build the libraries you need a compiler on your system.
-Unfortunately compilers are not all alike. This has an effect on the CFLAGS
-you want to set. The examples below are for the popular GCC compiler suite.
-If you have an other compilers here are some ides:</p>
+<h2><a name="build_instructions">Build Instructions</a></h2>
+<p>In order to build rrdtool need a compiler on your system. Unfortunately
+compilers are not all alike. This has an effect on the CFLAGS you want to
+set. The examples below are for the popular GCC compiler suite. If you have
+an other compilers here are some ides:</p>
<dl>
<dt><strong><a name="item_sun_forte">Sun Forte</a></strong></dt>
<pre>
export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig
export PATH=$INSTALL_DIR/bin:$PATH</pre>
-<p>This relies on the presence of the <em>pkgconfig</em> program. Below you find instructions
-on how to compile pkgconfig as well.</p>
-<p>Since we are compiling libraries dynamically, they must know
-where to find each other. This is done by setting an appropriate LDFLAGS.
-Unfortunately, the syntax again differs from system to system:</p>
+<p>The above relies on the presence of the <em>pkgconfig</em> program. Below you find instructions
+on how to compile pkgconfig.</p>
+<p>Since we are compiling libraries dynamically, they must know where to find
+each other. This is done by setting an appropriate LDFLAGS. Unfortunately,
+the syntax again differs from system to system:</p>
<dl>
<dt><strong><a name="item_solaris">Solaris</a></strong></dt>
<dd>
<pre>
-
export LDFLAGS="+b${INSTALL_DIR}/lib"</pre>
</dd>
<dt><strong><a name="item_aix">AIX</a></strong></dt>
<dd>
<pre>
export LDFLAGS="-Wl,-blibpath:${INSTALL_DIR}/lib"</pre>
+</dd>
+</dl>
<p>If you have GNUmake installed and it is not called 'make',
then do</p>
<pre>
<p>otherwise just do</p>
<pre>
export MAKE=make</pre>
-<dl>
-<dt><strong><a name="item_building_pkgconfig">Building pkgconfig</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_pkgconfig">Building pkgconfig</a></h3>
<p>As mentioned above, without pkgconfig the whole build process will be lots
of pain and suffering, so make sure you have a copy on your system. If it is
not available natively, here is how to compile it.</p>
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_zlib">Building zlib</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_zlib">Building zlib</a></h3>
<p>Chances are very high that you already have that on your system ...</p>
<pre>
cd $BUILD_DIR
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --shared
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_libpng">Building libpng</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_libpng">Building libpng</a></h3>
<p>Libpng itself requires zlib to build, so we need to help a bit. If you
already have a copy of zlib on your system (which is very likely) you can
drop the settings of LDFLAGS and CPPFLAGS. Note that the backslash (\) at
env CFLAGS="-O3 -fPIC" ./configure --prefix=$INSTALL_DIR
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_freetype">Building freetype</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_freetype">Building freetype</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz</a>
add the following at the start the configure line:</p>
<pre>
env EGREP=egrep</pre>
-</dd>
-<dt><strong><a name="item_building_libxml2">Building LibXML2</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_libxml2">Building LibXML2</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz</a>
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_fontconfig">Building fontconfig</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_fontconfig">Building fontconfig</a></h3>
<p>Note that fontconfig has a run time configuration file in INSTALL_DIR/etc you
may want to adjust that so that fontconfig finds the fonts on your system.
Run the fc-cache program to build the fontconfig cache after changing the
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_pixman">Building Pixman</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_pixman">Building Pixman</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz</a>
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_cairo">Building Cairo</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_cairo">Building Cairo</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz</a>
CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_glib">Building Glib</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_glib">Building Glib</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz</a>
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
$MAKE
$MAKE install</pre>
-</dd>
-<dt><strong><a name="item_building_pango">Building Pango</a></strong></dt>
-
-<dd>
+<p>
+</p>
+<h3><a name="building_pango">Building Pango</a></h3>
<pre>
cd $BUILD_DIR
wget <a href="http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz">http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz</a>
./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --without-x
$MAKE
$MAKE install</pre>
-</dd>
-</dl>
+<p>
+</p>
+<h2><a name="building_rrdtool__second_try_">Building rrdtool (second try)</a></h2>
<p>Now all the dependent libraries are built and you can try again. This time
you tell configure where it should be looking for libraries and include
files. This is done via environment variables. Depending on the shell you
tcl setups that would prevent rrdtool from building if they are included in
their current state.</p>
<pre>
- cd $BUILD_DIR/rrdtool-1.3.0
+ cd $BUILD_DIR/rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
$MAKE install</pre>
<p>SOLARIS HINT: if you want to build the perl module for the native perl (the
-one shipping with Solaris) you will need the sun forte compiler installed on
+one shipping with Solaris) you will need the Sun Forte compiler installed on
your box or you have to hand-tune bindings/perl-shared/Makefile while
building!</p>
<p>Now go to <em>$INSTALL_DIR</em><strong>/share/rrdtool/examples/</strong> and run them to see if
</p>
<hr />
<h1><a name="author">AUTHOR</a></h1>
-<p>Tobias Oetiker <<a href="mailto:tobi@oetiker.ch">tobi@oetiker.ch</a>>
-
-</p>
+<p>Tobias Oetiker <<a href="mailto:tobi@oetiker.ch">tobi@oetiker.ch</a>></p>
</body>
diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index 1a281e532053192b930a41c1f3cf2d0afbf25e21..bb9e024c07db9eec00df5d9f2eadbc3a1467ccc1 100644 (file)
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
Once you have decided. Save the two locations into environment variables.
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3.0
+ INSTALL_DIR=/usr/local/rrdtool-1.3.1
If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
Lets first assume you already have all the necessary libraries
pre-installed.
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz
- gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
- cd rrdtool-1.3.0
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.1.tar.gz
+ gunzip -c rrdtool-1.3.1.tar.gz | tar xf -
+ cd rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR && make && make install
Ok, this was very optimistic. This try will probably have ended with
possible that they are pretty old and thus don't live up to our
expectations, so you may want to compile their latest versions.
-=head3 Build Tips for AIX
+=head2 General build tips for AIX
If you are working with AIX, you may find the the B<--disable-shared> option
will cause things to break for you. In that case you may have to install the
(Better instructions for AIX welcome!)
-=head2 Building Libraries
+=head2 Build Instructions
-In order to build the libraries you need a compiler on your system.
-Unfortunately compilers are not all alike. This has an effect on the CFLAGS
-you want to set. The examples below are for the popular GCC compiler suite.
-If you have an other compilers here are some ides:
+In order to build rrdtool need a compiler on your system. Unfortunately
+compilers are not all alike. This has an effect on the CFLAGS you want to
+set. The examples below are for the popular GCC compiler suite. If you have
+an other compilers here are some ides:
=over
=back
-=over
-
Some libraries want to know where other libraries are. For this to work,
set the following environment variable
export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig
export PATH=$INSTALL_DIR/bin:$PATH
-This relies on the presence of the F<pkgconfig> program. Below you find instructions
-on how to compile pkgconfig as well.
+The above relies on the presence of the F<pkgconfig> program. Below you find instructions
+on how to compile pkgconfig.
-Since we are compiling libraries dynamically, they must know
-where to find each other. This is done by setting an appropriate LDFLAGS.
-Unfortunately, the syntax again differs from system to system:
+Since we are compiling libraries dynamically, they must know where to find
+each other. This is done by setting an appropriate LDFLAGS. Unfortunately,
+the syntax again differs from system to system:
=over
export LDFLAGS="-Wl,--rpath -Wl,${INSTALL_DIR}/lib"
=item HPUX
-
+
export LDFLAGS="+b${INSTALL_DIR}/lib"
=item AIX
export MAKE=make
-=item Building pkgconfig
+=head3 Building pkgconfig
As mentioned above, without pkgconfig the whole build process will be lots
of pain and suffering, so make sure you have a copy on your system. If it is
$MAKE
$MAKE install
-=item Building zlib
+=head3 Building zlib
Chances are very high that you already have that on your system ...
$MAKE
$MAKE install
-=item Building libpng
+=head3 Building libpng
Libpng itself requires zlib to build, so we need to help a bit. If you
already have a copy of zlib on your system (which is very likely) you can
$MAKE
$MAKE install
-=item Building freetype
+=head3 Building freetype
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz
env EGREP=egrep
-=item Building LibXML2
+=head3 Building LibXML2
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz
$MAKE
$MAKE install
-=item Building fontconfig
+=head3 Building fontconfig
Note that fontconfig has a run time configuration file in INSTALL_DIR/etc you
may want to adjust that so that fontconfig finds the fonts on your system.
$MAKE
$MAKE install
-=item Building Pixman
+=head3 Building Pixman
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz
$MAKE
$MAKE install
-=item Building Cairo
+=head3 Building Cairo
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz
$MAKE
$MAKE install
-=item Building Glib
+=head3 Building Glib
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz
$MAKE
$MAKE install
-=item Building Pango
+=head3 Building Pango
cd $BUILD_DIR
wget http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz
$MAKE
$MAKE install
-=back
+=head2 Building rrdtool (second try)
Now all the dependent libraries are built and you can try again. This time
you tell configure where it should be looking for libraries and include
tcl setups that would prevent rrdtool from building if they are included in
their current state.
- cd $BUILD_DIR/rrdtool-1.3.0
+ cd $BUILD_DIR/rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
$MAKE install
SOLARIS HINT: if you want to build the perl module for the native perl (the
-one shipping with Solaris) you will need the sun forte compiler installed on
+one shipping with Solaris) you will need the Sun Forte compiler installed on
your box or you have to hand-tune bindings/perl-shared/Makefile while
building!
diff --git a/doc/rrdbuild.txt b/doc/rrdbuild.txt
index b16b571cc1eaa84d37f6ca687ac5853a4d5d791b..0c00fb4d2dc69e569b886411c77c8e45c1bbd19c 100644 (file)
--- a/doc/rrdbuild.txt
+++ b/doc/rrdbuild.txt
ables.
BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/usr/local/rrdtool-1.3.0
+ INSTALL_DIR=/usr/local/rrdtool-1.3.1
If your _\b/_\bt_\bm_\bp is mounted with the option noexec (RHEL seems todo that)
you have to choose a different directory!
Lets first assume you already have all the necessary libraries
pre-installed.
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.0.tar.gz
- gunzip -c rrdtool-1.3.0.tar.gz | tar xf -
- cd rrdtool-1.3.0
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.1.tar.gz
+ gunzip -c rrdtool-1.3.1.tar.gz | tar xf -
+ cd rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR && make && make install
Ok, this was very optimistic. This try will probably have ended with
@@ -119,7 +119,7 @@ B\bBU\bUI\bIL\bLD\bDI\bIN\bNG\bG D\bDE\bEP\bPE\bEN\bND\bDE\bEN\bNC\bCI\bIE\bES\bS
don't live up to our expectations, so you may want to compile their
latest versions.
- _\bB_\bu_\bi_\bl_\bd _\bT_\bi_\bp_\bs _\bf_\bo_\br _\bA_\bI_\bX
+ G\bGe\ben\bne\ber\bra\bal\bl b\bbu\bui\bil\bld\bd t\bti\bip\bps\bs f\bfo\bor\br A\bAI\bIX\bX
If you are working with AIX, you may find the the -\b--\b-d\bdi\bis\bsa\bab\bbl\ble\be-\b-s\bsh\bha\bar\bre\bed\bd
option will cause things to break for you. In that case you may have to
@@ -134,164 +134,175 @@ B\bBU\bUI\bIL\bLD\bDI\bIN\bNG\bG D\bDE\bEP\bPE\bEN\bND\bDE\bEN\bNC\bCI\bIE\bES\bS
(Better instructions for AIX welcome!)
- B\bBu\bui\bil\bld\bdi\bin\bng\bg L\bLi\bib\bbr\bra\bar\bri\bie\bes\bs
+ B\bBu\bui\bil\bld\bd I\bIn\bns\bst\btr\bru\buc\bct\bti\bio\bon\bns\bs
- In order to build the libraries you need a compiler on your system.
- Unfortunately compilers are not all alike. This has an effect on the
- CFLAGS you want to set. The examples below are for the popular GCC com-
- piler suite. If you have an other compilers here are some ides:
+ In order to build rrdtool need a compiler on your system. Unfortunately
+ compilers are not all alike. This has an effect on the CFLAGS you want
+ to set. The examples below are for the popular GCC compiler suite. If
+ you have an other compilers here are some ides:
Sun Forte
CFLAGS="-xO3 -kPIC"
- Some libraries want to know where other libraries are. For this to
- work, set the following environment variable
-
- export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig
- export PATH=$INSTALL_DIR/bin:$PATH
-
- This relies on the presence of the _\bp_\bk_\bg_\bc_\bo_\bn_\bf_\bi_\bg program. Below you
- find instructions on how to compile pkgconfig as well.
-
- Since we are compiling libraries dynamically, they must know where
- to find each other. This is done by setting an appropriate LDFLAGS.
- Unfortunately, the syntax again differs from system to system:
-
- Solaris
- export LDFLAGS=-R${INSTALL_DIR}/lib
-
- Linux
- export LDFLAGS="-Wl,--rpath -Wl,${INSTALL_DIR}/lib"
-
- HPUX
- export LDFLAGS="+b${INSTALL_DIR}/lib"
-
- AIX
- export LDFLAGS="-Wl,-blibpath:${INSTALL_DIR}/lib"
-
- If you have GNUmake installed and it is not called 'make', then do
-
- export MAKE=gmake
- export GNUMAKE=gmake
-
- otherwise just do
-
- export MAKE=make
-
- Building pkgconfig
- As mentioned above, without pkgconfig the whole build process will
- be lots of pain and suffering, so make sure you have a copy on your
- system. If it is not available natively, here is how to compile it.
-
- wget http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz
- gunzip -c pkg-config-0.23.tar.gz | tar xf -
- cd pkg-config-0.23
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building zlib
- Chances are very high that you already have that on your system ...
-
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/zlib-1.2.3.tar.gz
- gunzip -c zlib-1.2.3.tar.gz | tar xf -
- cd zlib-1.2.3
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --shared
- $MAKE
- $MAKE install
-
- Building libpng
- Libpng itself requires zlib to build, so we need to help a bit. If
- you already have a copy of zlib on your system (which is very
- likely) you can drop the settings of LDFLAGS and CPPFLAGS. Note
- that the backslash (\) at the end of line 4 means that line 4 and
- line 5 are on one line.
-
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/libpng-1.2.18.tar.gz
- gunzip -c libpng-1.2.18.tar.gz | tar xf -
- cd libpng-1.2.10
- env CFLAGS="-O3 -fPIC" ./configure --prefix=$INSTALL_DIR
- $MAKE
- $MAKE install
-
- Building freetype
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz
- gunzip -c freetype-2.3.5.tar.gz | tar xf -
- cd freetype-2.3.5
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- If you run into problems building freetype on Solaris, you may want
- to try to add the following at the start the configure line:
-
- env EGREP=egrep
-
- Building LibXML2
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz
- gunzip -c libxml2-sources-2.6.32.tar.gz | tar xf -
- cd libxml2-sources-2.6.32
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building fontconfig
- Note that fontconfig has a run time configuration file in
- INSTALL_DIR/etc you may want to adjust that so that fontconfig
- finds the fonts on your system. Run the fc-cache program to build
- the fontconfig cache after changing the config file.
-
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/fontconfig-2.4.2.tar.gz
- gunzip -c fontconfig-2.4.2.tar.gz | tar xf -
- cd fontconfig-2.4.2
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building Pixman
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz
- gunzip -c pixman-0.10.0.tar.gz | tar xf -
- cd pixman-0.10.0
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building Cairo
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz
- gunzip -c cairo-1.4.10.tar.gz | tar xf -
- cd cairo-1.4.10
- ./configure --prefix=$INSTALL_DIR \
- --enable-xlib=no \
- --enable-xlib-render=no \
- --enable-win32=no \
- CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building Glib
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz
- gunzip -c glib-2.12.13.tar.gz | tar xf -
- cd glib-2.12.13
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
- $MAKE
- $MAKE install
-
- Building Pango
- cd $BUILD_DIR
- wget http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz
- gunzip -c pango-1.21.1.tar.gz | tar xf -
- cd pango-1.21.1
- ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --without-x
- $MAKE
- $MAKE install
+ Some libraries want to know where other libraries are. For this to
+ work, set the following environment variable
+
+ export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/pkgconfig
+ export PATH=$INSTALL_DIR/bin:$PATH
+
+ The above relies on the presence of the _\bp_\bk_\bg_\bc_\bo_\bn_\bf_\bi_\bg program. Below you
+ find instructions on how to compile pkgconfig.
+
+ Since we are compiling libraries dynamically, they must know where to
+ find each other. This is done by setting an appropriate LDFLAGS. Unfor-
+ tunately, the syntax again differs from system to system:
+
+ Solaris
+ export LDFLAGS=-R${INSTALL_DIR}/lib
+
+ Linux
+ export LDFLAGS="-Wl,--rpath -Wl,${INSTALL_DIR}/lib"
+
+ HPUX
+ export LDFLAGS="+b${INSTALL_DIR}/lib"
+
+ AIX
+ export LDFLAGS="-Wl,-blibpath:${INSTALL_DIR}/lib"
+
+ If you have GNUmake installed and it is not called 'make', then do
+
+ export MAKE=gmake
+ export GNUMAKE=gmake
+
+ otherwise just do
+
+ export MAKE=make
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bp_\bk_\bg_\bc_\bo_\bn_\bf_\bi_\bg
+
+ As mentioned above, without pkgconfig the whole build process will be
+ lots of pain and suffering, so make sure you have a copy on your sys-
+ tem. If it is not available natively, here is how to compile it.
+
+ wget http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz
+ gunzip -c pkg-config-0.23.tar.gz | tar xf -
+ cd pkg-config-0.23
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bz_\bl_\bi_\bb
+
+ Chances are very high that you already have that on your system ...
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/zlib-1.2.3.tar.gz
+ gunzip -c zlib-1.2.3.tar.gz | tar xf -
+ cd zlib-1.2.3
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --shared
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bl_\bi_\bb_\bp_\bn_\bg
+
+ Libpng itself requires zlib to build, so we need to help a bit. If you
+ already have a copy of zlib on your system (which is very likely) you
+ can drop the settings of LDFLAGS and CPPFLAGS. Note that the backslash
+ (\) at the end of line 4 means that line 4 and line 5 are on one line.
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/libpng-1.2.18.tar.gz
+ gunzip -c libpng-1.2.18.tar.gz | tar xf -
+ cd libpng-1.2.10
+ env CFLAGS="-O3 -fPIC" ./configure --prefix=$INSTALL_DIR
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bf_\br_\be_\be_\bt_\by_\bp_\be
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz
+ gunzip -c freetype-2.3.5.tar.gz | tar xf -
+ cd freetype-2.3.5
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ If you run into problems building freetype on Solaris, you may want to
+ try to add the following at the start the configure line:
+
+ env EGREP=egrep
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bL_\bi_\bb_\bX_\bM_\bL_\b2
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz
+ gunzip -c libxml2-sources-2.6.32.tar.gz | tar xf -
+ cd libxml2-sources-2.6.32
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bf_\bo_\bn_\bt_\bc_\bo_\bn_\bf_\bi_\bg
+
+ Note that fontconfig has a run time configuration file in
+ INSTALL_DIR/etc you may want to adjust that so that fontconfig finds
+ the fonts on your system. Run the fc-cache program to build the font-
+ config cache after changing the config file.
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/fontconfig-2.4.2.tar.gz
+ gunzip -c fontconfig-2.4.2.tar.gz | tar xf -
+ cd fontconfig-2.4.2
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bP_\bi_\bx_\bm_\ba_\bn
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz
+ gunzip -c pixman-0.10.0.tar.gz | tar xf -
+ cd pixman-0.10.0
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bC_\ba_\bi_\br_\bo
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz
+ gunzip -c cairo-1.4.10.tar.gz | tar xf -
+ cd cairo-1.4.10
+ ./configure --prefix=$INSTALL_DIR \
+ --enable-xlib=no \
+ --enable-xlib-render=no \
+ --enable-win32=no \
+ CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bG_\bl_\bi_\bb
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz
+ gunzip -c glib-2.12.13.tar.gz | tar xf -
+ cd glib-2.12.13
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
+ $MAKE
+ $MAKE install
+
+ _\bB_\bu_\bi_\bl_\bd_\bi_\bn_\bg _\bP_\ba_\bn_\bg_\bo
+
+ cd $BUILD_DIR
+ wget http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz
+ gunzip -c pango-1.21.1.tar.gz | tar xf -
+ cd pango-1.21.1
+ ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --without-x
+ $MAKE
+ $MAKE install
+
+ B\bBu\bui\bil\bld\bdi\bin\bng\bg r\brr\brd\bdt\bto\boo\bol\bl (\b(s\bse\bec\bco\bon\bnd\bd t\btr\bry\by)\b)
Now all the dependent libraries are built and you can try again. This
time you tell configure where it should be looking for libraries and
@@ -304,14 +315,14 @@ B\bBU\bUI\bIL\bLD\bDI\bIN\bNG\bG D\bDE\bEP\bPE\bEN\bND\bDE\bEN\bNC\bCI\bIE\bES\bS
python and tcl setups that would prevent rrdtool from building if they
are included in their current state.
- cd $BUILD_DIR/rrdtool-1.3.0
+ cd $BUILD_DIR/rrdtool-1.3.1
./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
$MAKE clean
$MAKE
$MAKE install
SOLARIS HINT: if you want to build the perl module for the native perl
- (the one shipping with Solaris) you will need the sun forte compiler
+ (the one shipping with Solaris) you will need the Sun Forte compiler
installed on your box or you have to hand-tune bind-
ings/perl-shared/Makefile while building!
-1.3.0 2008-06-11 RRDBUILD(1)
+1.3.1 2008-07-23 RRDBUILD(1)
diff --git a/doc/rrdcgi.1 b/doc/rrdcgi.1
index 5607901840516060373e5b55aba440de4682274f..847c2d7bffb1c7faa93bd558d3798c137cd2f793 100644 (file)
--- a/doc/rrdcgi.1
+++ b/doc/rrdcgi.1
.\" ========================================================================
.\"
.IX Title "RRDCGI 1"
-.TH RRDCGI 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDCGI 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdcgi \- Create web pages containing RRD graphs based on templates
.SH "SYNOPSIS"
diff --git a/doc/rrdcgi.txt b/doc/rrdcgi.txt
index 7325ba841c8ad8a8f7fb03e727701cd7ee72c1ed..c53f96741c44e446e60ba90747720e3fe6af085c 100644 (file)
--- a/doc/rrdcgi.txt
+++ b/doc/rrdcgi.txt
-1.3.0 2008-03-15 RRDCGI(1)
+1.3.1 2008-03-15 RRDCGI(1)
diff --git a/doc/rrdcreate.1 b/doc/rrdcreate.1
index 8809ca0cb9b8a642d52f2e2c8a7753510a259265..c50fbe5e4221ecd112c9c2a0bc0e1dbeeea38271 100644 (file)
--- a/doc/rrdcreate.1
+++ b/doc/rrdcreate.1
.\" ========================================================================
.\"
.IX Title "RRDCREATE 1"
-.TH RRDCREATE 1 "2008-06-11" "1.3.0" "rrdtool"
+.TH RRDCREATE 1 "2008-06-11" "1.3.1" "rrdtool"
.SH "NAME"
rrdcreate \- Set up a new Round Robin Database
.SH "SYNOPSIS"
diff --git a/doc/rrdcreate.txt b/doc/rrdcreate.txt
index 22a83a699e6ef5721df3549dcb68f9a7d97e40bf..d78e941669550b396c8832670ce1984103a0205c 100644 (file)
--- a/doc/rrdcreate.txt
+++ b/doc/rrdcreate.txt
-1.3.0 2008-06-11 RRDCREATE(1)
+1.3.1 2008-06-11 RRDCREATE(1)
diff --git a/doc/rrddump.1 b/doc/rrddump.1
index cd713116085c260a31ad0db7f4fe0258c6cf226e..23efa30c67e9fec7ccdb2e1950184f1a227cbf8e 100644 (file)
--- a/doc/rrddump.1
+++ b/doc/rrddump.1
.\" ========================================================================
.\"
.IX Title "RRDDUMP 1"
-.TH RRDDUMP 1 "2008-05-16" "1.3.0" "rrdtool"
+.TH RRDDUMP 1 "2008-05-16" "1.3.1" "rrdtool"
.SH "NAME"
rrddump \- dump the contents of an RRD to XML format
.SH "SYNOPSIS"
diff --git a/doc/rrddump.txt b/doc/rrddump.txt
index ca0c8c4353b81ed806e6309793444b30968d59b2..d32ddb93c526b27ac3545804b6c0dff359bba829 100644 (file)
--- a/doc/rrddump.txt
+++ b/doc/rrddump.txt
-1.3.0 2008-05-16 RRDDUMP(1)
+1.3.1 2008-05-16 RRDDUMP(1)
diff --git a/doc/rrdfetch.1 b/doc/rrdfetch.1
index 96852700f3e8401a3d6d10a4009d20460f9fd934..c3aa51e320d035df5c6adfd378150a631ec34c8c 100644 (file)
--- a/doc/rrdfetch.1
+++ b/doc/rrdfetch.1
.\" ========================================================================
.\"
.IX Title "RRDFETCH 1"
-.TH RRDFETCH 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDFETCH 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdfetch \- Fetch data from an RRD.
.SH "SYNOPSIS"
diff --git a/doc/rrdfetch.txt b/doc/rrdfetch.txt
index 6033e379552a90ea935dd67ef1e1063e35f04356..f92ebed0436a0c3a9a0ac6c05ff26ce6027256e2 100644 (file)
--- a/doc/rrdfetch.txt
+++ b/doc/rrdfetch.txt
-1.3.0 2008-03-15 RRDFETCH(1)
+1.3.1 2008-03-15 RRDFETCH(1)
diff --git a/doc/rrdfirst.1 b/doc/rrdfirst.1
index 212e0861c524baec800881049d930f19e67d9f26..91fee2aa3af223d4ee9c360c73d53b3c40276778 100644 (file)
--- a/doc/rrdfirst.1
+++ b/doc/rrdfirst.1
.\" ========================================================================
.\"
.IX Title "RRDFIRST 1"
-.TH RRDFIRST 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDFIRST 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdfirst \- Return the date of the first data sample in an RRA within an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdfirst.txt b/doc/rrdfirst.txt
index 659b106b15324aa6f9609c647ff77e991dfb32ac..cd2193b1e86713b2348d4f690faf7f6dc4062c86 100644 (file)
--- a/doc/rrdfirst.txt
+++ b/doc/rrdfirst.txt
-1.3.0 2008-03-15 RRDFIRST(1)
+1.3.1 2008-03-15 RRDFIRST(1)
diff --git a/doc/rrdgraph.1 b/doc/rrdgraph.1
index 4983013f6d471e3bc340a804508f390706caf14c..48113a15711c5cd2e52c7b4baaff41877225ad85 100644 (file)
--- a/doc/rrdgraph.1
+++ b/doc/rrdgraph.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH 1"
-.TH RRDGRAPH 1 "2008-06-11" "1.3.0" "rrdtool"
+.TH RRDGRAPH 1 "2008-06-29" "1.3.1" "rrdtool"
.SH "NAME"
rrdgraph \- Round Robin Database tool grapher functions
.SH "SYNOPSIS"
.IX Subsection "Miscellaneous"
[\fB\-z\fR|\fB\-\-lazy\fR]
.PP
-Only generate the graph if the current graph is out of date or not
-existent.
+Only generate the graph if the current graph is out of date or not existent.
+Note, that only the image size will be returned, if you run with lazy even
+when using graphv.
.PP
[\fB\-f\fR|\fB\-\-imginfo\fR \fIprintfstr\fR]
.PP
diff --git a/doc/rrdgraph.html b/doc/rrdgraph.html
index b4db55ecc6418ae9ed83787b311452138aa6a558..1a367f8dac07cf68fad5a4537624114dae583b5b 100644 (file)
--- a/doc/rrdgraph.html
+++ b/doc/rrdgraph.html
</p>
<h2><a name="miscellaneous">Miscellaneous</a></h2>
<p>[<strong>-z</strong>|<strong>--lazy</strong>]</p>
-<p>Only generate the graph if the current graph is out of date or not
-existent.</p>
+<p>Only generate the graph if the current graph is out of date or not existent.
+Note, that only the image size will be returned, if you run with lazy even
+when using graphv.</p>
<p>[<strong>-f</strong>|<strong>--imginfo</strong> <em>printfstr</em>]</p>
<p>After the image has been created, the graph function uses printf
together with this format string to create output similar to the PRINT
diff --git a/doc/rrdgraph.pod b/doc/rrdgraph.pod
index 048171a3f09bd9185858e775a120c06819778a26..092e37fc59fc1d9471d27deddfb78f1e3c664800 100644 (file)
--- a/doc/rrdgraph.pod
+++ b/doc/rrdgraph.pod
[B<-z>|B<--lazy>]
-Only generate the graph if the current graph is out of date or not
-existent.
+Only generate the graph if the current graph is out of date or not existent.
+Note, that only the image size will be returned, if you run with lazy even
+when using graphv.
+
[B<-f>|B<--imginfo> I<printfstr>]
diff --git a/doc/rrdgraph.txt b/doc/rrdgraph.txt
index 3adf75aecbd1e72cf21198cda9202bdd7c4abba0..def7c4c90e601a67ce45950bf98f880879e5c1b0 100644 (file)
--- a/doc/rrdgraph.txt
+++ b/doc/rrdgraph.txt
[-\b-z\bz|-\b--\b-l\bla\baz\bzy\by]
Only generate the graph if the current graph is out of date or not
- existent.
+ existent. Note, that only the image size will be returned, if you run
+ with lazy even when using graphv.
[-\b-f\bf|-\b--\b-i\bim\bmg\bgi\bin\bnf\bfo\bo _\bp_\br_\bi_\bn_\bt_\bf_\bs_\bt_\br]
-1.3.0 2008-06-11 RRDGRAPH(1)
+1.3.1 2008-06-29 RRDGRAPH(1)
diff --git a/doc/rrdgraph_data.1 b/doc/rrdgraph_data.1
index d0e5b20a6fd6e12c04b98184f9971fb4dd187c10..28e88470a0f57a06f582c7658029ba09f7a425e5 100644 (file)
--- a/doc/rrdgraph_data.1
+++ b/doc/rrdgraph_data.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_DATA 1"
-.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDGRAPH_DATA 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdgraph_data \- preparing data for graphing in rrdtool graph
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph_data.txt b/doc/rrdgraph_data.txt
index 7d241aa13a287913c6dfc9d8bcea51aaca078fc7..8dab92a357335642b6dd4cd4054c38d7d9e4c6b6 100644 (file)
--- a/doc/rrdgraph_data.txt
+++ b/doc/rrdgraph_data.txt
-1.3.0 2008-03-15 RRDGRAPH_DATA(1)
+1.3.1 2008-03-15 RRDGRAPH_DATA(1)
index 52a3249d28f43b125d2e4f1e9374970c1c680103..242b751b942a4c348b17a1b16f893c7d1a70a918 100644 (file)
--- a/doc/rrdgraph_examples.1
+++ b/doc/rrdgraph_examples.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_EXAMPLES 1"
-.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3.0" "rrdtool"
+.TH RRDGRAPH_EXAMPLES 1 "2008-03-25" "1.3.1" "rrdtool"
.SH "NAME"
rrdgraph_examples \- Examples for rrdtool graph
.SH "SYNOPSIS"
index da349760cd5105c22378e75fa0065391ca5ddc08..9b64ac77c7e1e913a3f0d99e21c86692cb524f47 100644 (file)
-1.3.0 2008-03-25 RRDGRAPH_EXAMPLES(1)
+1.3.1 2008-03-25 RRDGRAPH_EXAMPLES(1)
diff --git a/doc/rrdgraph_graph.1 b/doc/rrdgraph_graph.1
index 952aee2909cf7a3345718f75db0603583b89577c..aedf3ee2e7728ed4bfc3772a9b4a133bcc4ad556 100644 (file)
--- a/doc/rrdgraph_graph.1
+++ b/doc/rrdgraph_graph.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_GRAPH 1"
-.TH RRDGRAPH_GRAPH 1 "2008-06-11" "1.3.0" "rrdtool"
+.TH RRDGRAPH_GRAPH 1 "2008-06-12" "1.3.1" "rrdtool"
.SH "NAME"
rrdgraph_graph \- rrdtool graph command reference
.SH "SYNOPSIS"
@@ -245,9 +245,12 @@ Either `\s-1AM\s0' or `\s-1PM\s0' according to the given time value, or the corr
strings for the current locale. Noon is treated as `pm' and midnight as
`am'. Note that in many locales and `pm' notation is unsupported and in
such cases \f(CW%p\fR will return an empty string.
+.IP "\fB%s\fR" 4
+.IX Item "%s"
+The second as a decimal number (range 00 to 61).
.IP "\fB%S\fR" 4
.IX Item "%S"
-The second as a decimal number (range 00 to 61).
+The seconds since the epoch (1.1.1970) (libc dependant non standard!)
.IP "\fB%U\fR" 4
.IX Item "%U"
The week number of the current year as a decimal number, range 00 to 53, starting with the
index f3f1a50a0f3d0a7d3cdbb3396858e31f244af7f9..6c5b136fe04bf19d84a1fd4cf4427e9dd893d1e9 100644 (file)
--- a/doc/rrdgraph_graph.html
+++ b/doc/rrdgraph_graph.html
`am'. Note that in many locales and `pm' notation is unsupported and in
such cases %p will return an empty string.</p>
</dd>
-<dt><strong><strong>%S</strong></strong></dt>
+<dt><strong><strong>%s</strong></strong></dt>
<dd>
<p>The second as a decimal number (range 00 to 61).</p>
</dd>
+<dt><strong><strong>%S</strong></strong></dt>
+
+<dd>
+<p>The seconds since the epoch (1.1.1970) (libc dependant non standard!)</p>
+</dd>
<dt><strong><a name="item__u"><strong>%U</strong></a></strong></dt>
<dd>
diff --git a/doc/rrdgraph_graph.pod b/doc/rrdgraph_graph.pod
index 7f2a36b67e3702e176dcc0787952d739e3d13780..19a732bc2208f3a81948fe81651ee37d8a13ec2b 100644 (file)
--- a/doc/rrdgraph_graph.pod
+++ b/doc/rrdgraph_graph.pod
`am'. Note that in many locales and `pm' notation is unsupported and in
such cases %p will return an empty string.
-=item B<%S>
+=item B<%s>
The second as a decimal number (range 00 to 61).
+=item B<%S>
+
+The seconds since the epoch (1.1.1970) (libc dependant non standard!)
+
=item B<%U>
The week number of the current year as a decimal number, range 00 to 53, starting with the
diff --git a/doc/rrdgraph_graph.txt b/doc/rrdgraph_graph.txt
index ae59923e8b3bd816bf32e7eb341d078aa6962c0b..e9086745b692a6227b52233b399a8d4b2e5b6195 100644 (file)
--- a/doc/rrdgraph_graph.txt
+++ b/doc/rrdgraph_graph.txt
and midnight as `am'. Note that in many locales and `pm' notation
is unsupported and in such cases %p will return an empty string.
- %\b%S\bS The second as a decimal number (range 00 to 61).
+ %\b%s\bs The second as a decimal number (range 00 to 61).
+
+ %\b%S\bS The seconds since the epoch (1.1.1970) (libc dependant non stan-
+ dard!)
%\b%U\bU The week number of the current year as a decimal number, range
00 to 53, starting with the first Sunday as the first day of week
@@ -261,9 +264,9 @@ N\bNO\bOT\bTE\bES\bS o\bon\bn l\ble\beg\bge\ben\bnd\bd a\bar\brg\bgu\bum\bme\ben\bnt\bts\bs
A colon ':' in a _\bl_\be_\bg_\be_\bn_\bd argument will mark the end of the legend. To
enter a ':' as part of a legend, the colon must be escaped with a back-
- slash '\:'. Beware that many environments process backslashes
- themselves, so it may be necessary to write two backslashes in order to
- one being passed onto rrd_graph.
+ slash '\:'. Beware that many environments process backslashes them-
+ selves, so it may be necessary to write two backslashes in order to one
+ being passed onto rrd_graph.
S\bSt\btr\bri\bin\bng\bg F\bFo\bor\brm\bma\bat\btt\bti\bin\bng\bg
-1.3.0 2008-06-11 RRDGRAPH_GRAPH(1)
+1.3.1 2008-06-12 RRDGRAPH_GRAPH(1)
diff --git a/doc/rrdgraph_rpn.1 b/doc/rrdgraph_rpn.1
index 9feb50cd89df604b41537af903eb6b8c73855413..86d742fd4697ef05c98e84b236bbcd737efdb8ba 100644 (file)
--- a/doc/rrdgraph_rpn.1
+++ b/doc/rrdgraph_rpn.1
.\" ========================================================================
.\"
.IX Title "RRDGRAPH_RPN 1"
-.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDGRAPH_RPN 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdgraph_rpn \- About RPN Math in rrdtool graph
.SH "SYNOPSIS"
diff --git a/doc/rrdgraph_rpn.txt b/doc/rrdgraph_rpn.txt
index fd43ce7ca2061941c1dbf8d995998affb0efefaf..6ca5af3fcd6f5f6bbe083fa063a7d67a089b087f 100644 (file)
--- a/doc/rrdgraph_rpn.txt
+++ b/doc/rrdgraph_rpn.txt
-1.3.0 2008-03-15 RRDGRAPH_RPN(1)
+1.3.1 2008-03-15 RRDGRAPH_RPN(1)
diff --git a/doc/rrdinfo.1 b/doc/rrdinfo.1
index 4890044b3bdb00461d97f2f9224faa4ffac4fcd1..2dd96858a1c170e460f39e5be72784de0b8de13e 100644 (file)
--- a/doc/rrdinfo.1
+++ b/doc/rrdinfo.1
.\" ========================================================================
.\"
.IX Title "RRDINFO 1"
-.TH RRDINFO 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDINFO 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdinfo \- extract header information from an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdinfo.txt b/doc/rrdinfo.txt
index 71da96e5cb79d5a23c9a6f5802ce8dd39ef5d845..0df0fb2dfa27a9d4b42d6c5edcf08bb1e907e2bd 100644 (file)
--- a/doc/rrdinfo.txt
+++ b/doc/rrdinfo.txt
-1.3.0 2008-03-15 RRDINFO(1)
+1.3.1 2008-03-15 RRDINFO(1)
diff --git a/doc/rrdlast.1 b/doc/rrdlast.1
index a2a1ecbbbd49b8a200edc1e705f79237a27f7774..63b3aded2222e0dd98ba2947bc5d934e13fae20b 100644 (file)
--- a/doc/rrdlast.1
+++ b/doc/rrdlast.1
.\" ========================================================================
.\"
.IX Title "RRDLAST 1"
-.TH RRDLAST 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDLAST 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdlast \- Return the date of the last data sample in an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdlast.txt b/doc/rrdlast.txt
index ed09808bd181dc34f113b62623865ee04d2ccc93..f9afc48ddae81c101e9ad1dbc5aa99b6f68b4b46 100644 (file)
--- a/doc/rrdlast.txt
+++ b/doc/rrdlast.txt
-1.3.0 2008-03-15 RRDLAST(1)
+1.3.1 2008-03-15 RRDLAST(1)
diff --git a/doc/rrdlastupdate.1 b/doc/rrdlastupdate.1
index a23dd4e29dba57e1f82fea0f9b0bd130acc7c8b5..7fe57dee76e2262e62cee43dd374b124ae6f5f0e 100644 (file)
--- a/doc/rrdlastupdate.1
+++ b/doc/rrdlastupdate.1
.\" ========================================================================
.\"
.IX Title "RRDLASTUPDATE 1"
-.TH RRDLASTUPDATE 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDLASTUPDATE 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdlastupdate \- Return the most recent update to an RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdlastupdate.txt b/doc/rrdlastupdate.txt
index 54d0d72985c95d5c8a1e7af210e5dbf16f68ec6e..fb7bdf269140373388bbc602509080ded3099332 100644 (file)
--- a/doc/rrdlastupdate.txt
+++ b/doc/rrdlastupdate.txt
-1.3.0 2008-03-15 RRDLASTUPDATE(1)
+1.3.1 2008-03-15 RRDLASTUPDATE(1)
diff --git a/doc/rrdresize.1 b/doc/rrdresize.1
index 6fbc1ec92bc9492c291452b005a2f4d0df2ffbc2..9a9ffb8efff925f8edeeb8082eec40219ace77dc 100644 (file)
--- a/doc/rrdresize.1
+++ b/doc/rrdresize.1
.\" ========================================================================
.\"
.IX Title "RRDRESIZE 1"
-.TH RRDRESIZE 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDRESIZE 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdresize \- alters the size of an RRA and creates a new .rrd file
.SH "SYNOPSIS"
diff --git a/doc/rrdresize.txt b/doc/rrdresize.txt
index 836793e87e2e0a3d4f3ab6dd6617832aa5682fc4..abb47037d04fed74e7d5c97ec6c9bd8f336532d1 100644 (file)
--- a/doc/rrdresize.txt
+++ b/doc/rrdresize.txt
-1.3.0 2008-03-15 RRDRESIZE(1)
+1.3.1 2008-03-15 RRDRESIZE(1)
diff --git a/doc/rrdrestore.1 b/doc/rrdrestore.1
index 341bededd294703777184e03e557d4ff7e1c5be4..264146f086e3b67e6ef801d1e4febd036c7cf14e 100644 (file)
--- a/doc/rrdrestore.1
+++ b/doc/rrdrestore.1
.\" ========================================================================
.\"
.IX Title "RRDRESTORE 1"
-.TH RRDRESTORE 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDRESTORE 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdrestore \- Restore the contents of an RRD from its XML dump format
.SH "SYNOPSIS"
diff --git a/doc/rrdrestore.txt b/doc/rrdrestore.txt
index d4e04238e027cd31b00f43115c390d07f475a31f..c0663e427f002bb7b928bbcab84011398865562e 100644 (file)
--- a/doc/rrdrestore.txt
+++ b/doc/rrdrestore.txt
-1.3.0 2008-03-15 RRDRESTORE(1)
+1.3.1 2008-03-15 RRDRESTORE(1)
diff --git a/doc/rrdthreads.1 b/doc/rrdthreads.1
index 19cc7dcff98cc385eaae0901254d0f47228c7146..e74c68f9019d60aa456232e1e18f089e3cf0d1c8 100644 (file)
--- a/doc/rrdthreads.1
+++ b/doc/rrdthreads.1
.\" ========================================================================
.\"
.IX Title "RRDTHREADS 1"
-.TH RRDTHREADS 1 "2008-06-08" "1.3.0" "rrdtool"
+.TH RRDTHREADS 1 "2008-06-08" "1.3.1" "rrdtool"
.SH "NAME"
rrdthreads \- Provisions for linking the RRD library to use in multi\-threaded programs
.SH "SYNOPSIS"
diff --git a/doc/rrdthreads.txt b/doc/rrdthreads.txt
index a17a68a02edb6cefdba14ba52b479a2b032471ca..d0aebb547ec538ff18964a3524b4c681cb3988b1 100644 (file)
--- a/doc/rrdthreads.txt
+++ b/doc/rrdthreads.txt
-1.3.0 2008-06-08 RRDTHREADS(1)
+1.3.1 2008-06-08 RRDTHREADS(1)
diff --git a/doc/rrdtool.1 b/doc/rrdtool.1
index ada7ee3d0c0b58d3e32fac543b1bada893b61e81..77b15485013930cbea6fb3efe5e61711c4a150e2 100644 (file)
--- a/doc/rrdtool.1
+++ b/doc/rrdtool.1
.\" ========================================================================
.\"
.IX Title "RRDTOOL 1"
-.TH RRDTOOL 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDTOOL 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdtool \- Round Robin Database Tool
.SH "SYNOPSIS"
diff --git a/doc/rrdtool.txt b/doc/rrdtool.txt
index a1ea93920429ff855e7672b2946fdc52b9216c3e..4559b02fb5fd224dc9ebadaa6101ff499685b4ed 100644 (file)
--- a/doc/rrdtool.txt
+++ b/doc/rrdtool.txt
-1.3.0 2008-03-15 RRDTOOL(1)
+1.3.1 2008-03-15 RRDTOOL(1)
diff --git a/doc/rrdtune.1 b/doc/rrdtune.1
index b2192cc37d3bb6b974230d8ac142c7f6e313a88d..271b312a454141f4f71b4aeca704153a2f2133c0 100644 (file)
--- a/doc/rrdtune.1
+++ b/doc/rrdtune.1
.\" ========================================================================
.\"
.IX Title "RRDTUNE 1"
-.TH RRDTUNE 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDTUNE 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdtune \- Modify some basic properties of a Round Robin Database
.SH "SYNOPSIS"
diff --git a/doc/rrdtune.txt b/doc/rrdtune.txt
index a617ab49268197df96eab27652757a72c96f9d52..cd1157a8e98a881e64ee11edcda54604bf9bcc8f 100644 (file)
--- a/doc/rrdtune.txt
+++ b/doc/rrdtune.txt
-1.3.0 2008-03-15 RRDTUNE(1)
+1.3.1 2008-03-15 RRDTUNE(1)
diff --git a/doc/rrdtutorial.1 b/doc/rrdtutorial.1
index 0d439096425b3fc84e77ec99eee90b86180e1854..832a88493cdaa8e5ac4a1b293e64a50f7f480c4a 100644 (file)
--- a/doc/rrdtutorial.1
+++ b/doc/rrdtutorial.1
.\" ========================================================================
.\"
.IX Title "RRDTUTORIAL 1"
-.TH RRDTUTORIAL 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDTUTORIAL 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdtutorial \- Alex van den Bogaerdt's RRDtool tutorial
.SH "DESCRIPTION"
diff --git a/doc/rrdtutorial.txt b/doc/rrdtutorial.txt
index 25822f8d3dca778a8bbfb99cadb4b16ebd00de51..1864128612a25ae3052b0649e1a8507438d7e896 100644 (file)
--- a/doc/rrdtutorial.txt
+++ b/doc/rrdtutorial.txt
-1.3.0 2008-03-15 RRDTUTORIAL(1)
+1.3.1 2008-03-15 RRDTUTORIAL(1)
diff --git a/doc/rrdupdate.1 b/doc/rrdupdate.1
index 9fe2f8af526ec3cf9c9dcdfa2e161d53926499c2..59e60fbd33c36b4473d62839548db2ebb7cd6b35 100644 (file)
--- a/doc/rrdupdate.1
+++ b/doc/rrdupdate.1
.\" ========================================================================
.\"
.IX Title "RRDUPDATE 1"
-.TH RRDUPDATE 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDUPDATE 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdupdate \- Store a new set of values into the RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdupdate.txt b/doc/rrdupdate.txt
index 99ac40596770b182f232df7235fee4ab244d1752..37b704cb946362cd5badfcca199c89afc5962ceb 100644 (file)
--- a/doc/rrdupdate.txt
+++ b/doc/rrdupdate.txt
-1.3.0 2008-03-15 RRDUPDATE(1)
+1.3.1 2008-03-15 RRDUPDATE(1)
diff --git a/doc/rrdxport.1 b/doc/rrdxport.1
index 56cb6f1f1e2f34c9555421185575d17ddc6e1dd5..d84e3f3f8fb51e03cc5733fcce58b1f2f2adf498 100644 (file)
--- a/doc/rrdxport.1
+++ b/doc/rrdxport.1
.\" ========================================================================
.\"
.IX Title "RRDXPORT 1"
-.TH RRDXPORT 1 "2008-03-15" "1.3.0" "rrdtool"
+.TH RRDXPORT 1 "2008-03-15" "1.3.1" "rrdtool"
.SH "NAME"
rrdxport \- Export data in XML format based on data from one or several RRD
.SH "SYNOPSIS"
diff --git a/doc/rrdxport.txt b/doc/rrdxport.txt
index f72a093da4141d0df57456e49712b6ce203656de..964824ac4dce59fa81f92b05566474f31e2f3935 100644 (file)
--- a/doc/rrdxport.txt
+++ b/doc/rrdxport.txt
-1.3.0 2008-03-15 RRDXPORT(1)
+1.3.1 2008-03-15 RRDXPORT(1)
diff --git a/rrdtool.spec b/rrdtool.spec
index 280ea60abe0d16c8056eba1b170140fb710bf28c..d71d3e190e40dd83cf5884ef9e07221a646227bf 100644 (file)
--- a/rrdtool.spec
+++ b/rrdtool.spec
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.3.0
+Version: 1.3.1
Release: 0.20%{?pre:.%{pre}}%{?dist}
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
#Source0: http://oss.oetiker.ch/%{name}/pub/%{name}-%{version}.tar.gz
Source0: http://oss.oetiker.ch/rrdtool/pub/beta/%{name}-%{version}%{pre}.tar.gz
+%if %{with_php}
Source1: php4-%{svnrev}.tar.gz
Patch1: rrdtool-1.3.0-beta4-fix-rrd_update-in-php-bindings.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dejavu-lgc-fonts
BuildRequires: gcc-c++, openssl-devel, freetype-devel
%endif
%prep
-%setup -q -n %{name}-%{version}%{pre} %{?with_php: -a 1}
%if %{with_php}
+%setup -q -n %{name}-%{version}%{pre} -a 1
%patch1 -p1
+%else
+%setup -q -n %{name}-%{version}%{pre}
%endif
# Fix to find correct python dir on lib64
# Most edits shouldn't be necessary when using --libdir, but
# w/o, some introduce hardcoded rpaths where they shouldn't
-%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
- configure Makefile.in php4/configure php4/ltconfig*
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' configure Makefile.in*
+%if %{with_php}
+%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' php4/configure php4/ltconfig*
+%endif
# Perl 5.10 seems to not like long version strings, hack around it
%{__perl} -pi.orig -e 's|1.299907080300|1.29990708|' \
#
# fix config files for php4 bindings
# workaround needed due to https://bugzilla.redhat.com/show_bug.cgi?id=211069
+%if %{with_php}
cp -p /usr/lib/rpm/config.{guess,sub} php4/
+%endif
+
%build
%configure \
diff --git a/src/pngsize.c b/src/pngsize.c
index 023c829f39b6e204b72387c888e78aaf9beb7d7c..f74a71851bc2a5b57dd9faa2d817f1bfbc546f15 100644 (file)
--- a/src/pngsize.c
+++ b/src/pngsize.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* pngsize.c determine the size of a PNG image
*****************************************************************************/
diff --git a/src/rrd.h b/src/rrd.h
index 2eac032751e81115264749ab965556123391dbc0..e2384f35355c57b7003062e519ea735881d3616d 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrdlib.h Public header file for librrd
*****************************************************************************
- * $Id: rrd.h 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd.h 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.9 2005/02/13 16:13:33 oetiker
* let rrd_graph return the actual value range it picked ...
diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c
index d4e5723c99623032f19eba7def318ac98f8e4186..adbd91f0ff17346cad97d6f0ac48f55211c40176 100644 (file)
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
diff --git a/src/rrd_create.c b/src/rrd_create.c
index 2cc8557553f87911fb8bc87510191b1cc927f8c3..edba9b8364d9a21299cd0c329ee097d7cfd7c87e 100644 (file)
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
default:
rrd.rra_def[rrd.stat_head->rra_cnt].pdp_cnt =
atoi(token);
+ if (atoi(token) < 1)
+ rrd_set_error("Invalid step: must be >= 1");
break;
}
break;
diff --git a/src/rrd_diff.c b/src/rrd_diff.c
index ac16a7de4cd272bd6f0abddd4d68544aa9ff43d3..2a907796f90d2385d133aa7072027cb6e54af088 100644 (file)
--- a/src/rrd_diff.c
+++ b/src/rrd_diff.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This code is stolen from rateup (mrtg-2.x) by Dave Rand
*****************************************************************************
* diff calculate the difference between two very long integers available as
* strings
*****************************************************************************
- * $Id: rrd_diff.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_diff.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.4 2003/03/10 00:30:34 oetiker
* handle cases with two negative numbers
diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index b73e9776fa00fba73be264530b45e5a29dd42dea..114632fc11e51a95e7cf85a6ea23c1425e94a561 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
- * $Id: rrd_dump.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_dump.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.7 2004/05/25 20:53:21 oetiker
* prevent small leak when resources are exhausted -- Mike Slifcak
diff --git a/src/rrd_error.c b/src/rrd_error.c
index 1206284f2a1c5b5b9a3485bb8a255ecd6a74ec15..6c49e96ee7a9949bb54e8470be2abb9b65372524 100644 (file)
--- a/src/rrd_error.c
+++ b/src/rrd_error.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_error.c Common Header File
*****************************************************************************
- * $Id: rrd_error.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_error.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.4 2003/02/22 21:57:03 oetiker
* a patch to avoid a memory leak and a Makefile.am patch to
diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 1e6c1ef35d6fd465364010c5da4da786a794da09..6447aa3c50194199b0ed09ea48067516bfcee870 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
- * $Id: rrd_fetch.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_fetch.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.8 2004/05/18 18:53:03 oetiker
* big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_first.c b/src/rrd_first.c
index bdba6c05f0c5b61fb820628f4c0782bfc81807cf..fe5d17454596a45c00900886a614dd758fe39786 100644 (file)
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_first Return
*****************************************************************************
diff --git a/src/rrd_format.c b/src/rrd_format.c
index 2fd90cbb6f9622be385658bde999d46514970362..b925b286cc1dd52fc5e2ab4d9fac2765e3877fef 100644 (file)
--- a/src/rrd_format.c
+++ b/src/rrd_format.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_format.c RRD Database Format helper functions
*****************************************************************************
- * $Id: rrd_format.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_format.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.5 2004/05/18 18:53:03 oetiker
* big spell checking patch -- slif@bellsouth.net
diff --git a/src/rrd_format.h b/src/rrd_format.h
index 75441ac9f1dfe09ab510256caeb987a26a65d29c..e457a7a96f0e38103f58909fe4b77181ed1423b3 100644 (file)
--- a/src/rrd_format.h
+++ b/src/rrd_format.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_format.h RRD Database Format header
*****************************************************************************/
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index d61d01539c23666971e7fc526b550f28e006dad9..ca7f9ea1ed21bbf8ed0ef6310cfa86391a666c20 100644 (file)
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 300fdbe784bec805c635c0172631c5869dd217ec..57a1bb6d8b3a6676fce98aa45f83f10685ca97a2 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd__graph.c produce graphs from data in rrdfiles
****************************************************************************/
PangoFontMap *font_map = pango_cairo_font_map_get_default();
/* if we are lazy and there is nothing to PRINT ... quit now */
- if (lazy && im->prt_c == 0)
+ if (lazy && im->prt_c == 0) {
+ info.u_cnt = im->ximg;
+ grinfo_push(im, sprintf_alloc("image_width"), RD_I_CNT, info);
+ info.u_cnt = im->yimg;
+ grinfo_push(im, sprintf_alloc("image_height"), RD_I_CNT, info);
return 0;
+ }
/* pull the data from the rrd files ... */
if (data_fetch(im) == -1)
return -1;
return -1;
/* calculate and PRINT and GPRINT definitions. We have to do it at
* this point because it will affect the length of the legends
- * if there are no graph elements we stop here ...
+ * if there are no graph elements (i==0) we stop here ...
* if we are lazy, try to quit ...
*/
- i = print_calc(im);
+ i = print_calc(im);
if (i < 0)
return -1;
+
if ((i == 0) || lazy)
return 0;
+
/**************************************************************
*** Calculating sizes and locations became a bit confusing ***
*** so I moved this into a separate function. ***
walker = walker->next;
}
walker = grinfo;
- while (walker) {
+ *xsize = 0;
+ *ysize = 0;
+ *ymin = 0;
+ *ymax = 0;
+ while (walker) {
if (strcmp(walker->key, "image_width") == 0) {
*xsize = walker->value.u_int;
} else if (strcmp(walker->key, "image_height") == 0) {
src = &im->gdes[dst->vidx];
data = src->data + src->ds;
end =
- src->end_orig % src->step ==
- 0 ? src->end_orig : (src->end_orig + src->step -
- src->end_orig % src->step);
+ src->end_orig % (long)src->step ==
+ 0 ? src->end_orig : (src->end_orig + (long)src->step -
+ src->end_orig % (long)src->step);
steps = (end - src->start) / src->step;
#if 0
diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 7cefc8273a3f5447046d3c6f98133c743c87e2c6..d570e58a365db31b85662dc7ac4aef891e8db582 100644 (file)
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
diff --git a/src/rrd_hw.c b/src/rrd_hw.c
index f04d9f78d53eaef99be8919a357be9b9c2a2dc3a..263b3f9cd3f3ba2af1c0f88d475feb29a81567bd 100644 (file)
--- a/src/rrd_hw.c
+++ b/src/rrd_hw.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_hw.c : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
*****************************************************************************
diff --git a/src/rrd_hw.h b/src/rrd_hw.h
index eac761632a359c03c99f9853238dac6c324c08d7..df1bf07b7012b5e83ffadf9a35575e2aec349591 100644 (file)
--- a/src/rrd_hw.h
+++ b/src/rrd_hw.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_hw.h : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection
*****************************************************************************/
diff --git a/src/rrd_i18n.h b/src/rrd_i18n.h
index 83da36989c9daff4dc6b0d41034afec02f52191a..09e455fd42065237dadaaaad5359257abef92c84 100644 (file)
--- a/src/rrd_i18n.h
+++ b/src/rrd_i18n.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Takao Fujiwara, 2008
+ * RRDtool 1.3.1 Copyright by Takao Fujiwara, 2008
*****************************************************************************
* rrd_i18n.h Common Header File
*****************************************************************************/
diff --git a/src/rrd_info.c b/src/rrd_info.c
index f2a81f06d452a3dd8a6e3ffa3662960a06b17a89..930898797d550e3e9b5190e8d12bcc8cda0fde42 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
index 493140a7ebe3d771684b18568f3be9539aaf9647..781eb8c5c55a01f914147953c46352f9c29db77a 100644 (file)
--- a/src/rrd_is_thread_safe.h
+++ b/src/rrd_is_thread_safe.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
*****************************************************************************
* rrd_is_thread_safe.c Poisons some nasty function calls using GNU cpp
*****************************************************************************
- * $Id: rrd_is_thread_safe.h 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_is_thread_safe.h 1447 2008-07-23 13:02:26Z oetiker $
*************************************************************************** */
#ifndef _RRD_IS_THREAD_SAFE_H
diff --git a/src/rrd_last.c b/src/rrd_last.c
index cc7e445ed550b1d51a33b6e2a69142655a7afe18..0b6a0ed67ca2802a95d6b85159b8d53185eb6afb 100644 (file)
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_last.c
*****************************************************************************
diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
index 06f0341c10d99ec84980cad715fe3b1316d5df27..8beb49e9bd500c4ff2306b026a310af643bf3723 100644 (file)
--- a/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_lastupdate Get the last datum entered for each DS
*****************************************************************************/
index 58c02cb8a319a45a7ccb156e38ae6e8490460d21..114bdce542dcd6a2e6a8509ea7b5b44b26d5563d 100644 (file)
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* rrd_not_thread_safe.c Contains routines used when thread safety is not
* an issue
*****************************************************************************
- * $Id: rrd_not_thread_safe.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_not_thread_safe.c 1447 2008-07-23 13:02:26Z oetiker $
*************************************************************************** */
#include "rrd.h"
#include "rrd_tool.h"
diff --git a/src/rrd_open.c b/src/rrd_open.c
index 7126e154f112d738d445e2ebaec8525ae3360ca1..a3fe8f8856d2f84ece20ca79e81257ec173ba824 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
- * $Id: rrd_open.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_open.c 1447 2008-07-23 13:02:26Z oetiker $
*****************************************************************************/
#include "rrd_tool.h"
diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 8fc1fc73d46fc42b641d87d68f9e455930d4e5a0..e6ccaa4d582cc16f69a58224aa59151782df34a4 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_resize.c Alters size of an RRA
*****************************************************************************
diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index ed46287336f182aabf38bcce1979b642ecce1db6..7531bceb4f8d2128712899f9ad13f0010a4f03d5 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2008 Florian octo Forster
* Distributed under the GPL
*****************************************************************************
* rrd_restore.c Contains logic to parse XML input and create an RRD file
*****************************************************************************
- * $Id: rrd_restore.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_restore.c 1447 2008-07-23 13:02:26Z oetiker $
*************************************************************************** */
/*
status = 0;
for (child = node->xmlChildrenNode; child != NULL; child = child->next) {
+ if (atoi(rrd->stat_head->version) == 1){
+ cdp_prep->scratch[CDP_primary_val].u_val = 0.0;
+ cdp_prep->scratch[CDP_secondary_val].u_val = 0.0;
+ }
if ((xmlStrcmp(child->name, (const xmlChar *) "comment") == 0)
|| (xmlStrcmp(child->name, (const xmlChar *) "text") == 0))
/* ignore */ ;
status = get_int_from_node(doc, child,
(int *) &cdp_prep->
scratch[CDP_unkn_pdp_cnt].u_cnt);
- /*
- * Compatibility code for 1.0.49
- */
- else if (xmlStrcmp(child->name, (const xmlChar *) "value") == 0) { /* {{{ */
- unsigned int i = 0;
- rra_def_t *rra_def = rrd->rra_def + (rrd->stat_head->rra_cnt - 1);
-
- while (42) {
- if (i >= ARRAY_LENGTH(cdp_prep->scratch)) {
- status = -1;
- break;
- }
-
- if ((cf_conv(rra_def->cf_nam) == CF_FAILURES)
- || (i == CDP_unkn_pdp_cnt)
- || (i == CDP_null_count)
- || (i == CDP_last_null_count))
- status = get_int_from_node(doc, child,
- (int *) &cdp_prep->scratch[i].
- u_cnt);
- else
- status = get_double_from_node(doc, child,
- &cdp_prep->scratch[i].
- u_val);
-
- if (status != 0)
- break;
-
- /* When this loops exits (sucessfully) `child' points to the last
- * `value' tag in the list. */
- if ((child->next == NULL)
- || (xmlStrcmp(child->name, (const xmlChar *) "value") !=
- 0))
- break;
-
- child = child->next;
- i++;
- }
- } /* }}} */
else {
rrd_set_error("parse_tag_rra_cdp_prep: Unknown tag: %s",
child->name);
else if (xmlStrcmp(child->name, (const xmlChar *) "pdp_per_row") == 0)
status = get_int_from_node(doc, child,
(int *) &cur_rra_def->pdp_cnt);
- else if (xmlStrcmp(child->name, (const xmlChar *) "params") == 0)
+ else if (atoi(rrd->stat_head->version) == 1
+ && xmlStrcmp(child->name, (const xmlChar *) "xff") == 0)
+ status = get_double_from_node(doc, child,
+ (double *) &cur_rra_def->par[RRA_cdp_xff_val].u_val);
+ else if (atoi(rrd->stat_head->version) >= 2
+ && xmlStrcmp(child->name, (const xmlChar *) "params") == 0)
status = parse_tag_rra_params(doc, child, cur_rra_def);
else if (xmlStrcmp(child->name, (const xmlChar *) "cdp_prep") == 0)
status = parse_tag_rra_cdp_prep(doc, child, rrd, cur_cdp_prep);
return (-1);
}
}
-
+ if (atoi(rrd->stat_head->version) < 3){
+ /* we output 3 or higher */
+ strcpy(rrd->stat_head->version,"0003");
+ }
fwrite(rrd->stat_head, sizeof(stat_head_t), 1, fh);
fwrite(rrd->ds_def, sizeof(ds_def_t), rrd->stat_head->ds_cnt, fh);
fwrite(rrd->rra_def, sizeof(rra_def_t), rrd->stat_head->rra_cnt, fh);
diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 11924830c4715f8fdee1938564c4f89ebe76683b..005048fad7e960b2d8449eeeee36ed95b18b0ab4 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_rpncalc.c RPN calculator functions
****************************************************************************/
diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
index 06ef0ffbbd6978919be1cbeacb86be6098a75f8d..d23b4ddf50d3823905f0903d1029188833bbf77a 100644 (file)
--- a/src/rrd_rpncalc.h
+++ b/src/rrd_rpncalc.h
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_rpncalc.h RPN calculator functions
****************************************************************************/
diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c
index c7f8d1e6978c643d1ec7d1e6057179c8e4facc16..8144c528691dd77c5788c99ca56689ffcdfc38d0 100644 (file)
--- a/src/rrd_thread_safe.c
+++ b/src/rrd_thread_safe.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
*****************************************************************************
* rrd_thread_safe.c Contains routines used when thread safety is required
*****************************************************************************
- * $Id: rrd_thread_safe.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_thread_safe.c 1447 2008-07-23 13:02:26Z oetiker $
*************************************************************************** */
#include <pthread.h>
index 1442f7b6fb3e69a842948247f988ff75fb4c7085..caccceb1b16157b0b3dc595e9268088becf1d572 100644 (file)
--- a/src/rrd_thread_safe_nt.c
+++ b/src/rrd_thread_safe_nt.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* rrd_thread_safe.c Contains routines used when thread safety is required
* for win32
*****************************************************************************
- * $Id: rrd_thread_safe_nt.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_thread_safe_nt.c 1447 2008-07-23 13:02:26Z oetiker $
*************************************************************************** */
#include <windows.h>
diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 8efd492c48570788f6b59b73192bd71e821d8320..f536fa517926a15d60791b888fad285a08ab342f 100644 (file)
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 0be66e499f82af16a87478abc7fab64e3bb48b98..8f0e3c392a9b5eefc97b506934328ab630b340dc 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
diff --git a/src/rrd_tune.c b/src/rrd_tune.c
index 159c467d15e45e8adebe236965eb21375c122686..ac0672d553b8b79989001ef12cbb3d1a9da16142 100644 (file)
--- a/src/rrd_tune.c
+++ b/src/rrd_tune.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* change header parameters of an rrd
*****************************************************************************
- * $Id: rrd_tune.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_tune.c 1447 2008-07-23 13:02:26Z oetiker $
* $Log$
* Revision 1.6 2004/05/26 22:11:12 oetiker
* reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
diff --git a/src/rrd_update.c b/src/rrd_update.c
index f5b8050853df7c9d43455fc02a5a37136727f3d0..1c292f1833114f3dd5a29d78b46fcb81faf3b563 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
- * $Id: rrd_update.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrd_update.c 1447 2008-07-23 13:02:26Z oetiker $
*****************************************************************************/
#include "rrd_tool.h"
rra_step_cnt, updvals, tmpl_idx, tmpl_cnt,
&pcdp_summary, version, skip_update,
&schedule_smooth) == -1) {
+ if (rrd_test_error()) { /* Should have error string always here */
+ char *save_error;
+
+ /* Prepend file name to error message */
+ if ((save_error = strdup(rrd_get_error())) != NULL) {
+ rrd_set_error("%s: %s", filename, save_error);
+ free(save_error);
+ }
+ }
free(arg_copy);
break;
}
diff --git a/src/rrd_version.c b/src/rrd_version.c
index 32ccbeb56c065104f32dd54563760248add6781c..199929e2f21d7d290e25453bf4d80cf716a81b58 100644 (file)
--- a/src/rrd_version.c
+++ b/src/rrd_version.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrd_version Return
*****************************************************************************
diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index 0faf13d6c8552b1d9266168dda30b32df4e7f64c..0be461533c6cb3c817d879dc118280a09b9715bb 100644 (file)
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
diff --git a/src/rrd_xport.h b/src/rrd_xport.h
index 8918d797b63a7946951d5afeab227117d131a8fb..759e440a3c6e448c0da108f401c6824b372c94bf 100644 (file)
--- a/src/rrd_xport.h
+++ b/src/rrd_xport.h
/****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_xport.h contains XML related constants
****************************************************************************/
diff --git a/src/rrdupdate.c b/src/rrdupdate.c
index d2841cdb0b0035f76a5dc909fc8d032b21e5396f..1851622b832e5c0d3ca070d9acef6532bc1248b3 100644 (file)
--- a/src/rrdupdate.c
+++ b/src/rrdupdate.c
/*****************************************************************************
- * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
*****************************************************************************
* rrdupdate.c Main program for the (standalone) rrdupdate utility
*****************************************************************************
- * $Id: rrdupdate.c 1432 2008-06-10 23:12:55Z oetiker $
+ * $Id: rrdupdate.c 1447 2008-07-23 13:02:26Z oetiker $
*****************************************************************************/
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)