Bug#350584: argus-client: ragraph try to use gif images, not supported. patch to use png attached.

[xavier renaut]

Package: argus-client
Version: 2.0.6.fixes.1-2
Severity: normal
Tags: patch


rrd does not support gif (which is fine), here is a patch
to use png for generating graph.

(otherwise error is :
ERROR: unsupported graphics format 'GIF'
when calling ragraph bytes -M 10s -r argus.log -title "Total Load" )



-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (600, 'unstable'), (549, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686-smp
Locale: LANG=C, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages argus-client depends on:
ii  libc6                         2.3.5-8    GNU C Library: Shared libraries an
ii  libncurses5                   5.5-1      Shared libraries for terminal hand

Versions of packages argus-client recommends:
ii  argus-server          1:2.0.6.fixes.1-10 IP network transaction auditing to

-- no debconf information

--- /usr/bin/ragraph    2005-01-04 18:57:15.000000000 -0500
+++ ./ragraph   2006-01-29 16:06:49.000000000 -0500
@@ -29,7 +29,7 @@
 
 my $tmpfile = tmpnam();
 my $RRD     = $tmpfile.".rrd";
-my $GIF     = "ragraph.gif";
+my $PNG     = "ragraph.png";
 my @arglist = ();
 
 my $title = "";
@@ -97,7 +97,7 @@
       s/^-upper//  && do { $upper = shift (@ARGV); next ARG; };
       s/^-lower//  && do { $lower = shift (@ARGV); next ARG; };
       s/^-title//  && do { $title = shift (@ARGV); next ARG; };
-      s/^-w//      && do { $GIF = shift (@ARGV); next ARG; };
+      s/^-w//      && do { $PNG = shift (@ARGV); next ARG; };
       s/^-N//      && do { $num = shift (@ARGV); next ARG; };
       /^-H/        && do { $histo++; };
       s/\(/\\\(/     && do { ; };
@@ -106,11 +106,22 @@
    [EMAIL PROTECTED] + 0] = $arg;
 }
 
+print "DEBUG: RagraphProcessArgusData\n";
 RagraphProcessArgusData ();
+
+print "DEBUG: RagraphReadInitialValue\n";
 RagraphReadInitialValues ($tmpfile);
+
+print "DEBUG: RagraphGenerateRRDParameters\n";
 RagraphGenerateRRDParameters ($tmpfile);
+
+print "DEBUG: RagraphGenerateRRD\n";
 RagraphGenerateRRD ();
-RagraphGenerateGIF ();
+
+print "DEBUG: RagraphGeneratePNG\n";
+RagraphGeneratePNG ();
+
+print "DEBUG: RagraphCleanUp\n";
 RagraphCleanUp ();
 
 exit;
@@ -152,6 +163,7 @@
       @args = ("rahistogram -p6 -G -s lasttime ", @arglist, "> $tmpfile");
    }
    
+   print "EXEC: @args\n";
    my $input = [EMAIL PROTECTED];
 }
 
@@ -715,15 +727,15 @@
 }
 
 
-sub RagraphGenerateGIF {
-   my @rrd_gifs = ($RRD, $GIF);
+sub RagraphGeneratePNG {
+   my @rrd_pngs = ($RRD, $PNG);
    
    my @rrd_args = (
          "--base", "1000",
          "--vertical-label", $xaxisstr,
          "--start", $START,
          "--end", $END,
-         "--interlace", "--imgformat","GIF",
+         "--interlace", "--imgformat","PNG",
    );
    
    if ($title) {
@@ -758,11 +770,11 @@
    
    push @rrd_args, @line_args;
 
-   while (@rrd_gifs) {
-     my $RRD = shift(@rrd_gifs);
-     my $GIF = shift(@rrd_gifs);
+   while (@rrd_pngs) {
+     my $RRD = shift(@rrd_pngs);
+     my $PNG = shift(@rrd_pngs);
    
-     my ($graphret,$xs,$ys) = RRDs::graph $GIF, @rrd_args;
+     my ($graphret,$xs,$ys) = RRDs::graph $PNG, @rrd_args;
    
       if ($ERROR = RRDs::error) {
          print "ERROR: $ERROR\n";