CVS commit: pkgsrc/databases/rrdtool

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Oct 18 21:22:12 UTC 2016

Modified Files:
        pkgsrc/databases/rrdtool: Makefile distinfo
Added Files:
        pkgsrc/databases/rrdtool/patches: patch-src_rrd__dump.c

Log Message:
Fix a signedness/unsigned conversion bug causing overflow in rrd_dump.c.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/databases/rrdtool/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/databases/rrdtool/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/rrdtool/patches/patch-src_rrd__dump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/rrdtool/Makefile
diff -u pkgsrc/databases/rrdtool/Makefile:1.124 pkgsrc/databases/rrdtool/Makefile:1.125
--- pkgsrc/databases/rrdtool/Makefile:1.124     Sat Aug 27 06:42:43 2016
+++ pkgsrc/databases/rrdtool/Makefile   Tue Oct 18 21:22:12 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.124 2016/08/27 06:42:43 dholland Exp $
+# $NetBSD: Makefile,v 1.125 2016/10/18 21:22:12 he Exp $
 #
 # Please, also update databases/ruby-rrdtool
 
 DISTNAME=      rrdtool-1.6.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    databases graphics net
 MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
 

Index: pkgsrc/databases/rrdtool/distinfo
diff -u pkgsrc/databases/rrdtool/distinfo:1.52 pkgsrc/databases/rrdtool/distinfo:1.53
--- pkgsrc/databases/rrdtool/distinfo:1.52      Sat Aug 27 07:40:22 2016
+++ pkgsrc/databases/rrdtool/distinfo   Tue Oct 18 21:22:12 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2016/08/27 07:40:22 dholland Exp $
+$NetBSD: distinfo,v 1.53 2016/10/18 21:22:12 he Exp $
 
 SHA1 (rrdtool-1.6.0.tar.gz) = 9866b41bda9416188f236d61d24f185b173fd571
 RMD160 (rrdtool-1.6.0.tar.gz) = 90bb6dc4a19c296fb67bb83094f6308396e591c0
@@ -11,6 +11,7 @@ SHA1 (patch-am) = be06ac61b314e225d62f9f
 SHA1 (patch-bindings_perl-shared_Makefile.PL) = f3b86e68a023ec9da5d600c8f803c93820195d53
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
 SHA1 (patch-src_rrd__cgi.c) = 2ea93cf6cd084638e9ae720fcb9c503631d31413
+SHA1 (patch-src_rrd__dump.c) = b42add89a7c1e410c2a5ec8a714dba21a446d125
 SHA1 (patch-src_rrd__graph.c) = 799c5a666661054e4c32b8ed02cc09f2262dae03
 SHA1 (patch-src_rrd__restore.c) = e10312901fd6edfdcaf7cce932eb434cce8ef771
 SHA1 (patch-src_rrd__strtod.c) = 49ed57170777b8bcbd7c4e700c1f54d74e3a3a72

Added files:

Index: pkgsrc/databases/rrdtool/patches/patch-src_rrd__dump.c
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-src_rrd__dump.c:1.1
--- /dev/null   Tue Oct 18 21:22:12 2016
+++ pkgsrc/databases/rrdtool/patches/patch-src_rrd__dump.c      Tue Oct 18 21:22:12 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_rrd__dump.c,v 1.1 2016/10/18 21:22:12 he Exp $
+
+Fix a signedness / unsigned conversion bug, causing overflow
+of the timestamp for all but the last sample dumped (when timer is negative).
+
+--- src/rrd_dump.c.orig        2016-04-19 15:52:25.000000000 +0000
++++ src/rrd_dump.c
+@@ -422,7 +422,7 @@ int rrd_dump_cb_r(
+             now = (rrd.live_head->last_up
+                    - rrd.live_head->last_up
+                    % (rrd.rra_def[i].pdp_cnt * rrd.stat_head->pdp_step))
+-                + (timer * rrd.rra_def[i].pdp_cnt * rrd.stat_head->pdp_step);
++                + (timer * (long)rrd.rra_def[i].pdp_cnt * (long)rrd.stat_head->pdp_step);
+ 
+             timer++;
+ #if HAVE_STRFTIME