From nobody Wed Aug 03 22:57:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LynLQ2qnTz4Y2p2; Wed, 3 Aug 2022 22:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LynLQ2V1rz3c8r; Wed, 3 Aug 2022 22:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659567438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hClzc3iCAuX5Zu6vakgo4namdsHNPMKayIRKpzM0EXE=; b=wNwrVzzZcR3KhkG8aVYQg8XpFjexZhqt3IkB3BSrbEs7W7chAbx+HDaX9jmWJVPSVQD1qc j8o4LqrVyGDOlySK9/fFT6rPsrXLKC2YaE5TRrFulLW17VEhAEPdtbVwDzFD7R39LAZHTg wdX7N9ntTqtXzs1DPdP0jtW3Y0kYPfJVOxCZXH1jFC5IQzTbK4s26swYmKoF5KUPRHlU92 0DImtXBs8pb10x/IZTU0VJwsTRi9zvCIggDcm3Tn+8VhEQhlyqM1YhPPM0Xwe9mO5iOCMU rHJI/062VMcs79NMeoZLcHg7Q1ltHb6ZT3BTolVHYwC6WJNkT/YsgUx9hPSPuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LynLQ1VHPz17Kf; Wed, 3 Aug 2022 22:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 273MvIV8035262; Wed, 3 Aug 2022 22:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273MvIEc035261; Wed, 3 Aug 2022 22:57:18 GMT (envelope-from git) Date: Wed, 3 Aug 2022 22:57:18 GMT Message-Id: <202208032257.273MvIEc035261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 312867a8ea43 - main - databases/rrdtool: Adopt/Update to 1.8.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 312867a8ea4359ee894678bcdd97c2d3d0c43520 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659567438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hClzc3iCAuX5Zu6vakgo4namdsHNPMKayIRKpzM0EXE=; b=ASvCM8e84RU233/HDFk3L+JV+5kkHipfw3zz2YfOYy+cKsEadH5CVcYV46rmiCH8LWmWsx Ayc/qqcJackKYbmtxr6wgOoY+4vFKjfFwzrFXjC8xgSwWVCC7o++TLDEL72VbhsxkCjfKn 1AcvmreyN46Rkvr5x3OSL0FdDq5zWQnLjTjqrbHFJyfiXtLDe1AURJmPvZOAiHQVP9L6ST tx3eSz9dtdaPJLUnDfQexpMuPNVP1mARn4E/XxSkFyk+4t9CreFk19ESJSfXpXOJ0VJKZw 2JsLw+VJagDx7vuWueKwYk29oSBgmw3ZlzuX/dLPI31V6rnYYIGggtw7l5rvIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659567438; a=rsa-sha256; cv=none; b=EkxJuY07UVvFeOGMO98OeiOHH9XIn1spZQjGAie/ZHeOCnxcJb7YI7QudJnpw1ZAOhGcuS 4Xoiiu508DSF8v+irryVS/MyfYnnDtOh9Cy1uQ1MTdsxI0FyabCnrUw7y4F+diPo2qNez3 9EIb7Na917KesXqgyC6VHvbB++YKlsUoDtnCbZ2OLG9MnGio7zrN95sFLzytIqiizjJXW1 /kUAD3/UVi67tHyx4qB2hXiO6DiO8yDMBZmdkipowDy5R+lbE6i6fisp4040Q3anL7RXK/ /7Zy6KrII2cn0uli1Zoxpj50Uq7ar42eGHW/YxmfVexXHJONuzirSaXRUXgm9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=312867a8ea4359ee894678bcdd97c2d3d0c43520 commit 312867a8ea4359ee894678bcdd97c2d3d0c43520 Author: Nuno Teixeira AuthorDate: 2022-08-03 22:52:20 +0000 Commit: Nuno Teixeira CommitDate: 2022-08-03 22:57:04 +0000 databases/rrdtool: Adopt/Update to 1.8.0 - cleanup Makefile - updated MASTER_SITES - updated WWW url ChangeLog: https://github.com/oetiker/rrdtool-1.x/releases --- databases/rrdtool/Makefile | 119 ++++++++++----------- databases/rrdtool/distinfo | 6 +- databases/rrdtool/files/patch-8829fa7.c | 35 ------ databases/rrdtool/files/patch-bindings-Makefile.in | 21 ---- .../rrdtool/files/patch-bindings_python_setup.py | 6 +- databases/rrdtool/files/patch-configure | 41 +++---- databases/rrdtool/files/patch-doc-Makefile.in | 8 +- databases/rrdtool/files/patch-examples-Makefile.in | 4 +- .../files/patch-examples_rrdcached_Makefile.in | 4 +- .../rrdtool/files/patch-src_rrd__graph__helper.c | 25 ----- databases/rrdtool/files/patch-src_rrd__rpncalc.c | 29 ----- databases/rrdtool/pkg-descr | 2 +- databases/rrdtool/pkg-plist | 11 +- 13 files changed, 100 insertions(+), 211 deletions(-) diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index f164c6457b4c..4d7e0ab8117a 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,87 +1,76 @@ PORTNAME= rrdtool -PORTVERSION= 1.7.2 -PORTREVISION= 6 +DISTVERSION= 1.8.0 CATEGORIES= databases graphics -MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/archive/ +MASTER_SITES= https://github.com/oetiker/rrdtool-1.x/releases/download/v${DISTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Round Robin Database Tools LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= rrdtool12 - -CONFIGURE_ARGS= --disable-tcl -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -USE_RC_SUBR= rrdcached -USE_LDCONFIG= yes -GNU_CONFIGURE= yes USES= cpe gmake gnome libtool pathfix pkgconfig shebangfix +CPE_VENDOR= rrdtool_project USE_GNOME= glib20 libxml2 +USE_LDCONFIG= yes +USE_RC_SUBR= rrdcached +SHEBANG_FILES= examples/rrdcached/rrdcached-size.pl examples/stripes.py +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-tcl + INSTALL_TARGET= install-strip -CPE_VENDOR= rrdtool_project +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 + +CONFLICTS= rrdtool12 PORTEXAMPLES= cgi-demo.cgi -OPTIONS_DEFINE= DEJAVU GRAPH MMAP LOCKTIMEOUT NLS PERL PYTHON \ - RUBY EXAMPLES DOCS -OPTIONS_DEFAULT=DEJAVU GRAPH MMAP PERL -OPTIONS_SUB= yes -GRAPH_DESC= Enable the rrdtool graph command (needs cairo) -DEJAVU_DESC= Use DejaVu fonts (requires X11) -LOCKTIMEOUT_DESC=Enable the patch for lock timeout -MMAP_DESC= Use mmap in rrd_update -PERL_DESC= Build PERL module -PYTHON_DESC= Build PYTHON bindings -RUBY_DESC= Build RUBY bindings - -DEJAVU_RUN_DEPENDS= dejavu>0:x11-fonts/dejavu - -DOCS_CONFIGURE_ENABLE= docs -DOCS_USES= groff - -GRAPH_CONFIGURE_OFF= --disable-rrdcgi --disable-rrd_graph -GRAPH_LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libpng.so:graphics/png -GRAPH_USE= GNOME=cairo,pango -LOCKTIMEOUT_EXTRA_PATCHES=${PATCHDIR}/extra-patch-locktimeout -MMAP_CONFIGURE_ENABLE= mmap -NLS_CONFIGURE_ENABLE= nls -NLS_USE= GNOME=intltool -NLS_USES= gettext localbase -PERL_CONFIGURE_OFF= --disable-perl -PERL_CONFIGURE_ON= --enable-perl --enable-perl-site-install -PERL_MAKE_ARGS= PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"' -PERL_USES= perl5 -PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python -PYTHON_USE= python=flavors,optsuffix -RUBY_CONFIGURE_ENABLE= ruby -RUBY_USE= RUBY=yes - -.include - -.if ${PORT_OPTIONS:MPERL} -SHEBANG_FILES= examples/rrdcached/rrdcached-size.pl -PORTEXAMPLES+= 4charts.pl bigtops.pl minmax.pl perftest.pl \ - piped-demo.pl shared-demo.pl stripes.pl \ - rrdcached/RRDCached.pm rrdcached/rrdcached-size.pl -.endif -.if ${PORT_OPTIONS:MPYTHON} -SHEBANG_FILES+= examples/stripes.py -PORTEXAMPLES+= stripes.py -.endif +OPTIONS_DEFINE= DEJAVU DOCS EXAMPLES GRAPH LOCKTIMEOUT MMAP NLS PERL \ + PYTHON RUBY +OPTIONS_DEFAULT= DEJAVU GRAPH MMAP PERL +OPTIONS_SUB= yes +DEJAVU_DESC= Use DejaVu fonts (requires X11) +GRAPH_DESC= Enable the rrdtool graph command (needs cairo) +LOCKTIMEOUT_DESC= Enable the patch for lock timeout +MMAP_DESC= Use mmap in rrd_update +PERL_DESC= Build PERL module +PYTHON_DESC= Build PYTHON bindings +RUBY_DESC= Build RUBY bindings + +DEJAVU_RUN_DEPENDS= dejavu>0:x11-fonts/dejavu +DOCS_USES= groff +DOCS_CONFIGURE_ENABLE= docs +GRAPH_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libpng.so:graphics/png +GRAPH_USE= GNOME=cairo,pango +GRAPH_CONFIGURE_OFF= --disable-rrd_graph \ + --disable-rrdcgi +LOCKTIMEOUT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-locktimeout +MMAP_CONFIGURE_ENABLE= mmap +NLS_USES= gettext localbase +NLS_USE= GNOME=intltool +NLS_CONFIGURE_ENABLE= nls +PERL_USES= perl5 +PERL_CONFIGURE_ON= --enable-perl \ + --enable-perl-site-install +PERL_CONFIGURE_OFF= --disable-perl +PERL_MAKE_ARGS= PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"' +PERL_PORTEXAMPLES= 4charts.pl bigtops.pl minmax.pl perftest.pl \ + piped-demo.pl rrdcached/rrdcached-size.pl \ + rrdcached/RRDCached.pm shared-demo.pl \ + stripes.pl +PYTHON_USES= python +PYTHON_USE= flavors,optsuffix +PYTHON_CONFIGURE_ENABLE= python +PYTHON_PORTEXAMPLES= stripes.py +RUBY_USE= RUBY=yes +RUBY_CONFIGURE_ENABLE= ruby post-extract: - @${REINPLACE_CMD} -E 's|(^rrdcached_LDADD = librrd_th.la)|\1 $$\(ALL_LIBS\)|' \ - ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \ ${WRKSRC}/src/Makefile.in post-extract-EXAMPLES-off: - @${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \ + @${REINPLACE_CMD} -e '/^DIST_SUBDIRS = /s| examples||' \ ${WRKSRC}/Makefile.in post-install-EXAMPLES-on: diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 8fcb2e23d18a..bb1b542fe402 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657870801 -SHA256 (rrdtool-1.7.2.tar.gz) = a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db -SIZE (rrdtool-1.7.2.tar.gz) = 2883737 +TIMESTAMP = 1659536807 +SHA256 (rrdtool-1.8.0.tar.gz) = bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 +SIZE (rrdtool-1.8.0.tar.gz) = 2955398 diff --git a/databases/rrdtool/files/patch-8829fa7.c b/databases/rrdtool/files/patch-8829fa7.c deleted file mode 100644 index c6406a3f327c..000000000000 --- a/databases/rrdtool/files/patch-8829fa7.c +++ /dev/null @@ -1,35 +0,0 @@ -From 8829fa758f3e585f20094cff69b32489f4cce3e7 Mon Sep 17 00:00:00 2001 -From: Niclas Zeising -Date: Sun, 14 Jun 2020 11:31:33 +0200 -Subject: [PATCH] rrd_open: Ignore EINVAL from posix_fallocate() - -ZFS on FreeBSD (at least) does not support posix_fallocate(), -returning EINVAL instead. Ignore this error and continue normally. -Without this change, it is not possible to resize rrd files on ZFS. - -This fixes #1082 - -Signed-off-by: Niclas Zeising ---- - src/rrd_open.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/rrd_open.c b/src/rrd_open.c -index d8005fe4..00dfb8ca 100644 ---- src/rrd_open.c -+++ src/rrd_open.c -@@ -363,7 +363,13 @@ rrd_file_t *rrd_open( - */ - int fret = - posix_fallocate(rrd_simple_file->fd, 0, newfile_size); -- if (fret) { -+ /* ZFS (on FreeBSD) does not support posix_fallocate(), always returning -+ * EINVAL. Ignore this error and continue anyway. -+ * Without this, resize isn't possible on ZFS filesystems. -+ */ -+ if (fret == EINVAL) { -+ /* DO NOTHING */ -+ } else if (fret) { - rrd_set_error("posix_fallocate '%s': %s", file_name, - rrd_strerror(fret)); - goto out_close; diff --git a/databases/rrdtool/files/patch-bindings-Makefile.in b/databases/rrdtool/files/patch-bindings-Makefile.in deleted file mode 100644 index e5bb6791a9b2..000000000000 --- a/databases/rrdtool/files/patch-bindings-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- bindings/Makefile.in.orig 2016-01-27 17:19:31 UTC -+++ bindings/Makefile.in -@@ -711,15 +711,15 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COM - install-data-local: - $(AM_V_GEN)test -f ${builddir}/perl-piped/Makefile \ - && ( cd ${builddir}/perl-piped \ -- && $(MAKE) install ) \ -+ && $(MAKE) pure_install ) \ - || true - $(AM_V_GEN)test -f ${builddir}/perl-shared/Makefile \ - && ( cd ${builddir}/perl-shared \ -- && $(MAKE) install ) \ -+ && $(MAKE) pure_install ) \ - || true - $(AM_V_GEN)test -f ${builddir}/ruby/Makefile \ - && ( cd ${builddir}/ruby \ -- && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install ) \ -+ && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) install ) \ - || true - $(AM_V_GEN)test -d ${builddir}/python/build \ - && ( cd ${builddir}/python \ diff --git a/databases/rrdtool/files/patch-bindings_python_setup.py b/databases/rrdtool/files/patch-bindings_python_setup.py index 86b777c0429b..c9de9833d087 100644 --- a/databases/rrdtool/files/patch-bindings_python_setup.py +++ b/databases/rrdtool/files/patch-bindings_python_setup.py @@ -1,8 +1,8 @@ ---- bindings/python/setup.py.orig 2017-03-10 18:03:11 UTC +--- bindings/python/setup.py.orig 2022-03-14 14:27:57 UTC +++ bindings/python/setup.py -@@ -1,10 +1,7 @@ - #!/usr/bin/env python +@@ -2,10 +2,7 @@ import sys import os + import sys -try: - from setuptools import setup, Extension diff --git a/databases/rrdtool/files/patch-configure b/databases/rrdtool/files/patch-configure index b56de23d32a7..a1656b431ccf 100644 --- a/databases/rrdtool/files/patch-configure +++ b/databases/rrdtool/files/patch-configure @@ -1,27 +1,27 @@ ---- configure.orig 2017-05-16 11:55:23 UTC +--- configure.orig 2022-03-14 14:29:38 UTC +++ configure -@@ -13698,7 +13698,7 @@ fi +@@ -22491,7 +22491,7 @@ else + if test "${enable_ruby_site_install+set}" = set; then : + enableval=$enable_ruby_site_install; RUBY_MAKE_OPTIONS= + else +- RUBY_MAKE_OPTIONS="sitedir=$langpref/lib/ruby" ++ RUBY_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/ruby" + fi - if test "x$GCC" = "xyes"; then -- for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do -+ for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition; do - oCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $flag" - cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[^A-Za-z]/_/g'` -@@ -22422,9 +22422,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } - $as_echo_n "checking for headers required to compile python extensions... " >&6; } - py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` - py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` --PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python${PYTHON_VERSION}m" - if test "$py_prefix" != "$py_exec_prefix"; then -- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python${PYTHON_VERSION}m" +@@ -23388,9 +23388,9 @@ else + if test -x "$PYTHON_CONFIG"; then + PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null` + else +- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python${PYTHON_VERSION}m" + if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python${PYTHON_VERSION}m" + fi fi - save_CPPFLAGS="$CPPFLAGS" -@@ -27780,18 +27780,6 @@ $as_echo_n "checking in... " >&6; } +@@ -28807,19 +28807,6 @@ $as_echo "and out again" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: and out again" >&5 $as_echo "and out again" >&6; } @@ -37,6 +37,7 @@ -sleep 1 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just kidding ;-)" >&5 -$as_echo " just kidding ;-)" >&6; } - echo +-echo echo "----------------------------------------------------------------" echo "Config is DONE!" + echo diff --git a/databases/rrdtool/files/patch-doc-Makefile.in b/databases/rrdtool/files/patch-doc-Makefile.in index 9fc94f8f7fcf..7e5bdad35605 100644 --- a/databases/rrdtool/files/patch-doc-Makefile.in +++ b/databases/rrdtool/files/patch-doc-Makefile.in @@ -1,9 +1,9 @@ ---- doc/Makefile.in.orig 2016-01-27 10:49:53 UTC +--- doc/Makefile.in.orig 2022-08-03 14:35:20 UTC +++ doc/Makefile.in -@@ -377,9 +377,9 @@ CLEANFILES = $(GENERATED_EXTRADIST) pod2 +@@ -394,9 +394,9 @@ EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrd + EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod \ + rrdpython.pod rrdrados.pod rrdruby.pod - # what should go into the distribution - EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod -idocdir = $(RRDDOCDIR)/txt +idocdir = $(datadir)/doc/rrdtool/txt idoc_DATA = $(POD) $(TXT) diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples-Makefile.in index 864a9633dc20..3096ee59ada4 100644 --- a/databases/rrdtool/files/patch-examples-Makefile.in +++ b/databases/rrdtool/files/patch-examples-Makefile.in @@ -1,6 +1,6 @@ ---- examples/Makefile.in.orig 2016-01-27 10:49:53 UTC +--- examples/Makefile.in.orig 2022-08-03 15:28:50 UTC +++ examples/Makefile.in -@@ -420,7 +420,7 @@ top_builddir = @top_builddir@ +@@ -431,7 +431,7 @@ EXTRA_DIST = cgi-demo.cgi.in stripes.py top_srcdir = @top_srcdir@ SUBDIRS = rrdcached EXTRA_DIST = cgi-demo.cgi.in stripes.py diff --git a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in index a14b3bbeb369..881e2576114c 100644 --- a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in +++ b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in @@ -1,6 +1,6 @@ ---- examples/rrdcached/Makefile.in.orig 2016-01-27 10:49:53 UTC +--- examples/rrdcached/Makefile.in.orig 2022-08-03 15:28:50 UTC +++ examples/rrdcached/Makefile.in -@@ -356,7 +356,7 @@ target_vendor = @target_vendor@ +@@ -368,7 +368,7 @@ top_srcdir = @top_srcdir@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/databases/rrdtool/files/patch-src_rrd__graph__helper.c b/databases/rrdtool/files/patch-src_rrd__graph__helper.c deleted file mode 100644 index 45167a881a9b..000000000000 --- a/databases/rrdtool/files/patch-src_rrd__graph__helper.c +++ /dev/null @@ -1,25 +0,0 @@ -Backport of: - -commit 254e4e44cd7828fba8f5bb18a7a29668221e0af5 -Author: John W. O'Brien -Date: Sat Mar 14 08:49:47 2020 -0400 - - Fix double meaning of time 0 as uninitialized value - - Treat "VRULE:0#..." as "VRULE:1#..." because elsewhere xrule==0 is - used to mean xrule has not been set, which can lead to an array - bounds violation. - ---- src/rrd_graph_helper.c.orig 2020-03-14 17:06:47 UTC -+++ src/rrd_graph_helper.c -@@ -776,6 +776,10 @@ static graph_desc_t* newGraphDescription(image_desc_t - } - if (gf==GF_VRULE){ - gdp->xrule=val; -+ if (gdp->xrule == 0) { -+ /* distinguish from uninitialized */ -+ gdp->xrule++; -+ } - } - else { - gdp->yrule=val; diff --git a/databases/rrdtool/files/patch-src_rrd__rpncalc.c b/databases/rrdtool/files/patch-src_rrd__rpncalc.c deleted file mode 100644 index 3a093028da16..000000000000 --- a/databases/rrdtool/files/patch-src_rrd__rpncalc.c +++ /dev/null @@ -1,29 +0,0 @@ -Fix UB when calculating median of all-NaN values - -Corresponds to upstream commit 1d700bf - -https://github.com/oetiker/rrdtool-1.x/commit/1d700bf3ba13a75b91047e6e979231abd755892b - ---- src/rrd_rpncalc.c.orig 2019-05-27 18:48:09 UTC -+++ src/rrd_rpncalc.c -@@ -1197,15 +1197,16 @@ short rpn_calc( - } - } - -+ /* when goodvals and badvals meet, they might have met on a -+ * NAN, which wouldn't decrease final_elements. so, check -+ * that now. */ -+ if (isnan(*goodvals)) --final_elements; -+ - stptr -= elements; - if (!final_elements) { - /* no non-NAN elements; push NAN */ - rpnstack->s[++stptr] = DNAN; - } else { -- /* when goodvals and badvals meet, they might have met on a -- * NAN, which wouldn't decrease final_elements. so, check -- * that now. */ -- if (isnan(*goodvals)) --final_elements; - /* and finally, take the median of the remaining non-NAN - * elements. */ - qsort(element_ptr, final_elements, sizeof(double), diff --git a/databases/rrdtool/pkg-descr b/databases/rrdtool/pkg-descr index 2d47a2220ffc..94a6f6a972f0 100644 --- a/databases/rrdtool/pkg-descr +++ b/databases/rrdtool/pkg-descr @@ -7,4 +7,4 @@ all kinds of data-sources. The data analysis part of RRDtool is based on the ability to quickly generate graphical representations of the data values collected over a definable time period. -WWW: http://www.rrdtool.org/ +WWW: https://oss.oetiker.ch/rrdtool/ diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist index fc684ee34b53..5b7a086f9640 100644 --- a/databases/rrdtool/pkg-plist +++ b/databases/rrdtool/pkg-plist @@ -10,12 +10,13 @@ include/rrd_format.h lib/librrd.a lib/librrd.so lib/librrd.so.8 -lib/librrd.so.8.2.1 +lib/librrd.so.8.3.0 %%PERL%%%%SITE_PERL%%/RRDp.pm %%PERL%%%%SITE_ARCH%%/RRDs.pm %%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so %%PERL%%%%PERL5_MAN3%%/RRDp.3.gz %%PERL%%%%PERL5_MAN3%%/RRDs.3.gz +%%PERL%%lib/perllocal.pod %%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool%%PYTHON_EXT_SUFFIX%%.so %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so @@ -42,8 +43,10 @@ libdata/pkgconfig/librrd.pc %%PORTDOCS%%man/man1/rrdlast.1.gz %%PORTDOCS%%man/man1/rrdlastupdate.1.gz %%PORTDOCS%%man/man1/rrdlist.1.gz +%%PYTHON%%man/man1/rrdpython.1.gz %%PORTDOCS%%man/man1/rrdresize.1.gz %%PORTDOCS%%man/man1/rrdrestore.1.gz +%%RUBY%%man/man1/rrdruby.1.gz %%PORTDOCS%%man/man1/rrdthreads.1.gz %%PORTDOCS%%man/man1/rrdtool.1.gz %%PORTDOCS%%man/man1/rrdtune.1.gz @@ -77,8 +80,10 @@ libdata/pkgconfig/librrd.pc %%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdlist.html +%%PYTHON%%%%DOCSDIR%%/html/rrdpython.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html +%%RUBY%%%%DOCSDIR%%/html/rrdruby.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html %%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html @@ -130,10 +135,14 @@ libdata/pkgconfig/librrd.pc %%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt %%PORTDOCS%%%%DOCSDIR%%/txt/rrdlist.pod %%PORTDOCS%%%%DOCSDIR%%/txt/rrdlist.txt +%%PYTHON%%%%DOCSDIR%%/txt/rrdpython.pod +%%PYTHON%%%%DOCSDIR%%/txt/rrdpython.txt %%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod %%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt %%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod %%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt +%%RUBY%%%%DOCSDIR%%/txt/rrdruby.pod +%%RUBY%%%%DOCSDIR%%/txt/rrdruby.txt %%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod %%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt %%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod