rrdtool: updated to 1.8.0

RRDtool 1.8.0 - 2022-03-13

Bugfixes

python bindings: properly convert double values of rrd info
failed to expand 'Py_UNUSED', Invalid usage when expanding 'Py_UNUSED'
document --showtime in xport help output
fix --use-nan-for-all-missing-data
update rrdruby.pod
add missing rrdruby.pod and rrdpython.pod to dist
Set first_weekday to 0 (Sunday), when HAVE__NL_TIME_WEEK_1STDAY is not defined
fix median calculation for all NaN inputs
fix potential leak in xport during failure
fix many warnings raised by Cppcheck
fix many compiler warnings from latest gcc
ensure proper initialization in rrd_daemon
cleanup testsuite
better testing
avoid invalid read in rrd_client
add symbols from rrdc to librrd
Fix duplicate write_changes_to_disk() calls when HAVE_LIBRADOS is true and HAVE_MMAP is false
documentation updates
for SMIN example in docs
fix for pyton3 compatibility
freemem only for valid status <Christian Kr"oger>
fix double meaning of time 0 as uninitialized value
fix for zfs not supporting fallocate. this makes resize work on zfs
add rrdrados.pod to dist
fetch - do not call rrd_freemem on uninitialized pointers
use separate pango fontmap per thread
switch to python 3
do not leak filename when opening a broken file
fix leaks in rrdcached
avoid segfault when flushing cache
escape json in legend entries
fix leak in xport
make rrdcgi param parsing more robust
fix race in journal_write

Features

ROUND function for rrd RPN
vcpkg support for MSVC builds (see WIN32-BUILD-TIPS.txt)
add first_weekday for Windows port
add x64 platform for win32 build
add --add-jsontime for graphv
add --utc to graph
add automated testing for win32 builds
support TUNE command in rrdcached

9 files changed, 48 insertions, 33 deletions

diff --git a/databases/py-rrdtool/Makefile b/databases/py-rrdtool/Makefile
index e08a7294145..e3eb70c5671 100644
--- a/databases/py-rrdtool/Makefile
+++ b/databases/py-rrdtool/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2022/11/23 16:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/11/25 10:41:15 adam Exp $
 
-PKGREVISION= 10
 .include "../../databases/rrdtool/Makefile.common"
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
diff --git a/databases/py-rrdtool/distinfo b/databases/py-rrdtool/distinfo
index dffbb791a17..8fb2e93f0ff 100644
--- a/databases/py-rrdtool/distinfo
+++ b/databases/py-rrdtool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:09:53 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/11/25 10:41:15 adam Exp $
 
-BLAKE2s (rrdtool-1.7.2.tar.gz) = 7bee2b6cf988a2f26b0e83ea4c76d3fc9ebd91b797f51f45584197a908cea458
-SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-Size (rrdtool-1.7.2.tar.gz) = 2883737 bytes
+BLAKE2s (rrdtool-1.8.0.tar.gz) = d0f696e1f608a8938f36840c6cf6aa00624f68877fbcdd339b55c39e475bc613
+SHA512 (rrdtool-1.8.0.tar.gz) = 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
+Size (rrdtool-1.8.0.tar.gz) = 2955398 bytes
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 55cf897facc..be1073da8f0 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.150 2022/11/23 16:18:36 adam Exp $
+# $NetBSD: Makefile,v 1.151 2022/11/25 10:41:15 adam Exp $
 
-PKGREVISION= 13
 .include "Makefile.common"
 
 DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
diff --git a/databases/rrdtool/Makefile.common b/databases/rrdtool/Makefile.common
index 89e05f9d84f..80d8a99b281 100644
--- a/databases/rrdtool/Makefile.common
+++ b/databases/rrdtool/Makefile.common
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile.common,v 1.5 2022/04/24 11:41:25 tnn Exp $
+# $NetBSD: Makefile.common,v 1.6 2022/11/25 10:41:15 adam Exp $
 # used by databases/rrdtool/Makefile
 # used by databases/py-rrdtool/Makefile
 # used by databases/ruby-rrdtool/Makefile
 
-DISTNAME=	rrdtool-1.7.2
+DISTNAME=	rrdtool-1.8.0
 CATEGORIES=	databases graphics net
-MASTER_SITES=	https://oss.oetiker.ch/rrdtool/pub/archive/
+#MASTER_SITES=	https://oss.oetiker.ch/rrdtool/pub/archive/
 # When updating past 1.8.0 use this instead:
-#MASTER_SITES=	${MASTER_SITE_GITHUB:=oetiker/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=oetiker/}
+GITHUB_PROJECT=	rrdtool-1.x
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://oss.oetiker.ch/rrdtool/
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index db45227690c..bfae88c27e1 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.59 2021/10/26 10:09:56 nia Exp $
+$NetBSD: distinfo,v 1.60 2022/11/25 10:41:15 adam Exp $
 
-BLAKE2s (rrdtool-1.7.2.tar.gz) = 7bee2b6cf988a2f26b0e83ea4c76d3fc9ebd91b797f51f45584197a908cea458
-SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-Size (rrdtool-1.7.2.tar.gz) = 2883737 bytes
+BLAKE2s (rrdtool-1.8.0.tar.gz) = d0f696e1f608a8938f36840c6cf6aa00624f68877fbcdd339b55c39e475bc613
+SHA512 (rrdtool-1.8.0.tar.gz) = 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
+Size (rrdtool-1.8.0.tar.gz) = 2955398 bytes
 SHA1 (patch-bindings_perl-shared_Makefile.PL) = 839b4474e89b59002d1629425c5839e4df3b8f5c
+SHA1 (patch-bindings_tcl_Makefile.in) = 0d2515d57ca6a541d1647308d55587046a0a80e8
 SHA1 (patch-doc_Makefile.in) = 749309b6532fff991a89c317a57e24f91a2804d1
 SHA1 (patch-examples_Makefile.in) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
 SHA1 (patch-examples_rrdcached_Makefile.in) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
 SHA1 (patch-src_rrd__cgi.c) = f2004681d9d430b6d347627e029ce3c7a717bcd6
-SHA1 (patch-src_rrd__graph.c) = e53a925c329e477b198cdeaf6b50891187ee17c5
+SHA1 (patch-src_rrd__graph.c) = deed6d90fec23a9b400104da605a859436d2c2d9
 SHA1 (patch-src_rrd__list.c) = 5d548b4196d7242565e23d6d74af1fc2d8be1ba0
 SHA1 (patch-src_rrd__restore.c) = 06cc3918fd685fc4dfbfdefcf39835a6b08f947c
 SHA1 (patch-src_rrd__strtod.c) = 6148276ba17eaaf1ef728db1d55bda18d67da83e
diff --git a/databases/rrdtool/patches/patch-bindings_tcl_Makefile.in b/databases/rrdtool/patches/patch-bindings_tcl_Makefile.in
new file mode 100644
index 00000000000..ca1dba667af
--- /dev/null
+++ b/databases/rrdtool/patches/patch-bindings_tcl_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-bindings_tcl_Makefile.in,v 1.1 2022/11/25 10:41:15 adam Exp $
+
+Properly install Tcl extension (e.g. unstripped on some platforms).
+
+--- bindings/tcl/Makefile.in.orig	2022-11-25 10:10:08.000000000 +0000
++++ bindings/tcl/Makefile.in
+@@ -698,7 +698,7 @@ pkgIndex.tcl:
+ 
+ install-exec-local: $(TCL_RRD_LIB)
+ 	@$(NORMAL_INSTALL)
+-	$(INSTALL_PROGRAM) $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
++	${BSD_INSTALL_LIB} $(TCL_RRD_LIB) $(DESTDIR)$(libdir)/$(TCL_RRD_LIB)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/databases/rrdtool/patches/patch-src_rrd__graph.c b/databases/rrdtool/patches/patch-src_rrd__graph.c
index bc8f328d697..9841c37f462 100644
--- a/databases/rrdtool/patches/patch-src_rrd__graph.c
+++ b/databases/rrdtool/patches/patch-src_rrd__graph.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_rrd__graph.c,v 1.2 2017/07/27 18:31:20 adam Exp $
+$NetBSD: patch-src_rrd__graph.c,v 1.3 2022/11/25 10:41:15 adam Exp $
 
 Use <ctype.h> correctly.
 
---- src/rrd_graph.c.orig	2017-05-16 12:26:46.000000000 +0000
+--- src/rrd_graph.c.orig	2022-03-14 14:30:12.000000000 +0000
 +++ src/rrd_graph.c
-@@ -1704,7 +1704,7 @@ static int strfduration(char * const des
-             if ((zpad = *f == '0'))
-                 f++;
+@@ -1735,7 +1735,7 @@ static int strfduration(
+                 if ((zpad = *f == '0'))
+                     f++;
  
--            if (isdigit(*f)) {
-+            if (isdigit((unsigned char)*f)) {
-                 int nread;
-                 sscanf(f, "%d%n", &width, &nread);
-                 f += nread;
+-                if (isdigit(*f)) {
++                if (isdigit((unsigned char)*f)) {
+                     int       nread;
+ 
+                     sscanf(f, "%d%n", &width, &nread);
diff --git a/databases/ruby-rrdtool/Makefile b/databases/ruby-rrdtool/Makefile
index 0ca34ce7d4a..cb3fde1a433 100644
--- a/databases/ruby-rrdtool/Makefile
+++ b/databases/ruby-rrdtool/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.37 2022/11/23 16:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.38 2022/11/25 10:41:15 adam Exp $
 
-PKGREVISION= 9
 .include "../../databases/rrdtool/Makefile.common"
 
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
diff --git a/databases/ruby-rrdtool/distinfo b/databases/ruby-rrdtool/distinfo
index 5b8788fb91f..97de7ee74cb 100644
--- a/databases/ruby-rrdtool/distinfo
+++ b/databases/ruby-rrdtool/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:10:03 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/11/25 10:41:15 adam Exp $
 
-BLAKE2s (rrdtool-1.7.2.tar.gz) = 7bee2b6cf988a2f26b0e83ea4c76d3fc9ebd91b797f51f45584197a908cea458
-SHA512 (rrdtool-1.7.2.tar.gz) = 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-Size (rrdtool-1.7.2.tar.gz) = 2883737 bytes
+BLAKE2s (rrdtool-1.8.0.tar.gz) = d0f696e1f608a8938f36840c6cf6aa00624f68877fbcdd339b55c39e475bc613
+SHA512 (rrdtool-1.8.0.tar.gz) = 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
+Size (rrdtool-1.8.0.tar.gz) = 2955398 bytes
 SHA1 (patch-extconf.rb) = 18cce3cb95afd81ea30c03bad4e2a1717c7ab982