[pkgsrc/pkgsrc-2008Q4]: pkgsrc/databases Pullup ticket #2654 - requested by m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/465c2d3f5b30
branches:  pkgsrc-2008Q4
changeset: 552261:465c2d3f5b30
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jan 22 21:48:00 2009 +0000

description:
Pullup ticket #2654 - requested by martti
rrdtool: bug fix update
rrdtool12: bug fix update

Revisions pulled up:
- databases/rrdtool/Makefile                    1.76
- databases/rrdtool/distinfo                    1.36
- databases/rrdtool/patches/patch-aa            delete
- databases/rrdtool12/Makefile                  1.4
- databases/rrdtool12/distinfo                  1.3
- databases/rrdtool12/patches/patch-as          1.2
---
Module Name:    pkgsrc
Committed By:   martti
Date:           Thu Jan 22 16:47:02 UTC 2009

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

Log Message:
* many small updates to the POD documents.
* improved win32 source
* OSX compilation fixes
* rrd_fetch: fix memory leak
* rrd_cgi: fix segfault in error reporting routine
* rrd_graph: fix TICK for negative numbers
* rrd_graph: fix image size reporting for LP64BE architectures
* rrd_resize: fix GROW for mmap (it was totally broken)
---
Module Name:    pkgsrc
Committed By:   martti
Date:           Thu Jan 22 16:47:30 UTC 2009

Modified Files:
        pkgsrc/databases/rrdtool12: Makefile distinfo
        pkgsrc/databases/rrdtool12/patches: patch-as

Log Message:
Updated databases/rrdtool12

* rrd_graph: fix TICK for negative numbers
* rrd_cgi: fix segfault in error reporting routine

diffstat:

 databases/rrdtool/Makefile           |   5 ++---
 databases/rrdtool/distinfo           |   9 ++++-----
 databases/rrdtool/patches/patch-aa   |  18 ------------------
 databases/rrdtool12/Makefile         |   4 ++--
 databases/rrdtool12/distinfo         |  10 +++++-----
 databases/rrdtool12/patches/patch-as |   8 ++++----
 6 files changed, 17 insertions(+), 37 deletions(-)

diffs (99 lines):

diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool/Makefile
--- a/databases/rrdtool/Makefile        Thu Jan 22 20:21:52 2009 +0000
+++ b/databases/rrdtool/Makefile        Thu Jan 22 21:48:00 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74.2.1 2009/01/18 10:30:48 rtr Exp $
+# $NetBSD: Makefile,v 1.74.2.2 2009/01/22 21:48:00 tron Exp $
 
-DISTNAME=      rrdtool-1.3.5
-PKGREVISION=   1
+DISTNAME=      rrdtool-1.3.6
 
 CATEGORIES=    databases graphics net
 MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool/distinfo
--- a/databases/rrdtool/distinfo        Thu Jan 22 20:21:52 2009 +0000
+++ b/databases/rrdtool/distinfo        Thu Jan 22 21:48:00 2009 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.34.2.1 2009/01/18 10:30:48 rtr Exp $
+$NetBSD: distinfo,v 1.34.2.2 2009/01/22 21:48:00 tron Exp $
 
-SHA1 (rrdtool-1.3.5.tar.gz) = 0d123c054bdf30bfe5fa28c028ff3e8437f3777b
-RMD160 (rrdtool-1.3.5.tar.gz) = fec1df84b7cb970bd35bb4fe8a8d9a2dd46c8cf5
-Size (rrdtool-1.3.5.tar.gz) = 1075738 bytes
-SHA1 (patch-aa) = fd24a682eb16b50c516d57787ef9d9981d74e7ad
+SHA1 (rrdtool-1.3.6.tar.gz) = 4a8499ab58dfd37419bf1cb2429a29da9bc782c3
+RMD160 (rrdtool-1.3.6.tar.gz) = 25e909e0be792d5595e7fcb8d26309f1afc0bb7e
+Size (rrdtool-1.3.6.tar.gz) = 1079261 bytes
 SHA1 (patch-al) = 6c01b709fd8ca1b2f7968e721a8684864ae1db42
diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool/patches/patch-aa
--- a/databases/rrdtool/patches/patch-aa        Thu Jan 22 20:21:52 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.12.8.1 2009/01/18 10:30:48 rtr Exp $
-
-Fix image sizes on LP64BE
-
---- src/rrd_graph.c.orig       2008-10-04 12:04:04.000000000 -0400
-+++ src/rrd_graph.c
-@@ -3551,9 +3551,9 @@ int rrd_graph(
-     *ymax = 0;
-     while (walker) {
-         if (strcmp(walker->key, "image_width") == 0) {
--            *xsize = walker->value.u_int;
-+            *xsize = walker->value.u_cnt;
-         } else if (strcmp(walker->key, "image_height") == 0) {
--            *ysize = walker->value.u_int;
-+            *ysize = walker->value.u_cnt;
-         } else if (strcmp(walker->key, "value_min") == 0) {
-             *ymin = walker->value.u_val;
-         } else if (strcmp(walker->key, "value_max") == 0) {
diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool12/Makefile
--- a/databases/rrdtool12/Makefile      Thu Jan 22 20:21:52 2009 +0000
+++ b/databases/rrdtool12/Makefile      Thu Jan 22 21:48:00 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/01/02 20:07:10 martti Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2009/01/22 21:48:00 tron Exp $
 
-DISTNAME=      rrdtool-1.2.29
+DISTNAME=      rrdtool-1.2.30
 CATEGORIES=    databases graphics net
 MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
 
diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool12/distinfo
--- a/databases/rrdtool12/distinfo      Thu Jan 22 20:21:52 2009 +0000
+++ b/databases/rrdtool12/distinfo      Thu Jan 22 21:48:00 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2009/01/02 20:07:10 martti Exp $
+$NetBSD: distinfo,v 1.2.2.1 2009/01/22 21:48:00 tron Exp $
 
-SHA1 (rrdtool-1.2.29.tar.gz) = bd6c201eb12ff9007081fda81aa6bd1410a30bf2
-RMD160 (rrdtool-1.2.29.tar.gz) = a54f80cf3eec6d1484e062311a96e5691656288e
-Size (rrdtool-1.2.29.tar.gz) = 1092333 bytes
+SHA1 (rrdtool-1.2.30.tar.gz) = c850dc6008bd6580eefa4257e339f78bd3f78fa3
+RMD160 (rrdtool-1.2.30.tar.gz) = ee4d492fee4e109da89ca85bd9dd561cb9ddfcec
+Size (rrdtool-1.2.30.tar.gz) = 1092483 bytes
 SHA1 (patch-al) = d60ff005ac635f0fcbc5222be419a9f08c326817
-SHA1 (patch-as) = f29600b678eec1d612f7bf59a4fbf4e9a91cf5a0
+SHA1 (patch-as) = ef58116cda2544c083c887fd29dc94f64ea07515
 SHA1 (patch-av) = 2499cb7f42dd1438d4126135a8305409a5dff744
 SHA1 (patch-aw) = 71b7ea0da101dc0867aa3e58334de0ef43eea33f
 SHA1 (patch-ay) = a9b9e9be3364f9b0ea5c407f841aced60b9ac3f0
diff -r 7aa9af2ff9d2 -r 465c2d3f5b30 databases/rrdtool12/patches/patch-as
--- a/databases/rrdtool12/patches/patch-as      Thu Jan 22 20:21:52 2009 +0000
+++ b/databases/rrdtool12/patches/patch-as      Thu Jan 22 21:48:00 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.1.1.1 2008/07/28 19:48:03 martti Exp $
+$NetBSD: patch-as,v 1.1.1.1.6.1 2009/01/22 21:48:00 tron Exp $
 
 Adjust for pkgsrc.
 
---- src/rrd_cgi.c.orig 2006-05-04 15:26:28.000000000 +0200
-+++ src/rrd_cgi.c
-@@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
+--- src/rrd_cgi.c.orig 2009-01-19 16:29:14.000000000 +0200
++++ src/rrd_cgi.c      2009-01-22 17:53:09.000000000 +0200
+@@ -419,7 +419,7 @@
  
        if (!filter) {
                printf ("Content-Type: text/html\n"