Changes 1.5.5:

Bugfixes
--------
* fix JSON output in xport with legend and gprint blocks
* fix parse_time mutex unlocking in the error case
* don't crash on invalid variable names in CDEF
* add mutex locking in rrdc_fetch
* fix buffer overflow in rrd_restore
* shorten test precision to 7 digits ...
* never exit from a library function
* buffer overflow in rrd_restore.c

6 files changed, 32 insertions, 27 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index dd67fe775ee..4a034aa451c 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2015/08/18 12:29:44 mef Exp $
+# $NetBSD: Makefile,v 1.120 2016/02/01 09:41:59 adam Exp $
 #
 # Please, also update databases/ruby-rrdtool
 
-DISTNAME=	rrdtool-1.5.4
+DISTNAME=	rrdtool-1.5.5
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -39,7 +39,11 @@ SUBST_FILES.prefix=	examples/cgi-demo.cgi
 SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 
 REPLACE_PYTHON=		examples/stripes.py
-TEST_TARGET=		# *** No rule to make target 'test'. 
+TEST_TARGET=		# *** No rule to make target 'test'.
+
+# rrd_config.h is needed for databases/ruby-rrdtool
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/src/rrd_config.h ${DESTDIR}${PREFIX}/include/
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/databases/rrdtool/PLIST b/databases/rrdtool/PLIST
index 0e1f1064cfd..20202e7e6a4 100644
--- a/databases/rrdtool/PLIST
+++ b/databases/rrdtool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2015/08/18 12:29:44 mef Exp $
+@comment $NetBSD: PLIST,v 1.16 2016/02/01 09:41:59 adam Exp $
 bin/rrdcached
 bin/rrdcgi
 bin/rrdcreate
@@ -7,6 +7,7 @@ bin/rrdtool
 bin/rrdupdate
 include/rrd.h
 include/rrd_client.h
+include/rrd_config.h
 include/rrd_format.h
 lib/librrd.la
 lib/librrd_th.la
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 33adc216ea3..ac48c4b6a60 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.49 2015/11/03 01:56:30 agc Exp $
+$NetBSD: distinfo,v 1.50 2016/02/01 09:41:59 adam Exp $
 
-SHA1 (rrdtool-1.5.4.tar.gz) = 5020ffb6c4d309207df946ab13fafff973465b2a
-RMD160 (rrdtool-1.5.4.tar.gz) = f336795c1ae26eb618793c9899fdf66984861d64
-SHA512 (rrdtool-1.5.4.tar.gz) = 1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665
-Size (rrdtool-1.5.4.tar.gz) = 2181438 bytes
+SHA1 (rrdtool-1.5.5.tar.gz) = 8275cd4dd3fb2086686ee5acfc7cc5e756483e0e
+RMD160 (rrdtool-1.5.5.tar.gz) = 17970e90c72450d5589665f0165733469392cb82
+SHA512 (rrdtool-1.5.5.tar.gz) = 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c
+Size (rrdtool-1.5.5.tar.gz) = 2187685 bytes
 SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
 SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
 SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
-SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
+SHA1 (patch-am) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
 SHA1 (patch-bindings_perl-shared_Makefile.PL) = 1704531ecfcac0aeb0da03f350d9a657e3d8535d
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
index 625c0877eff..d2145048afb 100644
--- a/databases/rrdtool/patches/patch-am
+++ b/databases/rrdtool/patches/patch-am
@@ -1,15 +1,15 @@
-$NetBSD: patch-am,v 1.8 2010/07/06 07:31:37 adam Exp $
+$NetBSD: patch-am,v 1.9 2016/02/01 09:41:59 adam Exp $
 
 Correct examples directory.
 
---- examples/rrdcached/Makefile.in.orig	2010-07-06 07:23:46.000000000 +0000
+--- examples/rrdcached/Makefile.in.orig	2015-11-10 16:59:27.000000000 +0000
 +++ examples/rrdcached/Makefile.in
-@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
+@@ -356,7 +356,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -examplesdir = $(pkgdatadir)/examples/rrdcached
 +examplesdir = $(prefix)/share/examples/rrdcached
- examples_SCRIPTS = RRDCached.pm rrdcached-size.pl
- EXTRA_DIST = RRDCached.pm rrdcached-size.pl
- all: all-am
+ examples_SCRIPTS = rrdcached-size.pl
+ examples_DATA = RRDCached.pm
+ EXTRA_DIST = $(examples_DATA) $(examples_SCRIPTS)
diff --git a/databases/ruby-rrdtool/Makefile b/databases/ruby-rrdtool/Makefile
index 6cefb71b1d9..0e8d337714e 100644
--- a/databases/ruby-rrdtool/Makefile
+++ b/databases/ruby-rrdtool/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2015/04/25 14:20:31 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/01 09:41:59 adam Exp $
 
-DISTNAME=	rrdtool-1.4.9
+DISTNAME=	rrdtool-1.5.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -11,12 +10,13 @@ HOMEPAGE=	http://oss.oetiker.ch/rrdtool/
 COMMENT=	Ruby binding for rrdtool
 LICENSE=	gnu-gpl-v2
 
-# rrdtool explicitly forbids any use of -ffast-math
-#BUILDLINK_TRANSFORM+=	rm:-ffast-math
-
 USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${DISTNAME}/bindings/ruby ${DISTNAME}/src
 WRKSRC=			${WRKDIR}/${DISTNAME}/bindings/ruby
+MAKE_ENV+=		ABS_TOP_BUILDDIR=${WRKDIR}/${DISTNAME}
+
+pre-configure:
+	rm ${WRKDIR}/${DISTNAME}/src/rrd_config.h
 
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
diff --git a/databases/ruby-rrdtool/distinfo b/databases/ruby-rrdtool/distinfo
index 25e4959ce62..dfa0e164e95 100644
--- a/databases/ruby-rrdtool/distinfo
+++ b/databases/ruby-rrdtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:56:34 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/02/01 09:41:59 adam Exp $
 
-SHA1 (rrdtool-1.4.9.tar.gz) = c83b158b4aaadbf28b15823fa863db1672700d3b
-RMD160 (rrdtool-1.4.9.tar.gz) = 8c067f0207bdfeb067be3c9b31c8e35009485200
-SHA512 (rrdtool-1.4.9.tar.gz) = 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a
-Size (rrdtool-1.4.9.tar.gz) = 1385640 bytes
+SHA1 (rrdtool-1.5.5.tar.gz) = 8275cd4dd3fb2086686ee5acfc7cc5e756483e0e
+RMD160 (rrdtool-1.5.5.tar.gz) = 17970e90c72450d5589665f0165733469392cb82
+SHA512 (rrdtool-1.5.5.tar.gz) = 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c
+Size (rrdtool-1.5.5.tar.gz) = 2187685 bytes