From: Sebastian Harl Date: Wed, 23 Jul 2008 19:40:04 +0000 (+0200) Subject: Imported upstream version 1.3.1. X-Git-Tag: upstream/1.3.1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ad31ce4333ae13d850e2d3fa4728d2ba73276a9;p=pkg-rrdtool.git Imported upstream version 1.3.1. --- diff --git a/CHANGES b/CHANGES index 059edee..c4e9062 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,84 @@ +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, diff --git a/NEWS b/NEWS index ec85692..5497a67 100644 --- a/NEWS +++ b/NEWS @@ -5,89 +5,101 @@ RRDTOOL 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 diff --git a/bindings/perl-piped/RRDp.pm b/bindings/perl-piped/RRDp.pm index a99e56e..0a28506 100644 --- a/bindings/perl-piped/RRDp.pm +++ b/bindings/perl-piped/RRDp.pm @@ -120,7 +120,7 @@ sub cmd (@); sub end (); sub read (); -$VERSION=1.3000; +$VERSION=1.3001; sub start ($){ croak "rrdtool is already running" diff --git a/bindings/perl-shared/RRDs.pm b/bindings/perl-shared/RRDs.pm index d151db4..df115c1 100644 --- a/bindings/perl-shared/RRDs.pm +++ b/bindings/perl-shared/RRDs.pm @@ -7,7 +7,7 @@ use vars qw(@ISA $VERSION); require DynaLoader; -$VERSION=1.3000; +$VERSION=1.3001; bootstrap RRDs $VERSION; diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c index 1b85f96..2771720 100644 --- a/bindings/python/rrdtoolmodule.c +++ b/bindings/python/rrdtoolmodule.c @@ -184,7 +184,7 @@ static PyObject *PyRRD_fetch( 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 3985c27..38cd899 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /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. @@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # 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 @@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then # 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]... @@ -1581,7 +1581,7 @@ fi 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 @@ -1721,7 +1721,7 @@ fi 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, @@ -1735,7 +1735,7 @@ cat >config.log <<_ACEOF 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 $@ @@ -2089,7 +2089,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -NUMVERS=1.3000 +NUMVERS=1.3001 LIBVERS=4:0:0 @@ -2538,7 +2538,7 @@ fi # Define the identity of the package. PACKAGE='rrdtool' - VERSION='1.3.0' + VERSION='1.3.1' cat >>confdefs.h <<_ACEOF @@ -32973,7 +32973,7 @@ exec 6>&1 # 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 @@ -33026,7 +33026,7 @@ Report bugs to ." _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 7a15b5c..80ada60 100644 --- a/configure.ac +++ b/configure.ac @@ -9,14 +9,14 @@ dnl tell automake the this script is for rrdtool 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 dd06561..f6ba28b 100644 --- a/doc/bin_dec_hex.1 +++ b/doc/bin_dec_hex.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 3fe4075..f4f7acb 100644 --- a/doc/bin_dec_hex.txt +++ b/doc/bin_dec_hex.txt @@ -371,4 +371,4 @@ AAUUTTHHOORR -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 dd5d9c9..0da42ff 100644 --- a/doc/cdeftutorial.1 +++ b/doc/cdeftutorial.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 0b0ec47..7365bac 100644 --- a/doc/cdeftutorial.txt +++ b/doc/cdeftutorial.txt @@ -799,4 +799,4 @@ AAUUTTHHOORR -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 8cdfbaa..ae733c0 100644 --- a/doc/rpntutorial.1 +++ b/doc/rpntutorial.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 9605c4b..690693b 100644 --- a/doc/rpntutorial.txt +++ b/doc/rpntutorial.txt @@ -187,4 +187,4 @@ AAUUTTHHOORR -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 906e235..8534a1f 100644 --- a/doc/rrd-beginners.1 +++ b/doc/rrd-beginners.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 27ae855..9d2aed1 100644 --- a/doc/rrd-beginners.txt +++ b/doc/rrd-beginners.txt @@ -318,4 +318,4 @@ AAUUTTHHOORR -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 1ba620b..80dae58 100644 --- a/doc/rrdbuild.1 +++ b/doc/rrdbuild.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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" @@ -163,7 +163,7 @@ Once you have decided. Save the two locations into environment variables. .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 @@ -180,9 +180,9 @@ Lets first assume you already have all the necessary libraries 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 @@ -256,10 +256,8 @@ libpng and zlib are pretty standard so you will probably have them on your 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 @@ -320,29 +317,28 @@ Unfortunately, the syntax again differs from system to system: .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 \- @@ -351,10 +347,12 @@ not available natively, here is how to compile it. \& $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 @@ -364,13 +362,15 @@ Chances are very high that you already have that on your system ... \& $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 @@ -380,8 +380,10 @@ the end of line 4 means that line 4 and line 5 are on one line. \& $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 @@ -391,15 +393,17 @@ the end of line 4 means that line 4 and line 5 are on one line. \& $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 @@ -409,13 +413,15 @@ add the following at the start the configure line: \& $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 @@ -425,8 +431,10 @@ config file. \& $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 @@ -436,8 +444,10 @@ config file. \& $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 @@ -451,8 +461,10 @@ config file. \& $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 @@ -462,8 +474,10 @@ config file. \& $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 @@ -473,7 +487,8 @@ config file. \& $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 @@ -485,7 +500,7 @@ tcl setups that would prevent rrdtool from building if they are included in 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 @@ -493,7 +508,7 @@ their current state. .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 01a9efc..c003c10 100644 --- a/doc/rrdbuild.html +++ b/doc/rrdbuild.html @@ -29,12 +29,23 @@
  • BUILDING DEPENDENCIES
  • AUTHOR
    • @@ -79,7 +90,7 @@ tar and GNU make respectively. It could be that they a

    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 /tmp is mounted with the option noexec (RHEL seems todo that) you have to choose a different directory!

    Now make sure the BUILD_DIR exists and go there:

    @@ -89,9 +100,9 @@ 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 configure complaining about several missing libraries.

    @@ -158,7 +169,7 @@ possible that they are pretty old and thus don't live up to our expectations, so you may want to compile their latest versions.

    -

    Build Tips for AIX

    +

    General build tips for AIX

    If you are working with AIX, you may find the the --disable-shared 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 --disable-static @@ -170,11 +181,11 @@ instead.

    (Better instructions for AIX welcome!)

    -

    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 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:

    +

    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 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
    @@ -188,11 +199,11 @@ 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 pkgconfig 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:

    +

    The above relies on the presence of the 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:

    Solaris
    @@ -210,7 +221,6 @@ Unfortunately, the syntax again differs from system to system:

    -
  export LDFLAGS="+b${INSTALL_DIR}/lib"
    AIX
    @@ -218,6 +228,8 @@ Unfortunately, the syntax again differs from system to system:

      export LDFLAGS="-Wl,-blibpath:${INSTALL_DIR}/lib"
    +
    +

    If you have GNUmake installed and it is not called 'make', then do

    @@ -226,10 +238,9 @@ then do
    
 
    otherwise just do
    
 
      export MAKE=make
    
-
    
-
    Building pkgconfig
    
-
-
    
+
    
+
    
+
    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.
    
@@ -240,10 +251,9 @@ not available natively, here is how to compile it.
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
  $MAKE
  $MAKE install
    - -
    Building zlib
    - -
    +

    +

    +

    Building zlib

    Chances are very high that you already have that on your system ...

      cd $BUILD_DIR
@@ -253,10 +263,9 @@ not available natively, here is how to compile it.
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --shared
  $MAKE
  $MAKE install
    -
    -
    Building libpng
    - -
    +

    +

    +

    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 @@ -269,10 +278,9 @@ the end of line 4 means that line 4 and line 5 are on one line.

    env CFLAGS="-O3 -fPIC" ./configure --prefix=$INSTALL_DIR $MAKE $MAKE install -
    -
    Building freetype
    - -
    +

    +

    +

    Building freetype

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/freetype-2.3.5.tar.gz
@@ -285,10 +293,9 @@ the end of line 4 means that line 4 and line 5 are on one line.
    
 add the following at the start the configure line:
    
 
      env EGREP=egrep
    
-
    -
    Building LibXML2
    - -
    +

    +

    +

    Building LibXML2

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/libxml2-sources-2.6.31.tar.gz
@@ -297,10 +304,9 @@ add the following at the start the configure line:
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
  $MAKE
  $MAKE install
    -
    -
    Building fontconfig
    - -
    +

    +

    +

    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 @@ -313,10 +319,9 @@ config file.

    ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" $MAKE $MAKE install -
    -
    Building Pixman
    - -
    +

    +

    +

    Building Pixman

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/pixman-0.10.0.tar.gz
@@ -325,10 +330,9 @@ config file.
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
  $MAKE
  $MAKE install
    -
    -
    Building Cairo
    - -
    +

    +

    +

    Building Cairo

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/cairo-1.6.4.tar.gz
@@ -341,10 +345,9 @@ config file.
    
     CFLAGS="-O3 -fPIC"
  $MAKE
  $MAKE install
    -
    -
    Building Glib
    - -
    +

    +

    +

    Building Glib

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/glib-2.15.4.tar.gz
@@ -353,10 +356,9 @@ config file.
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC"
  $MAKE
  $MAKE install
    -
    -
    Building Pango
    - -
    +

    +

    +

    Building Pango

      cd $BUILD_DIR
  wget http://oss.oetiker.ch/rrdtool/pub/libs/pango-1.21.1.tar.gz
@@ -365,8 +367,9 @@ config file.
    
  ./configure --prefix=$INSTALL_DIR CFLAGS="-O3 -fPIC" --without-x
  $MAKE
  $MAKE install
    -
    -
    +

    +

    +

    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 @@ -376,13 +379,13 @@ because it seems that a fair number of people have ill configured 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 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!

    Now go to $INSTALL_DIR/share/rrdtool/examples/ and run them to see if @@ -391,9 +394,7 @@ your build has been successful.

    AUTHOR

    -

    Tobias Oetiker <tobi@oetiker.ch> - -

    +

    Tobias Oetiker <tobi@oetiker.ch>

    diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod index 1a281e5..bb9e024 100644 --- a/doc/rrdbuild.pod +++ b/doc/rrdbuild.pod @@ -41,7 +41,7 @@ Where you want to install the software. 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 is mounted with the option noexec (RHEL seems todo that) you have to choose @@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there: 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 @@ -126,7 +126,7 @@ 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. -=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 @@ -140,12 +140,12 @@ Another hint to get rrdtool working on AIX is to use the IBM XL C Compiler: (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 @@ -155,20 +155,18 @@ If you have an other compilers here are some ides: =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 program. Below you find instructions -on how to compile pkgconfig as well. +The above relies on the presence of the F 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 @@ -181,7 +179,7 @@ Unfortunately, the syntax again differs from system to system: export LDFLAGS="-Wl,--rpath -Wl,${INSTALL_DIR}/lib" =item HPUX - + export LDFLAGS="+b${INSTALL_DIR}/lib" =item AIX @@ -200,7 +198,7 @@ otherwise just do 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 @@ -213,7 +211,7 @@ not available natively, here is how to compile it. $MAKE $MAKE install -=item Building zlib +=head3 Building zlib Chances are very high that you already have that on your system ... @@ -225,7 +223,7 @@ 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 @@ -240,7 +238,7 @@ the end of line 4 means that line 4 and line 5 are on one line. $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 @@ -255,7 +253,7 @@ add the following at the start the configure line: 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 @@ -265,7 +263,7 @@ add the following at the start the configure line: $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. @@ -280,7 +278,7 @@ config file. $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 @@ -290,7 +288,7 @@ config file. $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 @@ -304,7 +302,7 @@ config file. $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 @@ -314,7 +312,7 @@ config file. $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 @@ -324,7 +322,7 @@ config file. $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 @@ -336,14 +334,14 @@ because it seems that a fair number of people have ill configured 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 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 b16b571..0c00fb4 100644 --- a/doc/rrdbuild.txt +++ b/doc/rrdbuild.txt @@ -35,7 +35,7 @@ OOPPTTIIMMIISSTTIICC BBUUIILLDD ables. BUILD_DIR=/tmp/rrdbuild - INSTALL_DIR=/usr/local/rrdtool-1.3.0 + INSTALL_DIR=/usr/local/rrdtool-1.3.1 If your _/_t_m_p is mounted with the option noexec (RHEL seems todo that) you have to choose a different directory! @@ -48,9 +48,9 @@ OOPPTTIIMMIISSTTIICC BBUUIILLDD 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 @@ BBUUIILLDDIINNGG DDEEPPEENNDDEENNCCIIEESS don't live up to our expectations, so you may want to compile their latest versions. - _B_u_i_l_d _T_i_p_s _f_o_r _A_I_X + GGeenneerraall bbuuiilldd ttiippss ffoorr AAIIXX If you are working with AIX, you may find the the ----ddiissaabbllee--sshhaarreedd option will cause things to break for you. In that case you may have to @@ -134,164 +134,175 @@ BBUUIILLDDIINNGG DDEEPPEENNDDEENNCCIIEESS (Better instructions for AIX welcome!) - BBuuiillddiinngg LLiibbrraarriieess + BBuuiilldd IInnssttrruuccttiioonnss - 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 _p_k_g_c_o_n_f_i_g 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 _p_k_g_c_o_n_f_i_g 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 + + _B_u_i_l_d_i_n_g _p_k_g_c_o_n_f_i_g + + 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 + + _B_u_i_l_d_i_n_g _z_l_i_b + + 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 + + _B_u_i_l_d_i_n_g _l_i_b_p_n_g + + 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 + + _B_u_i_l_d_i_n_g _f_r_e_e_t_y_p_e + + 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 + + _B_u_i_l_d_i_n_g _L_i_b_X_M_L_2 + + 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 + + _B_u_i_l_d_i_n_g _f_o_n_t_c_o_n_f_i_g + + 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 + + _B_u_i_l_d_i_n_g _P_i_x_m_a_n + + 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 + + _B_u_i_l_d_i_n_g _C_a_i_r_o + + 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 + + _B_u_i_l_d_i_n_g _G_l_i_b + + 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 + + _B_u_i_l_d_i_n_g _P_a_n_g_o + + 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 + + BBuuiillddiinngg rrrrddttooooll ((sseeccoonndd ttrryy)) 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 @@ BBUUIILLDDIINNGG DDEEPPEENNDDEENNCCIIEESS 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! @@ -323,4 +334,4 @@ AAUUTTHHOORR -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 5607901..847c2d7 100644 --- a/doc/rrdcgi.1 +++ b/doc/rrdcgi.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 7325ba8..c53f967 100644 --- a/doc/rrdcgi.txt +++ b/doc/rrdcgi.txt @@ -204,4 +204,4 @@ AAUUTTHHOORR -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 8809ca0..c50fbe5 100644 --- a/doc/rrdcreate.1 +++ b/doc/rrdcreate.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 22a83a6..d78e941 100644 --- a/doc/rrdcreate.txt +++ b/doc/rrdcreate.txt @@ -530,4 +530,4 @@ AAUUTTHHOORR -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 cd71311..23efa30 100644 --- a/doc/rrddump.1 +++ b/doc/rrddump.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 ca0c8c4..d32ddb9 100644 --- a/doc/rrddump.txt +++ b/doc/rrddump.txt @@ -48,4 +48,4 @@ AAUUTTHHOORR -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 9685270..c3aa51e 100644 --- a/doc/rrdfetch.1 +++ b/doc/rrdfetch.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 6033e37..f92ebed 100644 --- a/doc/rrdfetch.txt +++ b/doc/rrdfetch.txt @@ -228,4 +228,4 @@ AAUUTTHHOORR -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 212e086..91fee2a 100644 --- a/doc/rrdfirst.1 +++ b/doc/rrdfirst.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 659b106..cd2193b 100644 --- a/doc/rrdfirst.txt +++ b/doc/rrdfirst.txt @@ -26,4 +26,4 @@ AAUUTTHHOORR -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 4983013..48113a1 100644 --- a/doc/rrdgraph.1 +++ b/doc/rrdgraph.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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" @@ -378,8 +378,9 @@ Note that for linear graphs, \s-1SI\s0 notation is used by default. .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 b4db55e..1a367f8 100644 --- a/doc/rrdgraph.html +++ b/doc/rrdgraph.html @@ -269,8 +269,9 @@ Note that for linear graphs, SI notation is used by default.

    Miscellaneous

    [-z|--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.

    [-f|--imginfo printfstr]

    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 048171a..092e37f 100644 --- a/doc/rrdgraph.pod +++ b/doc/rrdgraph.pod @@ -262,8 +262,10 @@ Note that for linear graphs, SI notation is used by default. [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] diff --git a/doc/rrdgraph.txt b/doc/rrdgraph.txt index 3adf75a..def7c4c 100644 --- a/doc/rrdgraph.txt +++ b/doc/rrdgraph.txt @@ -242,7 +242,8 @@ OOPPTTIIOONNSS [--zz|----llaazzyy] 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. [--ff|----iimmggiinnffoo _p_r_i_n_t_f_s_t_r] @@ -462,4 +463,4 @@ AAUUTTHHOORR -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 d0e5b20..28e8847 100644 --- a/doc/rrdgraph_data.1 +++ b/doc/rrdgraph_data.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 7d241aa..8dab92a 100644 --- a/doc/rrdgraph_data.txt +++ b/doc/rrdgraph_data.txt @@ -104,4 +104,4 @@ AAUUTTHHOORR -1.3.0 2008-03-15 RRDGRAPH_DATA(1) +1.3.1 2008-03-15 RRDGRAPH_DATA(1) diff --git a/doc/rrdgraph_examples.1 b/doc/rrdgraph_examples.1 index 52a3249..242b751 100644 --- a/doc/rrdgraph_examples.1 +++ b/doc/rrdgraph_examples.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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" diff --git a/doc/rrdgraph_examples.txt b/doc/rrdgraph_examples.txt index da34976..9b64ac7 100644 --- a/doc/rrdgraph_examples.txt +++ b/doc/rrdgraph_examples.txt @@ -196,4 +196,4 @@ AAUUTTHHOORR -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 952aee2..aedf3ee 100644 --- a/doc/rrdgraph_graph.1 +++ b/doc/rrdgraph_graph.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 diff --git a/doc/rrdgraph_graph.html b/doc/rrdgraph_graph.html index f3f1a50..6c5b136 100644 --- a/doc/rrdgraph_graph.html +++ b/doc/rrdgraph_graph.html @@ -203,11 +203,16 @@ 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 %p will return an empty string.

    -
    %S
    +
    %s

    The second as a decimal number (range 00 to 61).

    +
    %S
    + +
    +

    The seconds since the epoch (1.1.1970) (libc dependant non standard!)

    +
    %U
    diff --git a/doc/rrdgraph_graph.pod b/doc/rrdgraph_graph.pod index 7f2a36b..19a732b 100644 --- a/doc/rrdgraph_graph.pod +++ b/doc/rrdgraph_graph.pod @@ -142,10 +142,14 @@ 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 %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 ae59923..e908674 100644 --- a/doc/rrdgraph_graph.txt +++ b/doc/rrdgraph_graph.txt @@ -110,7 +110,10 @@ DDEESSCCRRIIPPTTIIOONN and midnight as `am'. Note that in many locales and `pm' notation is unsupported and in such cases %p will return an empty string. - %%SS The second as a decimal number (range 00 to 61). + %%ss The second as a decimal number (range 00 to 61). + + %%SS The seconds since the epoch (1.1.1970) (libc dependant non stan- + dard!) %%UU 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 @@ NNOOTTEESS oonn lleeggeenndd aarrgguummeennttss A colon ':' in a _l_e_g_e_n_d 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. SSttrriinngg FFoorrmmaattttiinngg @@ -423,4 +426,4 @@ AAUUTTHHOORR -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 9feb50c..86d742f 100644 --- a/doc/rrdgraph_rpn.1 +++ b/doc/rrdgraph_rpn.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 fd43ce7..6ca5af3 100644 --- a/doc/rrdgraph_rpn.txt +++ b/doc/rrdgraph_rpn.txt @@ -306,4 +306,4 @@ AAUUTTHHOORR -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 4890044..2dd9685 100644 --- a/doc/rrdinfo.1 +++ b/doc/rrdinfo.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 71da96e..0df0fb2 100644 --- a/doc/rrdinfo.txt +++ b/doc/rrdinfo.txt @@ -55,4 +55,4 @@ AAUUTTHHOORR -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 a2a1ecb..63b3ade 100644 --- a/doc/rrdlast.1 +++ b/doc/rrdlast.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 ed09808..f9afc48 100644 --- a/doc/rrdlast.txt +++ b/doc/rrdlast.txt @@ -20,4 +20,4 @@ AAUUTTHHOORR -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 a23dd4e..7fe57de 100644 --- a/doc/rrdlastupdate.1 +++ b/doc/rrdlastupdate.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 54d0d72..fb7bdf2 100644 --- a/doc/rrdlastupdate.txt +++ b/doc/rrdlastupdate.txt @@ -20,4 +20,4 @@ AAUUTTHHOORR -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 6fbc1ec..9a9ffb8 100644 --- a/doc/rrdresize.1 +++ b/doc/rrdresize.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 836793e..abb4703 100644 --- a/doc/rrdresize.txt +++ b/doc/rrdresize.txt @@ -41,4 +41,4 @@ AAUUTTHHOORR -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 341bede..264146f 100644 --- a/doc/rrdrestore.1 +++ b/doc/rrdrestore.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 d4e0423..c0663e4 100644 --- a/doc/rrdrestore.txt +++ b/doc/rrdrestore.txt @@ -30,4 +30,4 @@ AAUUTTHHOORR -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 19cc7dc..e74c68f 100644 --- a/doc/rrdthreads.1 +++ b/doc/rrdthreads.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 a17a68a..d0aebb5 100644 --- a/doc/rrdthreads.txt +++ b/doc/rrdthreads.txt @@ -100,4 +100,4 @@ AAUUTTHHOORR -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 ada7ee3..77b1548 100644 --- a/doc/rrdtool.1 +++ b/doc/rrdtool.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 a1ea939..4559b02 100644 --- a/doc/rrdtool.txt +++ b/doc/rrdtool.txt @@ -273,4 +273,4 @@ AAUUTTHHOORR -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 b2192cc..271b312 100644 --- a/doc/rrdtune.1 +++ b/doc/rrdtune.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 a617ab4..cd1157a 100644 --- a/doc/rrdtune.txt +++ b/doc/rrdtune.txt @@ -159,4 +159,4 @@ AAUUTTHHOORR -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 0d43909..832a884 100644 --- a/doc/rrdtutorial.1 +++ b/doc/rrdtutorial.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 25822f8..1864128 100644 --- a/doc/rrdtutorial.txt +++ b/doc/rrdtutorial.txt @@ -1149,4 +1149,4 @@ AAUUTTHHOORR -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 9fe2f8a..59e60fb 100644 --- a/doc/rrdupdate.1 +++ b/doc/rrdupdate.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 99ac405..37b704c 100644 --- a/doc/rrdupdate.txt +++ b/doc/rrdupdate.txt @@ -91,4 +91,4 @@ AAUUTTHHOORR -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 56cb6f1..d84e3f3 100644 --- a/doc/rrdxport.1 +++ b/doc/rrdxport.1 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .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 f72a093..964824a 100644 --- a/doc/rrdxport.txt +++ b/doc/rrdxport.txt @@ -125,4 +125,4 @@ AAUUTTHHOORR -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 280ea60..d71d3e1 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -9,15 +9,17 @@ 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 @@ -142,9 +144,11 @@ The %{name}-ruby package includes RRDtool bindings for Ruby. %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 @@ -153,8 +157,10 @@ The %{name}-ruby package includes RRDtool bindings for Ruby. # 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|' \ @@ -163,7 +169,10 @@ The %{name}-ruby package includes RRDtool bindings for Ruby. # # 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 023c829..f74a718 100644 --- a/src/pngsize.c +++ b/src/pngsize.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 2eac032..e2384f3 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 d4e5723..adbd91f 100644 --- a/src/rrd_cgi.c +++ b/src/rrd_cgi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 2cc8557..edba9b8 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 *****************************************************************************/ @@ -373,6 +373,8 @@ int rrd_create_r( 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 ac16a7d..2a90779 100644 --- a/src/rrd_diff.c +++ b/src/rrd_diff.c @@ -1,11 +1,11 @@ /***************************************************************************** - * 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 b73e977..114632f 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 1206284..6c49e96 100644 --- a/src/rrd_error.c +++ b/src/rrd_error.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 1e6c1ef..6447aa3 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 bdba6c0..fe5d174 100644 --- a/src/rrd_first.c +++ b/src/rrd_first.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 2fd90cb..b925b28 100644 --- a/src/rrd_format.c +++ b/src/rrd_format.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 75441ac..e457a7a 100644 --- a/src/rrd_format.h +++ b/src/rrd_format.h @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 d61d015..ca7f9ea 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 300fdbe..57a1bb6 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 ****************************************************************************/ @@ -2951,8 +2951,13 @@ int graph_paint( 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; @@ -2961,14 +2966,16 @@ int graph_paint( 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. *** @@ -3556,7 +3563,11 @@ int rrd_graph( 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) { @@ -4437,9 +4448,9 @@ int vdef_calc( 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 7cefc82..d570e58 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 f04d9f7..263b3f9 100644 --- a/src/rrd_hw.c +++ b/src/rrd_hw.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 eac7616..df1bf07 100644 --- a/src/rrd_hw.h +++ b/src/rrd_hw.h @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 83da369..09e455f 100644 --- a/src/rrd_i18n.h +++ b/src/rrd_i18n.h @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 f2a81f0..9308987 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 *****************************************************************************/ diff --git a/src/rrd_is_thread_safe.h b/src/rrd_is_thread_safe.h index 493140a..781eb8c 100644 --- a/src/rrd_is_thread_safe.h +++ b/src/rrd_is_thread_safe.h @@ -1,12 +1,12 @@ /***************************************************************************** - * 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 * & 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 cc7e445..0b6a0ed 100644 --- a/src/rrd_last.c +++ b/src/rrd_last.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 06f0341..8beb49e 100644 --- a/src/rrd_lastupdate.c +++ b/src/rrd_lastupdate.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 *****************************************************************************/ diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c index 58c02cb..114bdce 100644 --- a/src/rrd_not_thread_safe.c +++ b/src/rrd_not_thread_safe.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 * & Tobias Oetiker * Distributed under the GPL @@ -7,7 +7,7 @@ * 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 7126e15..a3fe8f8 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 8fc1fc7..e6ccaa4 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 ed46287..7531bce 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -1,11 +1,11 @@ /***************************************************************************** - * 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 $ *************************************************************************** */ /* @@ -318,6 +318,10 @@ static int parse_tag_rra_cdp_prep_ds( 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 */ ; @@ -385,45 +389,6 @@ static int parse_tag_rra_cdp_prep_ds( 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); @@ -708,7 +673,12 @@ static int parse_tag_rra( 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); @@ -1025,7 +995,10 @@ static int write_file( 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 1192483..005048f 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 06ef0ff..d23b4dd 100644 --- a/src/rrd_rpncalc.h +++ b/src/rrd_rpncalc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 c7f8d1e..8144c52 100644 --- a/src/rrd_thread_safe.c +++ b/src/rrd_thread_safe.c @@ -1,12 +1,12 @@ /***************************************************************************** - * 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 * & 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 diff --git a/src/rrd_thread_safe_nt.c b/src/rrd_thread_safe_nt.c index 1442f7b..caccceb 100644 --- a/src/rrd_thread_safe_nt.c +++ b/src/rrd_thread_safe_nt.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 * & Tobias Oetiker * Distributed under the GPL @@ -7,7 +7,7 @@ * 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 diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 8efd492..f536fa5 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 0be66e4..8f0e3c3 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 159c467..ac0672d 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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 diff --git a/src/rrd_update.c b/src/rrd_update.c index f5b8050..1c292f1 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,10 +1,10 @@ /***************************************************************************** - * 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" @@ -502,6 +502,15 @@ int _rrd_update( 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 32ccbeb..199929e 100644 --- a/src/rrd_version.c +++ b/src/rrd_version.c @@ -1,5 +1,5 @@ /***************************************************************************** - * 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 0faf13d..0be4615 100644 --- a/src/rrd_xport.c +++ b/src/rrd_xport.c @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 8918d79..759e440 100644 --- a/src/rrd_xport.h +++ b/src/rrd_xport.h @@ -1,5 +1,5 @@ /**************************************************************************** - * 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 d2841cd..1851622 100644 --- a/src/rrdupdate.c +++ b/src/rrdupdate.c @@ -1,9 +1,9 @@ /***************************************************************************** - * 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)