From blair at orcaware.com Sat Aug 2 09:56:41 2003 From: blair at orcaware.com (Blair Zajac) Date: Sat, 2 Aug 2003 09:56:41 -0700 Subject: [Orca-checkins] rev 246 - in trunk/orca: . packages/Time-HiRes-1.49 packages/Time-HiRes-1.50 packages/Time-HiRes-1.50/hints Message-ID: <200308021656.h72Gufgg024660@orcaware.com> Author: blair Date: Sat Aug 2 09:55:53 2003 New Revision: 246 Added: trunk/orca/packages/Time-HiRes-1.50/ - copied from rev 244, trunk/orca/packages/Time-HiRes-1.49/ trunk/orca/packages/Time-HiRes-1.50/hints/dec_osf.pl Removed: trunk/orca/packages/Time-HiRes-1.49/ Modified: trunk/orca/INSTALL trunk/orca/configure.in trunk/orca/packages/Time-HiRes-1.50/Changes trunk/orca/packages/Time-HiRes-1.50/HiRes.pm trunk/orca/packages/Time-HiRes-1.50/HiRes.xs trunk/orca/packages/Time-HiRes-1.50/MANIFEST trunk/orca/packages/Time-HiRes-1.50/Makefile.PL trunk/orca/packages/Time-HiRes-1.50/hints/sco.pl Log: Upgrade Time::HiRes from 1.49 to 1.50. * INSTALL (Determine which Perl modules need compiling and installing): Update all references to Time::HiRes's version number from 1.49 to 1.50. * configure.in: Bump Time::HiRes's version number to 1.50. * packages/Time-HiRes-1.50: Renamed from packages/Time-HiRes-1.49. Directory contents updated from Time-HiRes-1.50.tar.gz. Modified: trunk/orca/INSTALL ============================================================================== --- trunk/orca/INSTALL (original) +++ trunk/orca/INSTALL Sat Aug 2 09:55:53 2003 @@ -177,7 +177,7 @@ Math::IntervalSearch >= 1.05 >= 1.05 1.05 RRDs >= 1.000431 >= 1.0.43 1.0.43 Storable >= 2.07 >= 2.07 2.07 - Time::HiRes Not required by Orca 1.49 + Time::HiRes Not required by Orca 1.50 All seven of these modules are included with the Orca distribution in the packages directory. When you configure Orca in step 3), @@ -278,10 +278,10 @@ Time::HiRes - http://www.perl.com/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.49.tar.gz + http://www.perl.com/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.50.tar.gz - % gunzip -c Time-HiRes-1.49.tar.gz | tar xvf - - % cd Time-HiRes-1.49 + % gunzip -c Time-HiRes-1.50.tar.gz | tar xvf - + % cd Time-HiRes-1.50 % perl Makefile.PL % make % make test Modified: trunk/orca/configure.in ============================================================================== --- trunk/orca/configure.in (original) +++ trunk/orca/configure.in Sat Aug 2 09:55:53 2003 @@ -41,8 +41,8 @@ RRDTOOL_VER=1.000431 STORABLE_DIR=Storable-2.07 STORABLE_VER=2.07 -TIME_HIRES_DIR=Time-HiRes-1.49 -TIME_HIRES_VER=1.49 +TIME_HIRES_DIR=Time-HiRes-1.50 +TIME_HIRES_VER=1.50 AC_SUBST(COMPRESS_ZLIB_DIR) AC_SUBST(DATA_DUMPER_DIR) Modified: trunk/orca/packages/Time-HiRes-1.50/Changes ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/Changes (original) +++ trunk/orca/packages/Time-HiRes-1.50/Changes Sat Aug 2 09:55:53 2003 @@ -1,5 +1,15 @@ Revision history for Perl extension Time::HiRes. +1.50 + - add a message (for non-core builds) to Makefile.PL about + the LC_ALL=C workaround + - &Time::HiRes::d_nanosleep was broken (perl change #20131) + - the nanosleep() probe was broken (perl change #20061) + - use existence instead of definedness for feature probes + (perl change #20043) + - MPE/iX tweak (perl change #20042) + - do not use HAS_NANOSLEEP (perl change #19898) + 1.49 - UVuf for non-IVSIZE platforms (from Keiichiro Nagano) - OS/2 can always mix subsecond sleeps with signals Modified: trunk/orca/packages/Time-HiRes-1.50/HiRes.pm ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/HiRes.pm (original) +++ trunk/orca/packages/Time-HiRes-1.50/HiRes.pm Sat Aug 2 09:55:53 2003 @@ -15,7 +15,7 @@ d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer d_nanosleep); -$VERSION = '1.49'; +$VERSION = '1.50'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; Modified: trunk/orca/packages/Time-HiRes-1.50/HiRes.xs ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/HiRes.xs (original) +++ trunk/orca/packages/Time-HiRes-1.50/HiRes.xs Sat Aug 2 09:55:53 2003 @@ -340,7 +340,10 @@ #endif -#if !defined(HAS_USLEEP) && defined(HAS_NANOSLEEP) + /* Do not use H A S _ N A N O S L E E P + * so that Perl Configure doesn't scan for it. + * The TIME_HIRES_NANOSLEEP is set by Makefile.PL. */ +#if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP) #define HAS_USLEEP #define usleep hrt_nanosleep /* could conflict with ncurses for static build */ Modified: trunk/orca/packages/Time-HiRes-1.50/MANIFEST ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/MANIFEST (original) +++ trunk/orca/packages/Time-HiRes-1.50/MANIFEST Sat Aug 2 09:55:53 2003 @@ -1,6 +1,7 @@ Changes Time::HiRes extension fallback/const-c.inc Fallback code for constants fallback/const-xs.inc Fallback code for constants +hints/dec_osf.pl Hints for Time::HiRes for named architecture hints/dynixptx.pl Hints for Time::HiRes for named architecture hints/irix.pl Hints for Time::HiRes for named architecture hints/sco.pl Hints for Time::HiRes for named architecture Modified: trunk/orca/packages/Time-HiRes-1.50/Makefile.PL ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/Makefile.PL (original) +++ trunk/orca/packages/Time-HiRes-1.50/Makefile.PL Sat Aug 2 09:55:53 2003 @@ -11,9 +11,11 @@ my $VERBOSE = $ENV{VERBOSE}; my $DEFINE; -my $LIBS; +my $LIBS = []; my $XSOPT; +use vars qw($self); # Used in 'sourcing' the hints. + my $ld_exeext = ($^O eq 'os2' and $Config{ldflags} =~ /-Zexe\b/) ? '.exe' : ''; unless($ENV{PERL_CORE}) { @@ -64,9 +66,9 @@ # if you have 5.004_03 (and some slightly older versions?), xsubpp # tries to generate line numbers in the C code generated from the .xs. # unfortunately, it is a little buggy around #ifdef'd code. -# my choice is leave it in and have people with old perls complain +# my choice is leave it in and have people with old perls complain # about the "Usage" bug, or leave it out and be unable to compile myself -# without changing it, and then I'd always forget to change it before a +# without changing it, and then I'd always forget to change it before a # release. Sorry, Edward :) sub TMPDIR { @@ -127,7 +129,7 @@ $cccmd = "$Config{'cc'} -o $tmp $ccflags $tmp.c @$LIBS $errornull" unless defined $cccmd; - if ($^O eq 'VMS') { + if ($^O eq 'VMS') { open( CMDFILE, ">$tmp.com" ); print CMDFILE "\$ SET MESSAGE/NOFACILITY/NOSEVERITY/NOIDENT/NOTEXT\n"; print CMDFILE "\$ $cccmd\n"; @@ -135,7 +137,7 @@ close CMDFILE; system("\@ $tmp.com"); $ok = $?==0; - for ("$tmp.c", "$tmp$obj_ext", "$tmp.com", "$tmp$Config{exe_ext}") { + for ("$tmp.c", "$tmp$obj_ext", "$tmp.com", "$tmp$Config{exe_ext}") { 1 while unlink $_; } } @@ -148,18 +150,18 @@ unlink("$tmp.c", $tmp_exe); } } - + $ok; } sub has_gettimeofday { # confusing but true (if condition true ==> -DHAS_GETTIMEOFDAY already) - return 0 if $Config{'d_gettimeod'} eq 'define'; + return 0 if $Config{d_gettimeod} eq 'define'; return 1 if try_compile_and_link(< #endif @@ -212,51 +214,24 @@ return 0; } -sub unixinit { - $DEFINE = ''; - - $LIBS = []; - - # this might break the link, try it if it can't find some things you - # honestly think should be in there... - # $LIBS = ['-lucb -lbsd']; - - # ... but ucb is poison for Solaris, and probably Linux. honest. - $LIBS = [] if $Config{'osname'} eq 'solaris'; - $LIBS = [] if $Config{'osname'} eq 'linux'; - $LIBS = ['-lm'] if $Config{'osname'} =~ /sco/i; - $LIBS = ['-lc'] if $Config{'osname'} =~ /dynixptx/i; - - # For nanosleep - push @$LIBS, '-lrt' unless $Config{'osname'} =~ /^(?:irix|linux)$/; - push @$LIBS, '-lposix4'; - - my @goodlibs; - - select(STDOUT); - $| = 1; - - print "Checking for libraries...\n"; - my $lib; - for $lib (@$LIBS) { - print "Checking for $lib... "; - $LIBS = [ $lib ]; - if ($Config{libs} =~ /\b$lib\b/ || has_x("time(0)")) { - push @goodlibs, $lib; - print "found.\n"; - } else { - print "NOT found.\n"; +sub init { + my $hints = File::Spec->catfile("hints", "$^O.pl"); + if (-f $hints) { + print "Using hints $hints...\n"; + local $self; + do $hints; + if (exists $self->{LIBS}) { + $LIBS = $self->{LIBS}; + print "Extra libraries: @$LIBS...\n"; } } - $LIBS = [ @goodlibs ]; - print @$LIBS ? - "You have extra libraries: @$LIBS.\n" : - "You have no applicable extra libraries.\n"; + + $DEFINE = ''; print "Looking for gettimeofday()... "; my $has_gettimeofday; - if ($Config{'d_gettimeod'}) { - $has_gettimeofday++; + if (exists $Config{d_gettimeod}) { + $has_gettimeofday++ if $Config{d_gettimeod}; } elsif (has_gettimeofday()) { $DEFINE .= ' -DHAS_GETTIMEOFDAY'; $has_gettimeofday++; @@ -280,8 +255,8 @@ print "Looking for setitimer()... "; my $has_setitimer; - if ($Config{d_setitimer}) { - $has_setitimer++; + if (exists $Config{d_setitimer}) { + $has_setitimer++ if $Config{d_setitimer}; } elsif (has_x("setitimer(ITIMER_REAL, 0, 0)")) { $has_setitimer++; $DEFINE .= ' -DHAS_SETITIMER'; @@ -295,8 +270,8 @@ print "Looking for getitimer()... "; my $has_getitimer; - if ($Config{d_getitimer}) { - $has_getitimer++; + if (exists $Config{'d_getitimer'}) { + $has_getitimer++ if $Config{'d_getitimer'}; } elsif (has_x("getitimer(ITIMER_REAL, 0)")) { $has_getitimer++; $DEFINE .= ' -DHAS_GETITIMER'; @@ -316,8 +291,8 @@ print "Looking for ualarm()... "; my $has_ualarm; - if ($Config{d_ualarm}) { - $has_ualarm++; + if (exists $Config{d_ualarm}) { + $has_ualarm++ if $Config{d_ualarm}; } elsif (has_x ("ualarm (0, 0)")) { $has_ualarm++; $DEFINE .= ' -DHAS_UALARM'; @@ -335,8 +310,8 @@ print "Looking for usleep()... "; my $has_usleep; - if ($Config{d_usleep}) { - $has_usleep++; + if (exists $Config{d_usleep}) { + $has_usleep++ if $Config{d_usleep}; } elsif (has_x ("usleep (0)")) { $has_usleep++; $DEFINE .= ' -DHAS_USLEEP'; @@ -358,11 +333,14 @@ print "Looking for nanosleep()... "; my $has_nanosleep; - if ($Config{d_nanosleep}) { - $has_nanosleep++; + if (exists $Config{d_nanosleep}) { + if ($Config{d_nanosleep}) { + $has_nanosleep++; + $DEFINE .= ' -DTIME_HIRES_NANOSLEEP'; + } } elsif (has_x ("nanosleep (NULL, NULL)")) { $has_nanosleep++; - $DEFINE .= ' -DHAS_NANOSLEEP'; + $DEFINE .= ' -DTIME_HIRES_NANOSLEEP'; } if ($has_nanosleep) { @@ -397,15 +375,15 @@ push (@makefileopts, 'NAME' => 'Time::HiRes', 'VERSION_FROM' => 'HiRes.pm', # finds $VERSION - 'LIBS' => $LIBS, # e.g., '-lm' - 'DEFINE' => $DEFINE, # e.g., '-DHAS_SOMETHING' + 'LIBS' => $LIBS, # e.g., '-lm' + 'DEFINE' => $DEFINE, # e.g., '-DHAS_SOMETHING' 'XSOPT' => $XSOPT, # do not even think about 'INC' => '-I/usr/ucbinclude', Solaris will avenge. - 'INC' => '', # e.g., '-I/usr/include/other' + 'INC' => '', # e.g., '-I/usr/include/other' 'INSTALLDIRS' => 'perl', 'dist' => { 'CI' => 'ci -l', - 'COMPRESS' => 'gzip -9f', + 'COMPRESS' => 'gzip -9f', 'SUFFIX' => 'gz', }, clean => { FILES => "xdefine" }, @@ -426,7 +404,11 @@ foreach (qw (d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer d_nanosleep)) { my $macro = $_; - $macro =~ s/d_(.*)/HAS_\U$1/; + if ($macro eq 'd_nanosleep') { + $macro =~ s/d_(.*)/TIME_HIRES_\U$1/; + } else { + $macro =~ s/d_(.*)/HAS_\U$1/; + } push @names, {name => $_, macro => $macro, value => 1, default => ["IV", "0"]}; } @@ -452,9 +434,9 @@ if ($^O =~ /Win32/i) { $DEFINE = '-DSELECT_IS_BROKEN'; - $LIBS = ['']; + $LIBS = []; } else { - unixinit(); + init(); } doMakefile; doConstants; @@ -462,7 +444,18 @@ unless ($ENV{PERL_CORE}) { print <{LIBS} = ['-lrt']; + Modified: trunk/orca/packages/Time-HiRes-1.50/hints/sco.pl ============================================================================== --- trunk/orca/packages/Time-HiRes-1.49/hints/sco.pl (original) +++ trunk/orca/packages/Time-HiRes-1.50/hints/sco.pl Sat Aug 2 09:55:53 2003 @@ -1,3 +1,4 @@ # osr5 needs to explicitly link against libc to pull in usleep -$self->{LIBS} = ['-lc']; +# what's the reason for -lm? +$self->{LIBS} = ['-lm', '-lc']; From blair at orcaware.com Tue Aug 5 09:17:31 2003 From: blair at orcaware.com (Blair Zajac) Date: Tue, 5 Aug 2003 09:17:31 -0700 Subject: [Orca-checkins] rev 247 - in trunk/orca: . packages/Digest-MD5-2.26 packages/Digest-MD5-2.27 packages/Digest-MD5-2.27/t Message-ID: <200308051617.h75GHV20016478@orcaware.com> Author: blair Date: Tue Aug 5 09:17:04 2003 New Revision: 247 Added: trunk/orca/packages/Digest-MD5-2.27/ - copied from rev 246, trunk/orca/packages/Digest-MD5-2.26/ Removed: trunk/orca/packages/Digest-MD5-2.26/ Modified: trunk/orca/INSTALL trunk/orca/configure.in trunk/orca/packages/Digest-MD5-2.27/Changes trunk/orca/packages/Digest-MD5-2.27/MD5.pm trunk/orca/packages/Digest-MD5-2.27/Makefile.PL trunk/orca/packages/Digest-MD5-2.27/t/files.t Log: Upgrade Digest::MD5 from 2.26 to 2.27 and require the new version for Orca. * INSTALL: Update all references to Digest::MD5's version number from 2.26 to 2.27. * configure.in: Bump Digest::MD5's version number to 2.27. * packages/Digest-MD5-2.27: Renamed from packages/Digest-MD5-2.26. Directory contents updated from Digest-MD5-2.27.tar.gz. Modified: trunk/orca/INSTALL ============================================================================== --- trunk/orca/INSTALL (original) +++ trunk/orca/INSTALL Tue Aug 5 09:17:04 2003 @@ -173,7 +173,7 @@ Data::Dumper >= 2.101 >= 2.101 2.101 Date::Parse Not required by Orca 2.24 Devel::DProf Not required by Orca 19990108 - Digest::MD5 >= 2.26 >= 2.26 2.26 + Digest::MD5 >= 2.27 >= 2.27 2.27 Math::IntervalSearch >= 1.05 >= 1.05 1.05 RRDs >= 1.000431 >= 1.0.43 1.0.43 Storable >= 2.07 >= 2.07 2.07 @@ -227,10 +227,10 @@ Digest::MD5 - http://www.perl.com/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.26.tar.gz + http://www.perl.com/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.27.tar.gz - % gunzip -c Digest-MD5-2.26.tar.gz | tar xvf - - % cd Digest-MD5-2.26 + % gunzip -c Digest-MD5-2.27.tar.gz | tar xvf - + % cd Digest-MD5-2.27 % perl Makefile.PL % make % make test Modified: trunk/orca/configure.in ============================================================================== --- trunk/orca/configure.in (original) +++ trunk/orca/configure.in Tue Aug 5 09:17:04 2003 @@ -33,8 +33,8 @@ DATE_PARSE_VER=2.24 DEVEL_DPROF_DIR=DProf-19990108 DEVEL_DPROF_VER=19990108 -DIGEST_MD5_DIR=Digest-MD5-2.26 -DIGEST_MD5_VER=2.26 +DIGEST_MD5_DIR=Digest-MD5-2.27 +DIGEST_MD5_VER=2.27 MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05 MATH_INTERVALSEARCH_VER=1.05 RRDTOOL_DIR=rrdtool-1.0.43 Modified: trunk/orca/packages/Digest-MD5-2.27/Changes ============================================================================== --- trunk/orca/packages/Digest-MD5-2.26/Changes (original) +++ trunk/orca/packages/Digest-MD5-2.27/Changes Tue Aug 5 09:17:04 2003 @@ -1,3 +1,13 @@ +2003-08-04 Gisle Aas + + Release 2.27 + + Avoid having to figure how to compile alignment test program + on MS-Windows by just assume free alignment as for i386. Source + builds on Windows was apparently broken. + + + 2003-07-21 Gisle Aas Release 2.26 Modified: trunk/orca/packages/Digest-MD5-2.27/MD5.pm ============================================================================== --- trunk/orca/packages/Digest-MD5-2.26/MD5.pm (original) +++ trunk/orca/packages/Digest-MD5-2.27/MD5.pm Tue Aug 5 09:17:04 2003 @@ -3,7 +3,7 @@ use strict; use vars qw($VERSION @ISA @EXPORT_OK); -$VERSION = '2.26'; # $Date: 2003/07/22 06:09:50 $ +$VERSION = '2.27'; # $Date: 2003/08/05 06:08:10 $ require Exporter; *import = \&Exporter::import; Modified: trunk/orca/packages/Digest-MD5-2.27/Makefile.PL ============================================================================== --- trunk/orca/packages/Digest-MD5-2.26/Makefile.PL (original) +++ trunk/orca/packages/Digest-MD5-2.27/Makefile.PL Tue Aug 5 09:17:04 2003 @@ -31,6 +31,7 @@ $|=1; print "Testing alignment requirements for U32... "; return 1 if $^O eq 'VMS'; + return 1 if $^O eq 'MSWin32'; open(ALIGN_TEST, ">u32align.c") or die "$!"; print ALIGN_TEST <<'EOT'; close(ALIGN_TEST); @@ -98,17 +99,13 @@ my $cc_cmd = "$Config{cc} $Config{ccflags} -I$Config{archlibexp}/CORE"; my $exe = "u32align$Config{_exe}"; - if ($^O eq 'MSWin32') { - $cc_cmd .= ' -DWIN32IO_IS_STDIO'; - } else { - $cc_cmd .= " -o $exe"; - } + $cc_cmd .= " -o $exe"; my $rc; $rc = system("$cc_cmd $Config{ldflags} u32align.c $Config{libs}"); if ($rc) { - print "Can't compile test program\n"; + print "Can't compile test program. Will ensure alignment to play safe.\n\n"; unlink("u32align.c", $exe, "u32align$Config{_o}"); - return; + return 0; } $rc = system("./$exe"); @@ -127,5 +124,5 @@ } print "signal $rc\n"; } - return; + return 0; } Modified: trunk/orca/packages/Digest-MD5-2.27/t/files.t ============================================================================== --- trunk/orca/packages/Digest-MD5-2.26/t/files.t (original) +++ trunk/orca/packages/Digest-MD5-2.27/t/files.t Tue Aug 5 09:17:04 2003 @@ -20,26 +20,26 @@ my $EXPECT; if (ord "A" == 193) { # EBCDIC $EXPECT = < Author: blair Date: Thu Aug 21 13:23:30 2003 New Revision: 248 Added: trunk/orca/packages/rrdtool-1.0.45/ - copied from rev 247, trunk/orca/packages/rrdtool-1.0.43/ Removed: trunk/orca/packages/rrdtool-1.0.43/ trunk/orca/packages/rrdtool-1.0.45/perl-piped/Makefile.PL Modified: trunk/orca/INSTALL trunk/orca/configure.in trunk/orca/packages/rrdtool-1.0.45/CHANGES trunk/orca/packages/rrdtool-1.0.45/Makefile.am trunk/orca/packages/rrdtool-1.0.45/Makefile.in trunk/orca/packages/rrdtool-1.0.45/configure trunk/orca/packages/rrdtool-1.0.45/configure.in trunk/orca/packages/rrdtool-1.0.45/contrib/add_ds/batch.pl trunk/orca/packages/rrdtool-1.0.45/contrib/rrdfetchnames/rrdfetchnames.pl trunk/orca/packages/rrdtool-1.0.45/contrib/rrdlastds/rrdlastds.pl trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.am trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.in trunk/orca/packages/rrdtool-1.0.45/doc/RRDp.txt trunk/orca/packages/rrdtool-1.0.45/doc/RRDs.txt trunk/orca/packages/rrdtool-1.0.45/doc/bin_dec_hex.txt trunk/orca/packages/rrdtool-1.0.45/doc/cdeftutorial.txt trunk/orca/packages/rrdtool-1.0.45/doc/rpntutorial.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.html trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.pod trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdcgi.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdcreate.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrddump.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdfetch.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdgraph.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdinfo.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdlast.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdresize.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdrestore.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdtool.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdtune.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.es.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdupdate.txt trunk/orca/packages/rrdtool-1.0.45/doc/rrdxport.txt trunk/orca/packages/rrdtool-1.0.45/perl-piped/RRDp.pm trunk/orca/packages/rrdtool-1.0.45/perl-shared/RRDs.pm trunk/orca/packages/rrdtool-1.0.45/rrdtool.spec trunk/orca/packages/rrdtool-1.0.45/src/Makefile.in trunk/orca/packages/rrdtool-1.0.45/src/gdpng.c trunk/orca/packages/rrdtool-1.0.45/src/gifsize.c trunk/orca/packages/rrdtool-1.0.45/src/ntconfig.h trunk/orca/packages/rrdtool-1.0.45/src/pngsize.c trunk/orca/packages/rrdtool-1.0.45/src/rrd.h trunk/orca/packages/rrdtool-1.0.45/src/rrd_cgi.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_create.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_diff.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_dump.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_error.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_fetch.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.h trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.h trunk/orca/packages/rrdtool-1.0.45/src/rrd_info.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_last.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_open.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_resize.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_restore.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.h trunk/orca/packages/rrdtool-1.0.45/src/rrd_tune.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_update.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.c trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.h Log: Update rrdtool from 1.0.43 to 1.0.45. * configure.in: Bump the required RRDs Perl VERSION number from 1.000431 to 1.000451 and update the directory to find rrdtool in from rrdtool-1.0.43 to rrdtool-1.0.45. * INSTALL (Determine which Perl modules need compiling and installing): Bump the required RRDs Perl VERSION number from 1.000431 to 1.000451 and update the RRDs package version from 1.0.43 to 1.0.45. * packages/rrdtool-1.0.45: Renamed from packages/rrdtool-1.0.43. Directory contents updated from rrdtool-1.0.45.tar.gz. Modified: trunk/orca/INSTALL ============================================================================== --- trunk/orca/INSTALL (original) +++ trunk/orca/INSTALL Thu Aug 21 13:23:30 2003 @@ -175,7 +175,7 @@ Devel::DProf Not required by Orca 19990108 Digest::MD5 >= 2.27 >= 2.27 2.27 Math::IntervalSearch >= 1.05 >= 1.05 1.05 - RRDs >= 1.000431 >= 1.0.43 1.0.43 + RRDs >= 1.000451 >= 1.0.45 1.0.45 Storable >= 2.07 >= 2.07 2.07 Time::HiRes Not required by Orca 1.50 Modified: trunk/orca/configure.in ============================================================================== --- trunk/orca/configure.in (original) +++ trunk/orca/configure.in Thu Aug 21 13:23:30 2003 @@ -37,8 +37,8 @@ DIGEST_MD5_VER=2.27 MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05 MATH_INTERVALSEARCH_VER=1.05 -RRDTOOL_DIR=rrdtool-1.0.43 -RRDTOOL_VER=1.000431 +RRDTOOL_DIR=rrdtool-1.0.45 +RRDTOOL_VER=1.000451 STORABLE_DIR=Storable-2.07 STORABLE_VER=2.07 TIME_HIRES_DIR=Time-HiRes-1.50 Modified: trunk/orca/packages/rrdtool-1.0.45/CHANGES ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/CHANGES (original) +++ trunk/orca/packages/rrdtool-1.0.45/CHANGES Thu Aug 21 13:23:30 2003 @@ -2,6 +2,23 @@ --------------------------- - bugfix, + enhancement, * contrib, = RELEASE --------------------------------------------- += 1.0.45 2003/07/21 -- Tobi + +- 2003/07/21 - Tobi (and Stephan Eisfeld ) + fix building with broken solaris nrof + fix Makefile perl bundle test again + +- 2003/07/15 - Pekoe + fix for yaxis lable 0 with altgrid ... + fix for [ tests in Makefile + += 1.0.44 2003/07/11 -- Tobi + +- 2003/07/11 - Tobi + while determining if rrd_diff was broken, I added debug code + and left it in there ... should not have any + effect on the final binary but it is just too embarrassing. + = 1.0.43 2003/07/03 -- Tobi - 2003/06/30 - Kasparek Tomas Modified: trunk/orca/packages/rrdtool-1.0.45/Makefile.am ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/Makefile.am (original) +++ trunk/orca/packages/rrdtool-1.0.45/Makefile.am Thu Aug 21 13:23:30 2003 @@ -23,8 +23,8 @@ $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs - [ -f perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs - [ -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs + test -f perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true + test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true # use relaxed rules when building dists @@ -84,7 +84,7 @@ to-scp: to-dist cp CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/ - (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE).tar.gz >$(PACKAGE).tar.gz.md5; pgps $(PACKAGE).tar.gz.md5) + (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5) # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ Modified: trunk/orca/packages/rrdtool-1.0.45/Makefile.in ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/Makefile.in (original) +++ trunk/orca/packages/rrdtool-1.0.45/Makefile.in Thu Aug 21 13:23:30 2003 @@ -398,8 +398,8 @@ $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs - [ -f perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs - [ -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs + test -f perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true + test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true perl_piped:: $(top_builddir)/perl-piped test -d perl-piped \ @@ -438,7 +438,7 @@ to-scp: to-dist cp CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/ - (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE).tar.gz >$(PACKAGE).tar.gz.md5; pgps $(PACKAGE).tar.gz.md5) + (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5) # $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/ Modified: trunk/orca/packages/rrdtool-1.0.45/configure ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/configure (original) +++ trunk/orca/packages/rrdtool-1.0.45/configure Thu Aug 21 13:23:30 2003 @@ -11,7 +11,7 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_default_prefix=/usr/local/rrdtool-1.0.43 +ac_default_prefix=/usr/local/rrdtool-1.0.45 ac_help="$ac_help --with-tcllib=DIR location of the tclConfig.sh" ac_help="$ac_help @@ -801,7 +801,7 @@ PACKAGE=rrdtool -VERSION=1.0.43 +VERSION=1.0.45 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } Modified: trunk/orca/packages/rrdtool-1.0.45/configure.in ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/configure.in (original) +++ trunk/orca/packages/rrdtool-1.0.45/configure.in Thu Aug 21 13:23:30 2003 @@ -24,11 +24,11 @@ AC_CANONICAL_SYSTEM dnl tell automake the this script is for rrdtool -AM_INIT_AUTOMAKE(rrdtool, 1.0.43) +AM_INIT_AUTOMAKE(rrdtool, 1.0.45) AC_SUBST(VERSION) dnl where we install our stuff ... -AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.43 ) +AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.45 ) dnl tell automake which file to use as config header AM_CONFIG_HEADER(config/config.h) Modified: trunk/orca/packages/rrdtool-1.0.45/contrib/add_ds/batch.pl ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/contrib/add_ds/batch.pl (original) +++ trunk/orca/packages/rrdtool-1.0.45/contrib/add_ds/batch.pl Thu Aug 21 13:23:30 2003 @@ -43,7 +43,7 @@ ########### USER CONFIGURABLE SECTION ####################### my $newdir = "xml"; -my $rrdtool = "/usr/local/rrdtool-1.0.43/bin/rrdtool"; +my $rrdtool = "/usr/local/rrdtool-1.0.44/bin/rrdtool"; my $add_ds = "./add_ds.pl"; # path to add_ds.pl script ########### END CONFIGURE SECTION ########################### Modified: trunk/orca/packages/rrdtool-1.0.45/contrib/rrdfetchnames/rrdfetchnames.pl ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/contrib/rrdfetchnames/rrdfetchnames.pl (original) +++ trunk/orca/packages/rrdtool-1.0.45/contrib/rrdfetchnames/rrdfetchnames.pl Thu Aug 21 13:23:30 2003 @@ -6,7 +6,7 @@ use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch ); #makes programm work AFTER install -use lib qw( /usr/local/rrdtool-1.0.43/lib/perl ../lib/perl ); +use lib qw( /usr/local/rrdtool-1.0.44/lib/perl ../lib/perl ); use vars qw(@ISA $loaded); Modified: trunk/orca/packages/rrdtool-1.0.45/contrib/rrdlastds/rrdlastds.pl ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/contrib/rrdlastds/rrdlastds.pl (original) +++ trunk/orca/packages/rrdtool-1.0.45/contrib/rrdlastds/rrdlastds.pl Thu Aug 21 13:23:30 2003 @@ -13,7 +13,7 @@ #makes things work when run without install use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch ); # this is for after install -use lib qw( /usr/local/rrdtool-1.0.43/lib/perl ../lib/perl ); +use lib qw( /usr/local/rrdtool-1.0.44/lib/perl ../lib/perl ); use RRDs; Modified: trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.am ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/Makefile.am (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.am Thu Aug 21 13:23:30 2003 @@ -38,7 +38,7 @@ pod2man --release=$(VERSION) --center=rrdtool $< > $@ .1.txt: - @NROFF@ -man -Tlp $< > $@ + @NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@ .1.ps: @TROFF@ -man $< > $@ Modified: trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.in ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/Makefile.in (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/Makefile.in Thu Aug 21 13:23:30 2003 @@ -293,7 +293,7 @@ pod2man --release=$(VERSION) --center=rrdtool $< > $@ .1.txt: - @NROFF@ -man -Tlp $< > $@ + @NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@ .1.ps: @TROFF@ -man $< > $@ Modified: trunk/orca/packages/rrdtool-1.0.45/doc/RRDp.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/RRDp.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/RRDp.txt Thu Aug 21 13:23:30 2003 @@ -89,4 +89,4 @@ -1.0.43 2003-07-03 RRDp(3) +1.0.45 2003-07-21 RRDp(3) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/RRDs.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/RRDs.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/RRDs.txt Thu Aug 21 13:23:30 2003 @@ -115,4 +115,4 @@ -1.0.43 2003-07-03 RRDs(3) +1.0.45 2003-07-21 RRDs(3) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/bin_dec_hex.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/bin_dec_hex.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/bin_dec_hex.txt Thu Aug 21 13:23:30 2003 @@ -411,4 +411,4 @@ -1.0.43 2002-02-26 BIN_DEC_HEX(1) +1.0.45 2002-02-26 BIN_DEC_HEX(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/cdeftutorial.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/cdeftutorial.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/cdeftutorial.txt Thu Aug 21 13:23:30 2003 @@ -881,4 +881,4 @@ -1.0.43 2002-06-20 CDEFTUTORIAL(1) +1.0.45 2002-06-20 CDEFTUTORIAL(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rpntutorial.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rpntutorial.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rpntutorial.txt Thu Aug 21 13:23:30 2003 @@ -202,4 +202,4 @@ -1.0.43 2002-02-26 RPNTUTORIAL(1) +1.0.45 2002-02-26 RPNTUTORIAL(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.html ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrd-beginners.html (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.html Thu Aug 21 13:23:30 2003 @@ -108,8 +108,8 @@ values. Being time sensitive, a couple of time related parameters are also defined. Because of its structure, the definition of an RRDTool database also includes a provision to specify specific actions to take in the absence of -update values. Data structure (DS), heartbeat, data structure type, round -robin archive (RRA), and consolidation function (CF) are some of the +update values. Data Source (DS), heartbeat, Date Source Type (DST), Round +Robin Archive (RRA), and Consolidation Function (CF) are some of the terminologies related to RRDTool databases.

The structure of a database and the terminology associated with it can be best explained with an example.

@@ -128,7 +128,7 @@

The step of 300 seconds indicates that database expects new values every 300 seconds. The wrapper script should be scheduled to run every step seconds so that it updates the database every step seconds.

-

DS (data structure) is the actual variable which relates to the parameter on +

DS (Data Source) is the actual variable which relates to the parameter on the device that has to be monitored. Its syntax is

  DS:variable_name:DST:heartbeat:min:max
@@ -139,7 +139,7 @@ mentioned above, a new PDP is generated every 300 seconds.

Note, that if you do NOT supply new datapoints exaclty every 300 seconds, this is not problem, RRDTool will interpolate the data accordingly.

-

DST (data structure type) defines type of DS. It can be COUNTER, DERIVE, +

DST (Data Source Type) defines type of DS. It can be COUNTER, DERIVE, ABSOLUTE, GAUGE. A DS declared as COUNTER will save the rate of change of the value over a step period. This assumes that the value is always increasing (difference between last two values is more than 0). Traffic @@ -203,7 +203,7 @@ ``graph'' command uses ``fetch'' command internally to retrieve values from the database. With the retrieved values, it draws graphs as defined by the parameters supplied on the command line. A single graph can show different -DS (variables) from within a database. It is also possible to show the +DS (Data Sources0) from a database. It is also possible to show the values from more than one databases into a single graph. Often, it is necessary to perform some math on the values retrieved from database, before plotting them. For example, in SNMP replies, memory consumption values are Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.pod ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrd-beginners.pod (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.pod Thu Aug 21 13:23:30 2003 @@ -76,8 +76,8 @@ values. Being time sensitive, a couple of time related parameters are also defined. Because of its structure, the definition of an RRDTool database also includes a provision to specify specific actions to take in the absence of -update values. Data structure (DS), heartbeat, data structure type, round -robin archive (RRA), and consolidation function (CF) are some of the +update values. Data Source (DS), heartbeat, Date Source Type (DST), Round +Robin Archive (RRA), and Consolidation Function (CF) are some of the terminologies related to RRDTool databases. The structure of a database and the terminology associated with it can be @@ -100,7 +100,7 @@ 300 seconds. The wrapper script should be scheduled to run every B seconds so that it updates the database every B seconds. -DS (data structure) is the actual variable which relates to the parameter on +DS (Data Source) is the actual variable which relates to the parameter on the device that has to be monitored. Its syntax is DS:variable_name:DST:heartbeat:min:max @@ -114,7 +114,7 @@ Note, that if you do NOT supply new datapoints exaclty every 300 seconds, this is not problem, RRDTool will interpolate the data accordingly. -B (data structure type) defines type of DS. It can be COUNTER, DERIVE, +B (Data Source Type) defines type of DS. It can be COUNTER, DERIVE, ABSOLUTE, GAUGE. A DS declared as COUNTER will save the rate of change of the value over a step period. This assumes that the value is always increasing (difference between last two values is more than 0). Traffic @@ -183,7 +183,7 @@ "graph" command uses "fetch" command internally to retrieve values from the database. With the retrieved values, it draws graphs as defined by the parameters supplied on the command line. A single graph can show different -DS (variables) from within a database. It is also possible to show the +DS (Data Sources0) from a database. It is also possible to show the values from more than one databases into a single graph. Often, it is necessary to perform some math on the values retrieved from database, before plotting them. For example, in SNMP replies, memory consumption values are Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrd-beginners.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrd-beginners.txt Thu Aug 21 13:23:30 2003 @@ -79,8 +79,8 @@ Because of its structure, the definition of an RRDTool database also includes a provision to specify specific actions to take in the absence of update values. Data - structure (DS), heartbeat, data structure type, round - robin archive (RRA), and consolidation function (CF) are + Source (DS), heartbeat, Date Source Type (DST), Round + Robin Archive (RRA), and Consolidation Function (CF) are some of the terminologies related to RRDTool databases. The structure of a database and the terminology associated @@ -105,9 +105,9 @@ scheduled to run every sstteepp seconds so that it updates the database every sstteepp seconds. - DS (data structure) is the actual variable which relates - to the parameter on the device that has to be monitored. - Its syntax is + DS (Data Source) is the actual variable which relates to + the parameter on the device that has to be monitored. Its + syntax is DS:variable_name:DST:heartbeat:min:max @@ -123,7 +123,7 @@ every 300 seconds, this is not problem, RRDTool will interpolate the data accordingly. - DDSSTT (data structure type) defines type of DS. It can be + DDSSTT (Data Source Type) defines type of DS. It can be COUNTER, DERIVE, ABSOLUTE, GAUGE. A DS declared as COUNTER will save the rate of change of the value over a step period. This assumes that the value is always increasing @@ -207,8 +207,8 @@ internally to retrieve values from the database. With the retrieved values, it draws graphs as defined by the param- eters supplied on the command line. A single graph can - show different DS (variables) from within a database. It - is also possible to show the values from more than one + show different DS (Data Sources0) from a database. It is + also possible to show the values from more than one databases into a single graph. Often, it is necessary to perform some math on the values retrieved from database, before plotting them. For example, in SNMP replies, memory @@ -392,4 +392,4 @@ -1.0.43 2003-06-25 RRD-BEGINNERS(1) +1.0.45 2003-07-21 RRD-BEGINNERS(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdcgi.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdcgi.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdcgi.txt Thu Aug 21 13:23:30 2003 @@ -203,4 +203,4 @@ -1.0.43 2003-05-20 RRDCGI(1) +1.0.45 2003-05-20 RRDCGI(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdcreate.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdcreate.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdcreate.txt Thu Aug 21 13:23:30 2003 @@ -248,4 +248,4 @@ -1.0.43 2002-12-20 RRDCREATE(1) +1.0.45 2002-12-20 RRDCREATE(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrddump.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrddump.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrddump.txt Thu Aug 21 13:23:30 2003 @@ -24,4 +24,4 @@ -1.0.43 2002-02-26 RRDDUMP(1) +1.0.45 2002-02-26 RRDDUMP(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdfetch.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdfetch.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdfetch.txt Thu Aug 21 13:23:30 2003 @@ -249,4 +249,4 @@ -1.0.43 2003-04-16 RRDFETCH(1) +1.0.45 2003-04-16 RRDFETCH(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdgraph.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdgraph.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdgraph.txt Thu Aug 21 13:23:30 2003 @@ -639,4 +639,4 @@ -1.0.43 2003-02-19 RRDGRAPH(1) +1.0.45 2003-02-19 RRDGRAPH(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdinfo.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdinfo.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdinfo.txt Thu Aug 21 13:23:30 2003 @@ -56,4 +56,4 @@ -1.0.43 2002-02-26 RRDINFO(1) +1.0.45 2002-02-26 RRDINFO(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdlast.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdlast.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdlast.txt Thu Aug 21 13:23:30 2003 @@ -21,4 +21,4 @@ -1.0.43 2002-02-26 RRDLAST(1) +1.0.45 2002-02-26 RRDLAST(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdresize.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdresize.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdresize.txt Thu Aug 21 13:23:30 2003 @@ -44,4 +44,4 @@ -1.0.43 2002-07-05 RRDRESIZE(1) +1.0.45 2002-07-05 RRDRESIZE(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdrestore.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdrestore.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdrestore.txt Thu Aug 21 13:23:30 2003 @@ -29,4 +29,4 @@ -1.0.43 2002-02-26 RRDRESTORE(1) +1.0.45 2002-02-26 RRDRESTORE(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdtool.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdtool.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdtool.txt Thu Aug 21 13:23:30 2003 @@ -202,4 +202,4 @@ -1.0.43 2002-11-29 RRDTOOL(1) +1.0.45 2002-11-29 RRDTOOL(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdtune.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdtune.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdtune.txt Thu Aug 21 13:23:30 2003 @@ -64,4 +64,4 @@ -1.0.43 2002-02-26 RRDTUNE(1) +1.0.45 2002-02-26 RRDTUNE(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.es.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdtutorial.es.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.es.txt Thu Aug 21 13:23:30 2003 @@ -1262,4 +1262,4 @@ -1.0.43 2003-01-20 RRDTUTORIAL.ES(1) +1.0.45 2003-01-20 RRDTUTORIAL.ES(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdtutorial.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdtutorial.txt Thu Aug 21 13:23:30 2003 @@ -1241,4 +1241,4 @@ -1.0.43 2003-02-27 RRDTUTORIAL(1) +1.0.45 2003-02-27 RRDTUTORIAL(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdupdate.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdupdate.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdupdate.txt Thu Aug 21 13:23:30 2003 @@ -72,4 +72,4 @@ -1.0.43 2002-02-26 RRDUPDATE(1) +1.0.45 2002-02-26 RRDUPDATE(1) Modified: trunk/orca/packages/rrdtool-1.0.45/doc/rrdxport.txt ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/doc/rrdxport.txt (original) +++ trunk/orca/packages/rrdtool-1.0.45/doc/rrdxport.txt Thu Aug 21 13:23:30 2003 @@ -125,4 +125,4 @@ -1.0.43 2002-05-29 RRDXPORT(1) +1.0.45 2002-05-29 RRDXPORT(1) Modified: trunk/orca/packages/rrdtool-1.0.45/perl-piped/RRDp.pm ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/perl-piped/RRDp.pm (original) +++ trunk/orca/packages/rrdtool-1.0.45/perl-piped/RRDp.pm Thu Aug 21 13:23:30 2003 @@ -110,7 +110,7 @@ sub end (); sub read (); -$VERSION = 1.000431 ; +$VERSION = 1.000451 ; sub start ($){ croak "rrdtool is already running" Modified: trunk/orca/packages/rrdtool-1.0.45/perl-shared/RRDs.pm ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/perl-shared/RRDs.pm (original) +++ trunk/orca/packages/rrdtool-1.0.45/perl-shared/RRDs.pm Thu Aug 21 13:23:30 2003 @@ -7,7 +7,7 @@ require DynaLoader; -$VERSION = 1.000431; +$VERSION = 1.000451; bootstrap RRDs $VERSION; Modified: trunk/orca/packages/rrdtool-1.0.45/rrdtool.spec ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/rrdtool.spec (original) +++ trunk/orca/packages/rrdtool-1.0.45/rrdtool.spec Thu Aug 21 13:23:30 2003 @@ -5,7 +5,7 @@ Summary: RRDtool - round robin database Name: rrdtool -Version: 1.0.43 +Version: 1.0.45 Release: 1.%{DISTRO_REL} Copyright: GPL Group: Applications/Databases Modified: trunk/orca/packages/rrdtool-1.0.45/src/Makefile.in ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/Makefile.in (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/Makefile.in Thu Aug 21 13:23:30 2003 @@ -399,7 +399,8 @@ rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \ rrd.h getopt.h rrd_format.h ../gd1.3/gd.h -rrd_diff.lo rrd_diff.o : rrd_diff.c +rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h rrd.h \ + getopt.h rrd_format.h ../gd1.3/gd.h rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h rrd.h \ getopt.h rrd_format.h ../gd1.3/gd.h rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \ Modified: trunk/orca/packages/rrdtool-1.0.45/src/gdpng.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/gdpng.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/gdpng.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * gdpng.c add PNG output routine to gd library *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/gifsize.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/gifsize.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/gifsize.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 **************************************************************************** * gifsize.c provides the function gifsize which determines the size of a gif ****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/ntconfig.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/ntconfig.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/ntconfig.h Thu Aug 21 13:23:30 2003 @@ -9,3 +9,5 @@ #define HAVE_MATH_H 1 #define rrd_realloc(a,b) realloc((a), (b)) + +#define strcasecmp _stricmp Modified: trunk/orca/packages/rrdtool-1.0.45/src/pngsize.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/pngsize.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/pngsize.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * pngsize.c determine the size of a PNG image *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd.h Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997,1998, 1999 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997,1998, 1999 ***************************************************************************** * rrdlib.h Public header file for librrd ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_cgi.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_cgi.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_cgi.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_cgi.c RRD Web Page Generator *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_create.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_create.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_create.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_create.c creates new rrds *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_diff.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_diff.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_diff.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1999 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1999 * This code is stolen from rateup (mrtg-2.x) by Dave Rand ***************************************************************************** * diff calculate the difference between two very long integers available as @@ -24,13 +24,7 @@ * *****************************************************************************/ -/* #include "rrd_tool.h" */ -#define LAST_DS_LEN 100 -#define DNAN 0.0/0; -#define max(a,b) ((a) > (b) ? (a) : (b)) -#include -#include -#include +#include "rrd_tool.h" double rrd_diff(char *a, char *b) { Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_dump.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_dump.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_dump.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_dump Display a RRD ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_error.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_error.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_error.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_error.c Common Header File ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_fetch.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_fetch.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_fetch.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_format.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1999 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1999 ***************************************************************************** * rrd_format.c RRD Database Format helper functions ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_format.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_format.h Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997, 1998, 1999 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997, 1998, 1999 ***************************************************************************** * rrd_format.h RRD Database Format header *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_graph.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.c Thu Aug 21 13:23:30 2003 @@ -1,6 +1,6 @@ /**************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 **************************************************************************** * rrd__graph.c make creates ne rrds ****************************************************************************/ @@ -1895,7 +1895,7 @@ if(i % labfact == 0){ if (i==0 || im->symbol == ' ') { if(scaledstep < 1){ - if(im->extra_flags & ALTYGRID) { + if(i!=0 && im->extra_flags & ALTYGRID) { sprintf(graph_label,labfmt,scaledstep*i); } else { Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_graph.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_graph.h Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 **************************************************************************** * rrd__graph.h ****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_info.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_info.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_info.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_info Get Information about the configuration of an RRD *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_last.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_last.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_last.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_last.c ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_open.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_open.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_open.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_resize.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_resize.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_resize.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_resize.c Alters size of an RRA ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_restore.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_restore.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_restore.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_restore.c creates new rrd from data dumped by rrd_dump.c *****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_tool.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2001 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2001 ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ @@ -20,7 +20,7 @@ { char help_main[] = - "RRDtool 1.0.43 Copyright 1997-2001 by Tobias Oetiker \n\n" + "RRDtool 1.0.45 Copyright 1997-2001 by Tobias Oetiker \n\n" "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = @@ -319,7 +319,7 @@ strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0 ) - printf("RRDtool 1.0.43 Copyright (C) 1997-2001 by Tobias Oetiker \n"); + printf("RRDtool 1.0.45 Copyright (C) 1997-2001 by Tobias Oetiker \n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", argv[1]) == 0) Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_tool.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_tool.h Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_tool.h Common Header File ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_tune.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_tune.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_tune.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * change header parameters of an rrd ***************************************************************************** Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_update.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_update.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_update.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 ***************************************************************************** * rrd_update.c RRD Update Function ***************************************************************************** @@ -32,7 +32,7 @@ main(int argc, char **argv){ rrd_update(argc,argv); if (rrd_test_error()) { - printf("RRDtool 1.0.43 Copyright 1997-2000 by Tobias Oetiker \n\n" + printf("RRDtool 1.0.45 Copyright 1997-2000 by Tobias Oetiker \n\n" "Usage: rrdupdate filename\n" "\t\t\t[--template|-t ds-name:ds-name:...]\n" "\t\t\ttime|N:value[:value...]\n\n" Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.c ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_xport.c (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.c Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 **************************************************************************** * rrd_xport.c export RRD data ****************************************************************************/ Modified: trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.h ============================================================================== --- trunk/orca/packages/rrdtool-1.0.43/src/rrd_xport.h (original) +++ trunk/orca/packages/rrdtool-1.0.45/src/rrd_xport.h Thu Aug 21 13:23:30 2003 @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.43 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.0.45 Copyright Tobias Oetiker, 1997 - 2000 **************************************************************************** * rrd_xport.h contains XML related constants ****************************************************************************/