pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases RRDtool 1.7.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/abfd69eb16cb
branches: trunk
changeset: 365851:abfd69eb16cb
user: adam <adam%pkgsrc.org@localhost>
date: Thu Jul 27 18:31:20 2017 +0000
description:
RRDtool 1.7.0
Bugfixes
--------
* made rrd_fetch_cb_wrapper in RRDs more careful with its arguments
* many bugfixes to resolve issues identified Coverty scan
* fix build issues with libdbl
* take the ds step into account while caching data in rrd graph DEF statements
* never 'exit' from librrd (even when DEBUG is on)
Features
--------
* new command rrd list to show rrd files in a directory
* configurable log-level for rrdcached
* hungarian translation (hu.po)
API
---
* New Exported funtions: rrd_lcd, rrd_reduce_data, rrd_cf_conf and rrd_list
* rrd_list support for perl and python binding
* all new and much more complete python bindings working on both python 2.6+ and 3.3+
* extended documentation in rrdlib.pod
diffstat:
databases/Makefile | 3 +-
databases/py-rrdtool/DESCR | 2 +
databases/py-rrdtool/Makefile | 20 +++++
databases/py-rrdtool/PLIST | 6 +
databases/py-rrdtool/distinfo | 6 +
databases/rrdtool/Makefile | 29 +++----
databases/rrdtool/PLIST | 14 ++--
databases/rrdtool/distinfo | 33 ++++----
databases/rrdtool/options.mk | 35 +--------
databases/rrdtool/patches/patch-aa | 13 ---
databases/rrdtool/patches/patch-ab | 27 -------
databases/rrdtool/patches/patch-al | 15 ----
databases/rrdtool/patches/patch-am | 15 ----
databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL | 3 +-
databases/rrdtool/patches/patch-examples_Makefile.in | 15 ++++
databases/rrdtool/patches/patch-examples_rrdcached_Makefile.in | 15 ++++
databases/rrdtool/patches/patch-src_rrd__cgi.c | 8 +-
databases/rrdtool/patches/patch-src_rrd__dump.c | 16 ----
databases/rrdtool/patches/patch-src_rrd__graph.c | 4 +-
databases/rrdtool/patches/patch-src_rrd__lastupdate.c | 13 +++
databases/rrdtool/patches/patch-src_rrd__restore.c | 4 +-
databases/rrdtool/patches/patch-src_rrd__strtod.c | 4 +-
databases/rrdtool/patches/patch-src_rrd__tool.c | 27 +++++++
databases/rrdtool/patches/patch-src_rrd__utils.c | 4 +-
databases/rrdtool/patches/patch-src_rrd__xport.c | 10 +-
databases/ruby-rrdtool/Makefile | 13 +--
databases/ruby-rrdtool/distinfo | 10 +-
27 files changed, 172 insertions(+), 192 deletions(-)
diffs (truncated from 637 to 300 lines):
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/Makefile
--- a/databases/Makefile Thu Jul 27 11:21:37 2017 +0000
+++ b/databases/Makefile Thu Jul 27 18:31:20 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.531 2017/07/20 04:11:58 jnemeth Exp $
+# $NetBSD: Makefile,v 1.532 2017/07/27 18:31:20 adam Exp $
COMMENT= Databases
@@ -358,6 +358,7 @@
SUBDIR+= py-python-rrdtool
SUBDIR+= py-python-sql
SUBDIR+= py-redis
+SUBDIR+= py-rrdtool
SUBDIR+= py-sqlalchemy
SUBDIR+= py-sqlalchemy-i18n
SUBDIR+= py-sqlalchemy-migrate
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/py-rrdtool/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-rrdtool/DESCR Thu Jul 27 18:31:20 2017 +0000
@@ -0,0 +1,2 @@
+This package contains Python extension module for rrdtool (Round Robin
+Database Tools).
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/py-rrdtool/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-rrdtool/Makefile Thu Jul 27 18:31:20 2017 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+.include "../../databases/rrdtool/Makefile.common"
+
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+
+DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
+
+EGG_NAME= rrdtool-0.1.10
+
+EXTRACT_ELEMENTS= ${DISTNAME}/bindings/python ${DISTNAME}/src
+WRKSRC= ${WRKDIR}/${DISTNAME}/bindings/python
+MAKE_ENV+= ABS_TOP_BUILDDIR=${WRKDIR}/${DISTNAME}
+
+pre-configure:
+ rm ${WRKDIR}/${DISTNAME}/src/rrd_config.h
+
+.include "../../databases/rrdtool/buildlink3.mk"
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/py-rrdtool/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-rrdtool/PLIST Thu Jul 27 18:31:20 2017 +0000
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/27 18:31:20 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/rrdtool.so
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/py-rrdtool/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/py-rrdtool/distinfo Thu Jul 27 18:31:20 2017 +0000
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/07/27 18:31:20 adam Exp $
+
+SHA1 (rrdtool-1.7.0.tar.gz) = 15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78
+RMD160 (rrdtool-1.7.0.tar.gz) = 8816c971189a60e190d15a5b3827697c299ffce3
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
+Size (rrdtool-1.7.0.tar.gz) = 2849994 bytes
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/Makefile
--- a/databases/rrdtool/Makefile Thu Jul 27 11:21:37 2017 +0000
+++ b/databases/rrdtool/Makefile Thu Jul 27 18:31:20 2017 +0000
@@ -1,26 +1,17 @@
-# $NetBSD: Makefile,v 1.127 2017/02/12 06:24:37 ryoon Exp $
-#
-# Please, also update databases/ruby-rrdtool
+# $NetBSD: Makefile,v 1.128 2017/07/27 18:31:20 adam Exp $
-DISTNAME= rrdtool-1.6.0
-PKGREVISION= 5
-CATEGORIES= databases graphics net
-MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://oss.oetiker.ch/rrdtool/
-COMMENT= Data analysis tool generating graphical representations
-LICENSE= gnu-gpl-v2
+.include "Makefile.common"
DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config perl msgfmt intltool groff nroff
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-libdbi
+CONFIGURE_ARGS+= --disable-python
+CONFIGURE_ARGS+= --disable-ruby
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --with-perl-options=${MAKE_PARAMS:Q}
-CONFIGURE_ARGS+= --disable-ruby
-CONFIGURE_ARGS+= --disable-libdbi
PTHREAD_OPTS+= require
PERL5_CONFIGURE= no
@@ -36,7 +27,7 @@
SUBST_FILES.prefix= examples/cgi-demo.cgi
SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
-TEST_TARGET= # *** No rule to make target 'test'.
+TEST_TARGET= check
RCD_SCRIPTS= rrdcached
@@ -56,6 +47,11 @@
PKG_USERS= ${RRDCACHED_USER}:${RRDCACHED_GROUP}
PKG_GECOS.${RRDCACHED_USER}= RRDCacheD daemon user
+OPSYSVARS+= SOEXT
+SOEXT.Darwin= dylib
+SOEXT.*= so
+PLIST_SUBST+= SOEXT=${SOEXT}
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
@@ -63,9 +59,8 @@
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/PLIST
--- a/databases/rrdtool/PLIST Thu Jul 27 11:21:37 2017 +0000
+++ b/databases/rrdtool/PLIST Thu Jul 27 18:31:20 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/08/27 06:42:43 dholland Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/07/27 18:31:20 adam Exp $
bin/rrdcached
bin/rrdcgi
bin/rrdcreate
@@ -11,15 +11,10 @@
include/rrd_format.h
lib/librrd.la
${PLIST.lua}${LUA_CDIR}/rrd.la
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PLIST.python}${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PLIST.python}${PYSITELIB}/rrdtool.so
lib/pkgconfig/librrd.pc
${PLIST.tcl}lib/rrdtool/ifOctets.tcl
${PLIST.tcl}lib/rrdtool/pkgIndex.tcl
-${PLIST.tcl}lib/tclrrd1.6.0.so
+${PLIST.tcl}lib/tclrrd${PKGVERSION}.${SOEXT}
man/man1/bin_dec_hex.1
man/man1/cdeftutorial.1
man/man1/rpntutorial.1
@@ -41,6 +36,7 @@
man/man1/rrdlast.1
man/man1/rrdlastupdate.1
${PLIST.lua}man/man1/rrdlua.1
+man/man1/rrdlist.1
man/man1/rrdresize.1
man/man1/rrdrestore.1
man/man1/rrdthreads.1
@@ -74,6 +70,7 @@
share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html
share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html
share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html
+share/doc/rrdtool-${PKGVERSION}/html/rrdlist.html
${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/html/rrdlua.html
share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
@@ -124,6 +121,8 @@
share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.pod
share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.txt
+share/doc/rrdtool-${PKGVERSION}/txt/rrdlist.pod
+share/doc/rrdtool-${PKGVERSION}/txt/rrdlist.txt
${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/txt/rrdlua.pod
${PLIST.lua}share/doc/rrdtool-${PKGVERSION}/txt/rrdlua.txt
share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.pod
@@ -153,3 +152,4 @@
share/examples/rrdtool/shared-demo.pl
share/examples/rrdtool/stripes.pl
share/examples/rrdtool/stripes.py
+share/locale/hu/LC_MESSAGES/rrdtool.mo
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/distinfo
--- a/databases/rrdtool/distinfo Thu Jul 27 11:21:37 2017 +0000
+++ b/databases/rrdtool/distinfo Thu Jul 27 18:31:20 2017 +0000
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.53 2016/10/18 21:22:12 he Exp $
+$NetBSD: distinfo,v 1.54 2017/07/27 18:31:20 adam Exp $
-SHA1 (rrdtool-1.6.0.tar.gz) = 9866b41bda9416188f236d61d24f185b173fd571
-RMD160 (rrdtool-1.6.0.tar.gz) = 90bb6dc4a19c296fb67bb83094f6308396e591c0
-SHA512 (rrdtool-1.6.0.tar.gz) = 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-Size (rrdtool-1.6.0.tar.gz) = 2186538 bytes
-SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
-SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
-SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
-SHA1 (patch-am) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
-SHA1 (patch-bindings_perl-shared_Makefile.PL) = f3b86e68a023ec9da5d600c8f803c93820195d53
+SHA1 (rrdtool-1.7.0.tar.gz) = 15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78
+RMD160 (rrdtool-1.7.0.tar.gz) = 8816c971189a60e190d15a5b3827697c299ffce3
+SHA512 (rrdtool-1.7.0.tar.gz) = 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
+Size (rrdtool-1.7.0.tar.gz) = 2849994 bytes
+SHA1 (patch-bindings_perl-shared_Makefile.PL) = 839b4474e89b59002d1629425c5839e4df3b8f5c
+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) = 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
-SHA1 (patch-src_rrd__utils.c) = 58d10b1447c23268af119e525220a8d950a43dd4
-SHA1 (patch-src_rrd__xport.c) = 27671dc58affdcc0c8eab62b01f1edd65dc4a67f
+SHA1 (patch-src_rrd__cgi.c) = f2004681d9d430b6d347627e029ce3c7a717bcd6
+SHA1 (patch-src_rrd__graph.c) = e53a925c329e477b198cdeaf6b50891187ee17c5
+SHA1 (patch-src_rrd__lastupdate.c) = 317fc6e46e15333574d0e977d8ab34e916920f4a
+SHA1 (patch-src_rrd__restore.c) = 06cc3918fd685fc4dfbfdefcf39835a6b08f947c
+SHA1 (patch-src_rrd__strtod.c) = 6148276ba17eaaf1ef728db1d55bda18d67da83e
+SHA1 (patch-src_rrd__tool.c) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
+SHA1 (patch-src_rrd__utils.c) = c6eb0c0c1e4656984cbd72fa1d1952af776bad4c
+SHA1 (patch-src_rrd__xport.c) = d50bc5069ad672814f70fdb813cffa875f6514bf
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/options.mk
--- a/databases/rrdtool/options.mk Thu Jul 27 11:21:37 2017 +0000
+++ b/databases/rrdtool/options.mk Thu Jul 27 18:31:20 2017 +0000
@@ -1,42 +1,15 @@
-# $NetBSD: options.mk,v 1.3 2016/09/04 16:54:13 dholland Exp $
+# $NetBSD: options.mk,v 1.4 2017/07/27 18:31:20 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rrdtool
-PKG_SUPPORTED_OPTIONS= lua python tcl
-PKG_SUGGESTED_OPTIONS= lua python tcl
+PKG_SUPPORTED_OPTIONS= lua tcl
+PKG_SUGGESTED_OPTIONS= lua tcl
# Note that there's another (apparently different) python library
# in databases/py-python-rrdtool.
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= python tcl lua
-
-
-#
-# XXX: this should include egg.mk, but that doesn't work: it includes
-# extension.mk, which sets do-build and do-install rules, in such a
-# way that we can't override it. Instead we need to cutpaste the
-# definition of EGG_INFODIR and its plist bits. Sigh. Probably the
-# right thing to do is make this a separate package.
-#
-.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+= --enable-python
-
-REPLACE_PYTHON= examples/stripes.py
-.include "../../lang/python/application.mk"
-
-PLIST.python= yes
-EGG_NAME= py_rrdtool-0.2.2
-EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-PLIST_SUBST+= PYSITELIB=${PYSITELIB}
-PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR}
-DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
-#.include "../../lang/python/egg.mk"
-
-.else # python
-CONFIGURE_ARGS+= --disable-python
-.endif
-
+PLIST_VARS+= lua tcl
.if !empty(PKG_OPTIONS:Mtcl)
USE_TOOLS+= tclsh:run
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/patches/patch-aa
--- a/databases/rrdtool/patches/patch-aa Thu Jul 27 11:21:37 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.15 2012/02/03 15:43:44 drochner Exp $
-
---- src/rrd_lastupdate.c.orig 2012-01-24 10:08:48.000000000 +0000
-+++ src/rrd_lastupdate.c
-@@ -75,7 +75,7 @@ int rrd_lastupdate (int argc, char **arg
- printf(" %s", ds_names[i]);
- printf ("\n\n");
-
-- printf ("%10lu:", last_update);
-+ printf ("%10llu:", (unsigned long long)last_update);
- for (i = 0; i < ds_count; i++) {
- printf(" %s", last_ds[i]);
- free(last_ds[i]);
diff -r 5b2eba3ef944 -r abfd69eb16cb databases/rrdtool/patches/patch-ab
--- a/databases/rrdtool/patches/patch-ab Thu Jul 27 11:21:37 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
Home |
Main Index |
Thread Index |
Old Index