Package: cricket
Version: cricket_1.0.5-6_all
Severity: important
Tags: patch

03_File.pm.dpatch is incorrect. Version 0003 RRD files MUST be handled
by the 'else' block. (Their header is 4/8 bytes longer.)
However 'liveHead3' templates have to be added
to lib/RRD/Format.pm for each possible architectures.
The enclosed patch does this for x86 arch only and reverts
03_File.pm.dpatch.
File util/getFormat.c should be also modified in order to print
'liveHead3' settings.

Gabor


#! /bin/sh /usr/share/dpatch/dpatch-run
## 22_livehead3.dpatch by Gabor Kiss <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Revoking patch 03_File.pm
## DP: Adding liveHead3 to Format.pm (for i386)

@DPATCH@
diff -urNad cricket-1.0.5~/lib/RRD/File.pm cricket-1.0.5/lib/RRD/File.pm
--- cricket-1.0.5~/lib/RRD/File.pm      2007-09-17 17:58:06.626822551 +0200
+++ cricket-1.0.5/lib/RRD/File.pm       2007-09-17 17:58:22.689577403 +0200
@@ -196,7 +196,7 @@
     {
         my ($block);
         my ($last_up, $last_up_usec);
-        if ($v eq "0001" || $v eq "0002" || $v eq "0003") {
+        if ($v eq "0001" || $v eq "0002") {
            $block = $self->_readNextBlock(sizeof($fmt->format('liveHead')));
            croak("Could not read live header") unless (defined($block));
            $last_up = unpack($fmt->format('liveHead'), $block);
diff -urNad cricket-1.0.5~/lib/RRD/Format.pm cricket-1.0.5/lib/RRD/Format.pm
--- cricket-1.0.5~/lib/RRD/Format.pm    2004-01-21 03:11:09.000000000 +0100
+++ cricket-1.0.5/lib/RRD/Format.pm     2007-09-17 17:58:44.623877035 +0200
@@ -123,6 +123,7 @@
         $self->{'cdpDef'} = "d L x4 x64";
 
         $self->{'liveHead'} = "L";
+        $self->{'liveHead3'} = "L L";
         $self->{'rraPtr'} = "L";
         $self->{'element'} = "d";
 
-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'proposed-updates')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.20.3
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to