CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 23 Aug 2024 17:48:51 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug 23 17:48:50 UTC 2024

Modified Files:
        pkgsrc/databases/py-rrdtool: Makefile PLIST distinfo
        pkgsrc/databases/rrdtool: Makefile Makefile.common distinfo
        pkgsrc/databases/rrdtool/patches: patch-configure
        pkgsrc/databases/ruby-rrdtool: Makefile distinfo
Added Files:
        pkgsrc/databases/rrdtool/patches: patch-src_compat-cloexec.c
            patch-src_compat-cloexec.h
Removed Files:
        pkgsrc/databases/rrdtool/patches: patch-const-argv.patch

Log Message:
rrdtool py-rrdtool ruby-rrdtool: updated to 1.9.0

RRDtool 1.9.0

Bugfixes

Fix ytop and ybase adjustments for overlaping area issue on transparent areas @turban
Suppress warnings of implicit fall through @youpong
Update tarball download link in doc @c72578
Fix unsigned integer overflow in rrdtool first. Add test for rrd_first() @c72578
Fix tests under MSYS2 (Windows) @c72578
Fix BUILD_DATE in rrdtool help output @c72578
acinclude.m4: Include <stdlib.h> when using exit @ryandesign
rrdtool-release: Create NUMVERS from VERSION file @c72578
Avoids leaking of file descriptors in multi threaded programs by @ensc
Avoids potential unterminated string because of fixed PATH_MAX buffer
Fix extra reference of parameters of rrd_fetch_dbi_{long,double} @jamborm

Features

Remove autogenerated files from git repo (configure, Makefile.in, conftools, rrd_config.h.in)

Reads $RRD_LOCKING environment variable and adds --locking option to some tools. The updatex api has been also
updated to support setting locking related bits in its extra_flags parameter. @ensc

This allows now to choose between three kinds of locking:

none: no locking is done at all; caller has to do it manually and can implement e.g., a timeout with alarm(2) or so
try: fails when lock is hold by another process; users will see "ERROR: could not lock RRD". This is the default and the only possible mode with the old code
 block: waits until lock is available.

It can be used like
env RRD_LOCKING=block rrdupdate ...
or
rrdupdate --locking none ...
or
rrd_updatex_r(filename, tmplt, RRD_FLAGS_LOCKING_MODE_BLOCK, ...);

Add (remote) dump support to rrdcached @thz

Constify argv argument to library functions
Without this, users of library function that want to pass in const strings need to duplicate them to avoid compiler warnings

Avoid multiple implementations of asprintf
The locale-independent rrd_asprintf is equivalent to platform-provided snprintf when strings and integers are formatted.
There is no user of vasprintf-msvc that is locale-dependent, therefore this implementation can be replaced with rrd_vasprintf.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/py-rrdtool/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/py-rrdtool/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/py-rrdtool/distinfo
cvs rdiff -u -r1.160 -r1.161 pkgsrc/databases/rrdtool/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/rrdtool/Makefile.common
cvs rdiff -u -r1.61 -r1.62 pkgsrc/databases/rrdtool/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/rrdtool/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/rrdtool/patches/patch-const-argv.patch
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.c \
    pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.h
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/ruby-rrdtool/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/ruby-rrdtool/distinfo

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

Modified files:

Index: pkgsrc/databases/py-rrdtool/Makefile
diff -u pkgsrc/databases/py-rrdtool/Makefile:1.24 pkgsrc/databases/py-rrdtool/Makefile:1.25
--- pkgsrc/databases/py-rrdtool/Makefile:1.24   Wed May 29 16:31:52 2024
+++ pkgsrc/databases/py-rrdtool/Makefile        Fri Aug 23 17:48:50 2024
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2024/05/29 16:31:52 adam Exp $
+# $NetBSD: Makefile,v 1.25 2024/08/23 17:48:50 adam Exp $
 
-PKGREVISION= 7
 .include "../../databases/rrdtool/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 
-EGG_NAME=      rrdtool-0.1.10
+WHEEL_NAME=    rrdtool-0.1.10
+
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
 EXTRACT_ELEMENTS=      ${DISTNAME}/bindings/python ${DISTNAME}/src
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/bindings/python
@@ -15,5 +17,5 @@ pre-configure:
        ${RM} ${WRKDIR}/${DISTNAME}/src/rrd_config.h
 
 .include "../../databases/rrdtool/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-rrdtool/PLIST
diff -u pkgsrc/databases/py-rrdtool/PLIST:1.1 pkgsrc/databases/py-rrdtool/PLIST:1.2
--- pkgsrc/databases/py-rrdtool/PLIST:1.1       Thu Jul 27 18:31:20 2017
+++ pkgsrc/databases/py-rrdtool/PLIST   Fri Aug 23 17:48:50 2024
@@ -1,6 +1,7 @@
-@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
+@comment $NetBSD: PLIST,v 1.2 2024/08/23 17:48:50 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/rrdtool.so

Index: pkgsrc/databases/py-rrdtool/distinfo
diff -u pkgsrc/databases/py-rrdtool/distinfo:1.6 pkgsrc/databases/py-rrdtool/distinfo:1.7
--- pkgsrc/databases/py-rrdtool/distinfo:1.6    Fri Nov 25 10:41:15 2022
+++ pkgsrc/databases/py-rrdtool/distinfo        Fri Aug 23 17:48:50 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/11/25 10:41:15 adam Exp $
+$NetBSD: distinfo,v 1.7 2024/08/23 17:48:50 adam Exp $
 
-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
+BLAKE2s (rrdtool-1.9.0.tar.gz) = e15783e13e6a500473792f01c92dd4911d3f06d861eaf6f2f7edd1af634b5ad5
+SHA512 (rrdtool-1.9.0.tar.gz) = ebeb1fd9e1eed8e01d4d08a4f07aa22c272cc95ac87852f81a892690e6f446b5398bf64689ea99622779cba490722d97b325bda2d2a6d4dfc0719929b2a4c041
+Size (rrdtool-1.9.0.tar.gz) = 2972593 bytes

Index: pkgsrc/databases/rrdtool/Makefile
diff -u pkgsrc/databases/rrdtool/Makefile:1.160 pkgsrc/databases/rrdtool/Makefile:1.161
--- pkgsrc/databases/rrdtool/Makefile:1.160     Wed May 29 16:31:53 2024
+++ pkgsrc/databases/rrdtool/Makefile   Fri Aug 23 17:48:50 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.160 2024/05/29 16:31:53 adam Exp $
+# $NetBSD: Makefile,v 1.161 2024/08/23 17:48:50 adam Exp $
 
-PKGREVISION= 9
 .include "Makefile.common"
 
 DEPENDS+=              dejavu-ttf>=2.26:../../fonts/dejavu-ttf

Index: pkgsrc/databases/rrdtool/Makefile.common
diff -u pkgsrc/databases/rrdtool/Makefile.common:1.7 pkgsrc/databases/rrdtool/Makefile.common:1.8
--- pkgsrc/databases/rrdtool/Makefile.common:1.7        Fri Nov 25 10:42:15 2022
+++ pkgsrc/databases/rrdtool/Makefile.common    Fri Aug 23 17:48:50 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2022/11/25 10:42:15 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/08/23 17:48:50 adam Exp $
 # used by databases/rrdtool/Makefile
 # used by databases/py-rrdtool/Makefile
 # used by databases/ruby-rrdtool/Makefile
 
-DISTNAME=      rrdtool-1.8.0
+DISTNAME=      rrdtool-1.9.0
 CATEGORIES=    databases graphics net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=oetiker/}
 GITHUB_PROJECT=        rrdtool-1.x

Index: pkgsrc/databases/rrdtool/distinfo
diff -u pkgsrc/databases/rrdtool/distinfo:1.61 pkgsrc/databases/rrdtool/distinfo:1.62
--- pkgsrc/databases/rrdtool/distinfo:1.61      Tue Jun 18 11:48:40 2024
+++ pkgsrc/databases/rrdtool/distinfo   Fri Aug 23 17:48:50 2024
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.61 2024/06/18 11:48:40 markd Exp $
+$NetBSD: distinfo,v 1.62 2024/08/23 17:48:50 adam Exp $
 
-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
+BLAKE2s (rrdtool-1.9.0.tar.gz) = e15783e13e6a500473792f01c92dd4911d3f06d861eaf6f2f7edd1af634b5ad5
+SHA512 (rrdtool-1.9.0.tar.gz) = ebeb1fd9e1eed8e01d4d08a4f07aa22c272cc95ac87852f81a892690e6f446b5398bf64689ea99622779cba490722d97b325bda2d2a6d4dfc0719929b2a4c041
+Size (rrdtool-1.9.0.tar.gz) = 2972593 bytes
 SHA1 (patch-bindings_perl-shared_Makefile.PL) = 839b4474e89b59002d1629425c5839e4df3b8f5c
 SHA1 (patch-bindings_tcl_Makefile.in) = 0d2515d57ca6a541d1647308d55587046a0a80e8
-SHA1 (patch-configure) = faa3f68ccc6e564e363a63b0468af0c33218e054
-SHA1 (patch-const-argv.patch) = 6a0c081b1df3bd93eae91d15492e1639cb14d628
+SHA1 (patch-configure) = 1766cb47d89b1134c6d3e98279e90c4b823444d8
 SHA1 (patch-doc_Makefile.in) = 749309b6532fff991a89c317a57e24f91a2804d1
 SHA1 (patch-examples_Makefile.in) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
 SHA1 (patch-examples_rrdcached_Makefile.in) = be06ac61b314e225d62f9f27da28c24fb6a1b84b
+SHA1 (patch-src_compat-cloexec.c) = bf38548c453b8896394542717d1db75f5e25e431
+SHA1 (patch-src_compat-cloexec.h) = 69affed811fff14c332b5275c9c244142510e1b7
 SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
 SHA1 (patch-src_rrd__cgi.c) = f2004681d9d430b6d347627e029ce3c7a717bcd6
 SHA1 (patch-src_rrd__graph.c) = deed6d90fec23a9b400104da605a859436d2c2d9

Index: pkgsrc/databases/rrdtool/patches/patch-configure
diff -u pkgsrc/databases/rrdtool/patches/patch-configure:1.1 pkgsrc/databases/rrdtool/patches/patch-configure:1.2
--- pkgsrc/databases/rrdtool/patches/patch-configure:1.1        Tue Jun 18 11:48:40 2024
+++ pkgsrc/databases/rrdtool/patches/patch-configure    Fri Aug 23 17:48:50 2024
@@ -1,27 +1,27 @@
-$NetBSD: patch-configure,v 1.1 2024/06/18 11:48:40 markd Exp $
+$NetBSD: patch-configure,v 1.2 2024/08/23 17:48:50 adam Exp $
 
-    Fixes:
+Fixes:
     
-    conftest.c:124:33: error: implicitly declaring library function 'exit'
-    with type 'void (int) __attribute__((noreturn))'
+conftest.c:124:33: error: implicitly declaring library function 'exit'
+with type 'void (int) __attribute__((noreturn))'
 
 From fedora.
 
---- configure.orig     2022-03-14 14:29:38.000000000 +0000
+--- configure.orig     2024-07-29 08:43:16.000000000 +0000
 +++ configure
-@@ -19223,6 +19223,7 @@ else
-   gq_cv_have_tm_gmtoff=no
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -19572,6 +19572,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ $as_echo_n "checking if ctime_r need special care to act posixly correct... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include <stdlib.h>
  #include <time.h>
-                                 #include <$ac_cv_struct_tm>
- 
-@@ -19255,6 +19256,7 @@ else
-   gq_cv_have___tm_gmtoff=no
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ int
+ main ()
+@@ -19585,6 +19586,7 @@ if ac_fn_c_try_link "$LINENO"; then :
+    CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include <stdlib.h>
  #include <time.h>
-                                 #include <$ac_cv_struct_tm>
- 
+ int
+ main ()

Index: pkgsrc/databases/ruby-rrdtool/Makefile
diff -u pkgsrc/databases/ruby-rrdtool/Makefile:1.45 pkgsrc/databases/ruby-rrdtool/Makefile:1.46
--- pkgsrc/databases/ruby-rrdtool/Makefile:1.45 Wed May 29 16:31:53 2024
+++ pkgsrc/databases/ruby-rrdtool/Makefile      Fri Aug 23 17:48:50 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.45 2024/05/29 16:31:53 adam Exp $
+# $NetBSD: Makefile,v 1.46 2024/08/23 17:48:50 adam Exp $
 
-PKGREVISION= 7
 .include "../../databases/rrdtool/Makefile.common"
 
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}

Index: pkgsrc/databases/ruby-rrdtool/distinfo
diff -u pkgsrc/databases/ruby-rrdtool/distinfo:1.12 pkgsrc/databases/ruby-rrdtool/distinfo:1.13
--- pkgsrc/databases/ruby-rrdtool/distinfo:1.12 Fri Nov 25 10:41:15 2022
+++ pkgsrc/databases/ruby-rrdtool/distinfo      Fri Aug 23 17:48:50 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2022/11/25 10:41:15 adam Exp $
+$NetBSD: distinfo,v 1.13 2024/08/23 17:48:50 adam Exp $
 
-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
+BLAKE2s (rrdtool-1.9.0.tar.gz) = e15783e13e6a500473792f01c92dd4911d3f06d861eaf6f2f7edd1af634b5ad5
+SHA512 (rrdtool-1.9.0.tar.gz) = ebeb1fd9e1eed8e01d4d08a4f07aa22c272cc95ac87852f81a892690e6f446b5398bf64689ea99622779cba490722d97b325bda2d2a6d4dfc0719929b2a4c041
+Size (rrdtool-1.9.0.tar.gz) = 2972593 bytes
 SHA1 (patch-extconf.rb) = 18cce3cb95afd81ea30c03bad4e2a1717c7ab982

Added files:

Index: pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.c
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.c:1.1
--- /dev/null   Fri Aug 23 17:48:51 2024
+++ pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.c Fri Aug 23 17:48:50 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_compat-cloexec.c,v 1.1 2024/08/23 17:48:50 adam Exp $
+
+compat-cloexec: fix HAVE_DECL checks
+https://github.com/oetiker/rrdtool-1.x/pull/1262
+
+--- src/compat-cloexec.c.orig  2024-08-23 17:39:47.399776198 +0000
++++ src/compat-cloexec.c
+@@ -17,7 +17,7 @@
+ 
+ inline static bool have_decl_o_cloexec(void)
+ {
+-#ifdef HAVE_DECL_O_CLOEXEC
++#if defined(HAVE_DECL_O_CLOEXEC) && HAVE_DECL_O_CLOEXEC
+       return true;
+ #else
+       return false;
Index: pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.h
diff -u /dev/null pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.h:1.1
--- /dev/null   Fri Aug 23 17:48:51 2024
+++ pkgsrc/databases/rrdtool/patches/patch-src_compat-cloexec.h Fri Aug 23 17:48:50 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_compat-cloexec.h,v 1.1 2024/08/23 17:48:50 adam Exp $
+
+compat-cloexec: fix HAVE_DECL checks
+https://github.com/oetiker/rrdtool-1.x/pull/1262
+
+--- src/compat-cloexec.h.orig  2024-08-23 17:40:58.302086420 +0000
++++ src/compat-cloexec.h
+@@ -3,11 +3,11 @@
+ 
+ #include <rrd_config.h>
+ 
+-#ifndef HAVE_DECL_O_CLOEXEC
++#if !defined(HAVE_DECL_O_CLOEXEC) || !HAVE_DECL_O_CLOEXEC
+ #  define O_CLOEXEC 0
+ #endif
+ 
+-#ifndef HAVE_DECL_SOCK_CLOEXEC
++#if !defined(HAVE_DECL_SOCK_CLOEXEC) || !HAVE_DECL_SOCK_CLOEXEC
+ #  define SOCK_CLOEXEC 0
+ #endif
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/ndpi
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/ndpi
Indexes:

Home | Main Index | Thread Index | Old Index