From blair at orcaware.com Sat Nov 19 16:52:02 2005 From: blair at orcaware.com (blair at orcaware.com) Date: Sat, 19 Nov 2005 16:52:02 -0800 Subject: [Orca-checkins] r498 - orca/trunk/lib/Orca Message-ID: <200511200052.jAK0q2xX010759@orca3.orcaware.com> Author: blair at orcaware.com Date: Sat Nov 19 16:51:17 2005 New Revision: 498 Modified: orca/trunk/lib/Orca/SourceFile.pm Log: Fix a problem when a plot has only a single a data line in the configuration file which has a regular expression containing a ?. The ? will end up in the filename, which when sent back to the web server will get a 404, since the web server parses any characters following the ? as part of the CGI query and not the filename. * lib/Orca/SourceFile.pm (add_plots): Modified: orca/trunk/lib/Orca/SourceFile.pm ============================================================================== --- orca/trunk/lib/Orca/SourceFile.pm (original) +++ orca/trunk/lib/Orca/SourceFile.pm Sat Nov 19 16:51:17 2005 @@ -802,8 +802,20 @@ lc($plot->{data_type}[0]), 'volatile', @{$original_plot->{data}[0]}); + + # Because the regular expression in the configuration file is + # placed in these variables and these variables are used to + # generate the HTML and image filenames and hence the URLs, some + # characters will prevent the web server from properly serving + # the files. Notably, the ? character will cause the web server + # to parse any following characters as part of the CGI query + # string and as not part of the filename, hence a 404 will be + # returned. + $all_names_with_subgroup =~ s/\?/q/g; + @my_short_rrds = ($all_names_with_subgroup); - @names_without_subgroup = (join('_', + @names_without_subgroup = map { s/\?/q/g; $_ } + (join('_', $group_name, lc($plot->{data_type}[0]), 'volatile', From blair at orcaware.com Sat Nov 19 17:17:01 2005 From: blair at orcaware.com (blair at orcaware.com) Date: Sat, 19 Nov 2005 17:17:01 -0800 Subject: [Orca-checkins] r499 - orca/trunk/data_gatherers/procallator Message-ID: <200511200117.jAK1H140015044@orca3.orcaware.com> Author: blair at orcaware.com Date: Sat Nov 19 17:16:35 2005 New Revision: 499 Modified: orca/trunk/data_gatherers/procallator/procallator.cfg.in Log: Fix the 'find_files' path in procallator.cfg.in file so it doesn't always look in /usr/local but looks in @VAR_DIR@/procallator which is where procallator.pl saves its data files. * data_gatherers/procallator/procallator.cfg.in: Use @VAR_DIR@ for find_files. Modified: orca/trunk/data_gatherers/procallator/procallator.cfg.in ============================================================================== --- orca/trunk/data_gatherers/procallator/procallator.cfg.in (original) +++ orca/trunk/data_gatherers/procallator/procallator.cfg.in Sat Nov 19 17:16:35 2005 @@ -87,7 +87,7 @@ # generated RRD data files. group procallator { -find_files /usr/local/var/orca/procallator/(.*)/(?:(?:procallator)|(?:proccol))-\d{4}-\d{2}-\d{2}(?:-\d{3,})(?:\.(?:Z|gz|bz2))? +find_files @VAR_DIR@/procallator/(.*)/(?:(?:procallator)|(?:proccol))-\d{4}-\d{2}-\d{2}(?:-\d{3,})(?:\.(?:Z|gz|bz2))? column_description first_line date_source column_name timestamp interval 300 From blair at orcaware.com Sun Nov 27 21:49:21 2005 From: blair at orcaware.com (blair at orcaware.com) Date: Sun, 27 Nov 2005 21:49:21 -0800 Subject: [Orca-checkins] r513 - in orca/trunk: lib/Orca orca Message-ID: <200511280549.jAS5nLJF008640@orca3.orcaware.com> Author: blair at orcaware.com Date: Sun Nov 27 21:48:49 2005 New Revision: 513 Modified: orca/trunk/lib/Orca/Config.pm orca/trunk/lib/Orca/Constants.pm orca/trunk/lib/Orca/DataFile.pm orca/trunk/lib/Orca/HTMLFile.pm orca/trunk/lib/Orca/ImageFile.pm orca/trunk/lib/Orca/NewState.pm orca/trunk/lib/Orca/OldState.pm orca/trunk/lib/Orca/OpenFileHash.pm orca/trunk/lib/Orca/RRDFile.pm orca/trunk/lib/Orca/SourceFile.pm orca/trunk/lib/Orca/SourceFileIDs.pm orca/trunk/lib/Orca/Utils.pm orca/trunk/orca/orca.pl.in orca/trunk/orca/upgrade_installation.pl Log: Update the copyright years from 1999-2004 to 1999-2005. * lib/Orca/Config.pm, * lib/Orca/Constants.pm, * lib/Orca/DataFile.pm, * lib/Orca/HTMLFile.pm, * lib/Orca/ImageFile.pm, * lib/Orca/NewState.pm, * lib/Orca/OldState.pm, * lib/Orca/OpenFileHash.pm, * lib/Orca/RRDFile.pm, * lib/Orca/SourceFile.pm, * lib/Orca/SourceFileIDs.pm, * lib/Orca/Utils.pm, * orca/orca.pl.in, * orca/upgrade_installation.pl: s/1999-2004/1999-2005/. Modified: orca/trunk/lib/Orca/Config.pm ============================================================================== --- orca/trunk/lib/Orca/Config.pm (original) +++ orca/trunk/lib/Orca/Config.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/Constants.pm ============================================================================== --- orca/trunk/lib/Orca/Constants.pm (original) +++ orca/trunk/lib/Orca/Constants.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/DataFile.pm ============================================================================== --- orca/trunk/lib/Orca/DataFile.pm (original) +++ orca/trunk/lib/Orca/DataFile.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/HTMLFile.pm ============================================================================== --- orca/trunk/lib/Orca/HTMLFile.pm (original) +++ orca/trunk/lib/Orca/HTMLFile.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/ImageFile.pm ============================================================================== --- orca/trunk/lib/Orca/ImageFile.pm (original) +++ orca/trunk/lib/Orca/ImageFile.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/NewState.pm ============================================================================== --- orca/trunk/lib/Orca/NewState.pm (original) +++ orca/trunk/lib/Orca/NewState.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/OldState.pm ============================================================================== --- orca/trunk/lib/Orca/OldState.pm (original) +++ orca/trunk/lib/Orca/OldState.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/OpenFileHash.pm ============================================================================== --- orca/trunk/lib/Orca/OpenFileHash.pm (original) +++ orca/trunk/lib/Orca/OpenFileHash.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/RRDFile.pm ============================================================================== --- orca/trunk/lib/Orca/RRDFile.pm (original) +++ orca/trunk/lib/Orca/RRDFile.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/SourceFile.pm ============================================================================== --- orca/trunk/lib/Orca/SourceFile.pm (original) +++ orca/trunk/lib/Orca/SourceFile.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/SourceFileIDs.pm ============================================================================== --- orca/trunk/lib/Orca/SourceFileIDs.pm (original) +++ orca/trunk/lib/Orca/SourceFileIDs.pm Sun Nov 27 21:48:49 2005 @@ -8,7 +8,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/lib/Orca/Utils.pm ============================================================================== --- orca/trunk/lib/Orca/Utils.pm (original) +++ orca/trunk/lib/Orca/Utils.pm Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/orca/orca.pl.in ============================================================================== --- orca/trunk/orca/orca.pl.in (original) +++ orca/trunk/orca/orca.pl.in Sun Nov 27 21:48:49 2005 @@ -6,7 +6,7 @@ # $LastChangedBy$ # # Copyright (C) 1998-1999 Blair Zajac and Yahoo!, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # Modified: orca/trunk/orca/upgrade_installation.pl ============================================================================== --- orca/trunk/orca/upgrade_installation.pl (original) +++ orca/trunk/orca/upgrade_installation.pl Sun Nov 27 21:48:49 2005 @@ -10,7 +10,7 @@ # $LastChangedBy$ # # Copyright (C) 1999 Blair Zajac and GeoCities, Inc. -# Copyright (C) 1999-2004 Blair Zajac. +# Copyright (C) 1999-2005 Blair Zajac. # # This file is part of Orca. # From blair at orcaware.com Sun Nov 27 22:02:10 2005 From: blair at orcaware.com (blair at orcaware.com) Date: Sun, 27 Nov 2005 22:02:10 -0800 Subject: [Orca-checkins] r514 - orca/trunk/orca Message-ID: <200511280602.jAS62ALS009910@orca3.orcaware.com> Author: blair at orcaware.com Date: Sun Nov 27 22:01:33 2005 New Revision: 514 Modified: orca/trunk/orca/orca.pl.in Log: Using the Data::Dumper module on an Ubuntu Breezy Badger (5.10) system with Perl 5.8.7 generates the warning 'Argument "2.121_04" isn't numeric in subroutine entry', so temporarily turn off warnings when using this module. * orca/orca.pl.in: Run 'no warnings' before 'use Data::Dumper' and 'use warnings' afterwards. Modified: orca/trunk/orca/orca.pl.in ============================================================================== --- orca/trunk/orca/orca.pl.in (original) +++ orca/trunk/orca/orca.pl.in Sun Nov 27 22:01:33 2005 @@ -48,7 +48,18 @@ # required version number so that the minimum module version numbers # can be listed in once place instead of spread out in each Orca::* # module. + +# Using the Data::Dumper module on an Ubuntu Breezy Badger (5.10) +# system with Perl 5.8.7 generates the warning 'Argument "2.121_04" +# isn't numeric in subroutine entry', so temporarily turn off warnings +# when using this module. Removing the minimum required version of +# Data::Dumper also removes the warning, but Orca should demand a +# particular version of Data::Dumper for systems with older Perls with +# older Data::Dumper's. +no warnings; use Data::Dumper @DATA_DUMPER_VER@; +use warnings; + use Digest::MD5 @DIGEST_MD5_VER@; use Math::IntervalSearch @MATH_INTERVALSEARCH_VER@ qw(interval_search); use Storable @STORABLE_VER@; From blair at orcaware.com Sun Nov 27 23:25:31 2005 From: blair at orcaware.com (blair at orcaware.com) Date: Sun, 27 Nov 2005 23:25:31 -0800 Subject: [Orca-checkins] r515 - in orca/trunk: . packages/rrdtool-1.0.50/perl-shared Message-ID: <200511280725.jAS7PVwN006729@orca3.orcaware.com> Author: blair at orcaware.com Date: Sun Nov 27 23:25:02 2005 New Revision: 515 Modified: orca/trunk/configure.in orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.pm orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.xs Log: Fix a broken compile of the packaged RRDs.pm module on Ubuntu Breezy Badger with gcc 4.0.2 and bump the module's version number. Without this fix, the following error occurs: $ cc -c -I.. -I../src -I../gd1.3 -D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -DDEBIAN -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -O2 -DVERSION=\"1.000503\" -DXS_VERSION=\"1.000503\" -fPIC "-I/usr/lib/perl/5.8/CORE" -DPERLPATCHLEVEL=8 RRDs.c In file included from ../src/rrd_tool.h:25, from RRDs.xs:13: ../src/config_aux.h:8:1: warning: "strchr" redefined In file included from /usr/include/string.h:417, from /usr/lib/perl/5.8/CORE/perl.h:731, from RRDs.xs:6: /usr/include/bits/string2.h:396:1: warning: this is the location of the previous definition In file included from ../src/rrd_tool.h:25, from RRDs.xs:13: ../src/config_aux.h:80:2: error: #error "Can't compile without finite function" ../src/config_aux.h:84:2: error: #error "Can't compile without isinf function" * configure.in: Bump RRDs' required version number to 1.000503. * packages/rrdtool-1.0.50/perl-shared/RRDs.pm: Bump the RRDs module's version number to 1.000503. * packages/rrdtool-1.0.50/perl-shared/RRDs.xs: Fix the compilation problem by explicitly including rrdtool's config.h using a relative path. Modified: orca/trunk/configure.in ============================================================================== --- orca/trunk/configure.in (original) +++ orca/trunk/configure.in Sun Nov 27 23:25:02 2005 @@ -36,7 +36,7 @@ MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05 MATH_INTERVALSEARCH_VER=1.05 RRDTOOL_DIR=rrdtool-1.0.50 -RRDTOOL_VER=1.000502 +RRDTOOL_VER=1.000503 STORABLE_DIR=Storable-2.15 STORABLE_VER=2.15 TIME_HIRES_DIR=Time-HiRes-1.73 Modified: orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.pm ============================================================================== --- orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.pm (original) +++ orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.pm Sun Nov 27 23:25:02 2005 @@ -7,7 +7,7 @@ require DynaLoader; -$VERSION = 1.000502; +$VERSION = 1.000503; bootstrap RRDs $VERSION; Modified: orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.xs ============================================================================== --- orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.xs (original) +++ orca/trunk/packages/rrdtool-1.0.50/perl-shared/RRDs.xs Sun Nov 27 23:25:02 2005 @@ -10,8 +10,28 @@ } #endif +/* + * rrd_tool.h includes config.h, but at least on Ubuntu Breezy Badger + * 5.10 with gcc 4.0.2, the C preprocessor picks up Perl's config.h + * which is included from the Perl includes and never reads rrdtool's + * config.h. Without including rrdtool's config.h, this module does + * not compile, so include it here with an explicit path. + * + * Because rrdtool's config.h redefines VERSION which is originally + * set via Perl's Makefile.PL and passed down to the C compiler's + * command line, save the original value and reset it after the + * includes. + */ +#define VERSION_SAVED VERSION +#undef VERSION + +#include "../config.h" #include "../src/rrd_tool.h" +#undef VERSION +#define VERSION VERSION_SAVED +#undef VERSION_SAVED + /* perl 5.004 compatibility */ #if PERLPATCHLEVEL < 5 #define PL_sv_undef sv_undef