[pkgsrc/pkgsrc-2008Q2]: pkgsrc/databases/rrdtool Pullup ticket #2524 - reques...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee3cf4e84e14
branches:  pkgsrc-2008Q2
changeset: 544318:ee3cf4e84e14
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Sep 10 11:17:56 2008 +0000

description:
Pullup ticket #2524 - requested by martti
rrdtool: update package to avoid data corruption

Revisions pulled up:
databases/rrdtool/Makefile                      1.68-1.69
databases/rrdtool/buildlink3.mk                 1.20
databases/rrdtool/distinfo                      1.30-1.31
databases/rrdtool/patches/patch-al              1.13-1.14
databases/rrdtool/patches/patch-am              delete
---
    Module Name:    pkgsrc
    Committed By:   martti
    Date:           Tue Jul 29 17:23:17 UTC 2008

    Modified Files:
             pkgsrc/databases/rrdtool: Makefile distinfo
             pkgsrc/databases/rrdtool/patches: patch-al
    Removed Files:
             pkgsrc/databases/rrdtool/patches: patch-am

    Log Message:
    Updated databases/rrdtool to 1.3.1

    * image size does get returned properly even with --lazy active
       this broke a number of frontends which should work now.
    * fix rrd_restore to be able to read rrd 1.0.x generated dumps again.
    * several documetation fixes
    * make rrdtool.spec work without php
    * complain when someone tries to create an rrd file with step size zero.
    * added filename to illegal updated interval error message.
    * fix number of rows returned by python modules fetch implementation.
    ---
    Module Name:        pkgsrc
    Committed By:       martti
    Date:               Wed Sep 10 05:38:12 UTC 2008

    Modified Files:
        pkgsrc/databases/rrdtool: Makefile buildlink3.mk distinfo
        pkgsrc/databases/rrdtool/patches: patch-al

    Log Message:
    Updated databases/rrdtool to 1.3.2

    MAJOR BUG-FIX:

    * When running rrdtool update with multiple updates in one go and
       MMAP enabled, there was a data corruption bug at wrap around.
       See http://oss.oetiker.ch/rrdtool-trac/ticket/178 for details
       Thanks to Kevin Brintnall

    OTHER FIXES:

    * Forward ported rra cur_row randomization patch from rrdtool
       1.2.28 (it got lost in development).

    * Contrary to the documentation imginfo did return the full path
       of the image and not only the file name.

    * Make --lazy mode work even when PRINT commands are present.
       http://oss.oetiker.ch/rrdtool-trac/ticket/163

    * Fix Ruby Bindings memory leak.

    * Fix compilation on solaris 2.8

    * Fix a ton of memory leaks in rrd_create and some in rrd_tool as
       well. Based on valgrind analysis by Sven Engelhardt. Thanks!

    * Fix handling of error conditions in rrd_tool.c (errno is not the
       ideal indicator)

    ENHANCEMENTS:

    * Text Strings entered in the current locale will automatically be
       transformed to utf8 for proper handling by Pango.

    * Dramatically improved Pango Performance by introducing a static
       fontmap. On my test system the persistent fontmap causes the
       second graph with the same fonts in a single session to be
       created about 0.18s faster than the first one. For a total graph
       creation time of 0.21s this is a pretty substantial improvement.
       With this patch, performance for the second graph is back to
       1.2.x levels or even better.

diffstat:

 databases/rrdtool/Makefile         |   6 +++---
 databases/rrdtool/buildlink3.mk    |   4 ++--
 databases/rrdtool/distinfo         |  11 +++++------
 databases/rrdtool/patches/patch-al |   8 ++++----
 databases/rrdtool/patches/patch-am |  22 ----------------------
 5 files changed, 14 insertions(+), 37 deletions(-)

diffs (92 lines):

diff -r f883f6630943 -r ee3cf4e84e14 databases/rrdtool/Makefile
--- a/databases/rrdtool/Makefile        Wed Sep 10 10:47:31 2008 +0000
+++ b/databases/rrdtool/Makefile        Wed Sep 10 11:17:56 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2008/06/30 07:31:09 martti Exp $
+# $NetBSD: Makefile,v 1.67.4.1 2008/09/10 11:17:56 tron Exp $
 
-DISTNAME=      rrdtool-1.3.0
-PKGREVISION=   1
+DISTNAME=      rrdtool-1.3.2
+#PKGREVISION=  1
 CATEGORIES=    databases graphics net
 MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
 
diff -r f883f6630943 -r ee3cf4e84e14 databases/rrdtool/buildlink3.mk
--- a/databases/rrdtool/buildlink3.mk   Wed Sep 10 10:47:31 2008 +0000
+++ b/databases/rrdtool/buildlink3.mk   Wed Sep 10 11:17:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/06/23 16:24:30 he Exp $
+# $NetBSD: buildlink3.mk,v 1.19.4.1 2008/09/10 11:17:56 tron Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=        ${RRDTOOL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rrdtool
 
 .if ${RRDTOOL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.rrdtool+=        rrdtool>=1.2.26
+BUILDLINK_API_DEPENDS.rrdtool+=        rrdtool>=1.3.2
 BUILDLINK_PKGSRCDIR.rrdtool?=  ../../databases/rrdtool
 .endif # RRDTOOL_BUILDLINK3_MK
 
diff -r f883f6630943 -r ee3cf4e84e14 databases/rrdtool/distinfo
--- a/databases/rrdtool/distinfo        Wed Sep 10 10:47:31 2008 +0000
+++ b/databases/rrdtool/distinfo        Wed Sep 10 11:17:56 2008 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.29 2008/06/30 07:29:48 martti Exp $
+$NetBSD: distinfo,v 1.29.4.1 2008/09/10 11:17:56 tron Exp $
 
-SHA1 (rrdtool-1.3.0.tar.gz) = c80572b3b74a3a58b83d83edcbcaf295f9a37538
-RMD160 (rrdtool-1.3.0.tar.gz) = c5d6665f22155bb6801e83cf9ec931b776cfcc2b
-Size (rrdtool-1.3.0.tar.gz) = 1101980 bytes
-SHA1 (patch-al) = 5a3c397d8f5ed026972cbaadbe21f91f4e762a74
-SHA1 (patch-am) = 9797d7c33632376e75361963e8141a2ad30cfafe
+SHA1 (rrdtool-1.3.2.tar.gz) = e4ba8ac84889d23595dc9c25be3d9c5b72ce619a
+RMD160 (rrdtool-1.3.2.tar.gz) = 0fd86e318f32f9cba48f5a0d59e4425ba6baec63
+Size (rrdtool-1.3.2.tar.gz) = 1107391 bytes
+SHA1 (patch-al) = 6c01b709fd8ca1b2f7968e721a8684864ae1db42
diff -r f883f6630943 -r ee3cf4e84e14 databases/rrdtool/patches/patch-al
--- a/databases/rrdtool/patches/patch-al        Wed Sep 10 10:47:31 2008 +0000
+++ b/databases/rrdtool/patches/patch-al        Wed Sep 10 11:17:56 2008 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.12 2008/06/30 07:29:48 martti Exp $
+$NetBSD: patch-al,v 1.12.4.1 2008/09/10 11:17:56 tron Exp $
 
 Correct examples directory.
 
---- examples/Makefile.in.orig  2007-11-20 02:15:30.000000000 +0200
-+++ examples/Makefile.in       2007-11-20 12:57:37.000000000 +0200
-@@ -224,7 +224,7 @@
+--- examples/Makefile.in.orig  2008-09-06 17:26:10.000000000 +0300
++++ examples/Makefile.in       2008-09-07 08:37:18.000000000 +0300
+@@ -284,7 +284,7 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  EXTRA_DIST = cgi-demo.cgi.in
diff -r f883f6630943 -r ee3cf4e84e14 databases/rrdtool/patches/patch-am
--- a/databases/rrdtool/patches/patch-am        Wed Sep 10 10:47:31 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.6 2008/06/30 07:29:48 martti Exp $
-
-Prepend file name to error message.
-
---- src/rrd_update.c.orig      2008-06-11 01:12:55.000000000 +0200
-+++ src/rrd_update.c
-@@ -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;
-         }