CVS commit: pkgsrc/sysutils/collectd-web

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/collectd-web
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 6 Dec 2025 22:24:29 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec  6 22:24:29 UTC 2025

Modified Files:
        pkgsrc/sysutils/collectd-web: DESCR Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/collectd-web/files: collectd-web.conf
        pkgsrc/sysutils/collectd-web/patches:
            patch-cgi-bin_collection.modified.cgi

Log Message:
collectd-web: update to 0.11.10.

9 years of updates.

While here, add config file and wrapper for included Python HTTP
server.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/collectd-web/DESCR \
    pkgsrc/sysutils/collectd-web/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/collectd-web/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/collectd-web/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/collectd-web/files/collectd-web.conf
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/collectd-web/patches/patch-cgi-bin_collection.modified.cgi

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

Modified files:

Index: pkgsrc/sysutils/collectd-web/DESCR
diff -u pkgsrc/sysutils/collectd-web/DESCR:1.1 pkgsrc/sysutils/collectd-web/DESCR:1.2
--- pkgsrc/sysutils/collectd-web/DESCR:1.1      Sat Oct 24 22:39:48 2020
+++ pkgsrc/sysutils/collectd-web/DESCR  Sat Dec  6 22:24:28 2025
@@ -1,6 +1,6 @@
-The main objective of this is to develop an easy to use and
-customizable web interface for Collectd (Resource monitoring
-software). Two days of research where enough to realize that collectd
-didn't have a real frontend and the one bundled with the backend
-was really made for testing purposes, so much of the usability and
-strength of statistics was left aside.
+Collectd-web provides a sleek, intuitive, and customizable web
+interface for Collectd - the robust resource monitoring tool.
+Originally, Collectd's bundled frontend was designed only for
+testing, leaving its full potential untapped. Collectd-web bridges
+that gap by offering an efficient, user-centered experience for
+monitoring system statistics.
Index: pkgsrc/sysutils/collectd-web/PLIST
diff -u pkgsrc/sysutils/collectd-web/PLIST:1.1 pkgsrc/sysutils/collectd-web/PLIST:1.2
--- pkgsrc/sysutils/collectd-web/PLIST:1.1      Sat Oct 24 22:39:48 2020
+++ pkgsrc/sysutils/collectd-web/PLIST  Sat Dec  6 22:24:28 2025
@@ -1,25 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1 2020/10/24 22:39:48 wiz Exp $
-share/collectd-web/.gitignore
-share/collectd-web/.project
-share/collectd-web/.pydevproject
-share/collectd-web/AUTHORS
-share/collectd-web/CHANGELOG
-share/collectd-web/COPYING
-share/collectd-web/README.rst
+@comment $NetBSD: PLIST,v 1.2 2025/12/06 22:24:28 wiz Exp $
+bin/collectd-web.sh
+share/collectd-web/LICENSE
+share/collectd-web/README.md
 share/collectd-web/cgi-bin/.htaccess
 share/collectd-web/cgi-bin/check_perl_modules.pl
 share/collectd-web/cgi-bin/collection.modified.cgi
 share/collectd-web/cgi-bin/graphdefs.cgi
 share/collectd-web/cgi-bin/time.cgi
+share/collectd-web/cgi-bin/versions.pl
 share/collectd-web/check_deps.sh
-share/collectd-web/docs/Makefile
-share/collectd-web/docs/conf.py
-share/collectd-web/docs/index.rst
-share/collectd-web/docs/make.bat
-share/collectd-web/docs/setup.rst
-share/collectd-web/docs/usage.rst
+share/collectd-web/debian/changelog
+share/collectd-web/debian/collectd-web.nginx.conf
+share/collectd-web/debian/compat
+share/collectd-web/debian/control
+share/collectd-web/debian/copyright
+share/collectd-web/debian/docs
+share/collectd-web/debian/install
+share/collectd-web/debian/out/.gitkeep
+share/collectd-web/debian/postinst
+share/collectd-web/debian/prerm
+share/collectd-web/debian/rules
+share/collectd-web/debian/services/collectd-web
+share/collectd-web/debian/services/collectd-web.service
+share/collectd-web/debian/source/format
+share/collectd-web/docs/ui.png
 share/collectd-web/index.html
-share/collectd-web/iphone/index.html
 share/collectd-web/media/css/base.css
 share/collectd-web/media/css/blueprint/ie.css
 share/collectd-web/media/css/blueprint/plugins/buttons/icons/cross.png
@@ -76,43 +81,6 @@ share/collectd-web/media/images/shortcut
 share/collectd-web/media/jqtouch/.htaccess
 share/collectd-web/media/jqtouch/LICENSE.txt
 share/collectd-web/media/jqtouch/README.txt
-share/collectd-web/media/jqtouch/demos/clock/clock.css
-share/collectd-web/media/jqtouch/demos/clock/icon.png
-share/collectd-web/media/jqtouch/demos/clock/img/face.png
-share/collectd-web/media/jqtouch/demos/clock/img/hour.png
-share/collectd-web/media/jqtouch/demos/clock/img/minute.png
-share/collectd-web/media/jqtouch/demos/clock/img/second.png
-share/collectd-web/media/jqtouch/demos/clock/img/startup.png
-share/collectd-web/media/jqtouch/demos/clock/index.html
-share/collectd-web/media/jqtouch/demos/customanimation/index.html
-share/collectd-web/media/jqtouch/demos/customanimation/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/customanimation/jqtouch.png
-share/collectd-web/media/jqtouch/demos/customanimation2/index.html
-share/collectd-web/media/jqtouch/demos/customanimation2/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/customanimation2/jqtouch.png
-share/collectd-web/media/jqtouch/demos/ext_autotitles/index.html
-share/collectd-web/media/jqtouch/demos/ext_autotitles/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/ext_autotitles/jqtouch.png
-share/collectd-web/media/jqtouch/demos/ext_floaty/index.html
-share/collectd-web/media/jqtouch/demos/ext_floaty/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/ext_floaty/jqtouch.png
-share/collectd-web/media/jqtouch/demos/ext_location/index.html
-share/collectd-web/media/jqtouch/demos/ext_location/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/ext_location/jqtouch.png
-share/collectd-web/media/jqtouch/demos/ext_offline/.htaccess
-share/collectd-web/media/jqtouch/demos/ext_offline/cache.manifest
-share/collectd-web/media/jqtouch/demos/ext_offline/index.html
-share/collectd-web/media/jqtouch/demos/ext_offline/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/ext_offline/jqtouch.png
-share/collectd-web/media/jqtouch/demos/ext_offline/sample.htaccess
-share/collectd-web/media/jqtouch/demos/main/ajax.html
-share/collectd-web/media/jqtouch/demos/main/ajax_post.php
-share/collectd-web/media/jqtouch/demos/main/index.html
-share/collectd-web/media/jqtouch/demos/main/jqt_startup.png
-share/collectd-web/media/jqtouch/demos/main/jqtouch.png
-share/collectd-web/media/jqtouch/demos/todo/icon.png
-share/collectd-web/media/jqtouch/demos/todo/index.html
-share/collectd-web/media/jqtouch/demos/todo/startup.png
 share/collectd-web/media/jqtouch/extensions/jqt.autotitles.js
 share/collectd-web/media/jqtouch/extensions/jqt.floaty.js
 share/collectd-web/media/jqtouch/extensions/jqt.location.js
@@ -188,4 +156,9 @@ share/collectd-web/media/libs/backbone.j
 share/collectd-web/media/libs/backbone.localStorage.js
 share/collectd-web/media/libs/json2.js
 share/collectd-web/media/libs/underscore.js
+share/collectd-web/mobile/index.html
+share/collectd-web/requirements.txt
 share/collectd-web/runserver.py
+share/collectd-web/scripts/tap2md.py
+share/collectd-web/t/time_cgi.t
+share/examples/collectd-web/collectd-web.conf

Index: pkgsrc/sysutils/collectd-web/Makefile
diff -u pkgsrc/sysutils/collectd-web/Makefile:1.9 pkgsrc/sysutils/collectd-web/Makefile:1.10
--- pkgsrc/sysutils/collectd-web/Makefile:1.9   Fri Jul  4 08:48:06 2025
+++ pkgsrc/sysutils/collectd-web/Makefile       Sat Dec  6 22:24:28 2025
@@ -1,41 +1,58 @@
-# $NetBSD: Makefile,v 1.9 2025/07/04 08:48:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/12/06 22:24:28 wiz Exp $
 
-DISTNAME=      collectd-web-0.4.1
-PKGREVISION=   8
+DISTNAME=      collectd-web-0.11.10
 CATEGORIES=    sysutils
-GITHUB_PROJECT=        collectd-web
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=httpdss/}
-EXTRACT_SUFX=  .zip
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    kethzer.dr%gmail.com@localhost
 HOMEPAGE=      https://github.com/httpdss/collectd-web
 COMMENT=       Web interface for Collectd
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      fcgiwrap>=1.1.0:../../www/fcgiwrap
-DEPENDS+=      spawn-fcgi>=1.6.3:../../www/spawn-fcgi
-DEPENDS+=      p5-HTTP-Parser>=0.06:../../www/p5-HTTP-Parser
+# needs RRDs perl module
+DEPENDS+=      rrdtool>=0:../../databases/rrdtool
+# needs data in RRD format
+DEPENDS+=      collectd-rrdtool>=0:../../sysutils/collectd-rrdtool
 DEPENDS+=      p5-JSON>=2.94:../../converters/p5-JSON
-DEPENDS+=      p5-RRD-Simple>=1.44:../../databases/p5-RRD-Simple
 DEPENDS+=      p5-CGI>=4.36:../../www/p5-CGI
-#DEPENDS+=     cgic>=2.02:../../www/cgic
-#DEPENDS+=     fcgi>=2.4.0:../../www/fcgi
+DEPENDS+=      ${PYPKGPREFIX}-dotenv-[0-9]*:../../devel/py-dotenv
+# only needed in some instances, not when using the Python server
+#DEPENDS+=     fcgiwrap>=1.1.0:../../www/fcgiwrap
+#DEPENDS+=     spawn-fcgi>=1.6.3:../../www/spawn-fcgi
 
 NO_BUILD=              yes
 USE_TOOLS+=            pax perl:run
 REPLACE_PERL+=         cgi-bin/*.pl
 REPLACE_PERL+=         cgi-bin/*.cgi
 REPLACE_SH+=           check_deps.sh
+REPLACE_SH+=           debian/prerm
 REPLACE_PYTHON+=       runserver.py
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}
+SUBST_CLASSES+=                config
+SUBST_SED.config+=     -e "s,/etc/collectd/collection.conf,${PKG_SYSCONFDIR}/collectd-web.conf,"
+SUBST_FILES.config+=   cgi-bin/collection.modified.cgi
+SUBST_MESSAGE.config=  Using config file ${PREFIX}/etc/collectd-web.conf
+SUBST_STAGE.config=    pre-configure
+
 USE_LANGUAGES= # none
 
+INSTALLATION_DIRS+=    bin share/examples/collectd-web
+CONF_FILES+=           share/examples/collectd-web/collectd-web.conf \
+                       ${PKG_SYSCONFDIR}/collectd-web.conf
+
+# configure target is needed, otherwise REPLACE_* do not happen
+# use it for generating a script
 do-configure:
-       # empty target is needed, otherwise REPLACE_* do not happen
+       ${ECHO} "#!/bin/sh" > ${WRKDIR}/collectd-web.sh
+       ${ECHO} "cd ${PREFIX}/share/collectd-web" >> ${WRKDIR}/collectd-web.sh
+       ${ECHO} "${PYTHONBIN} runserver.py \"\$$@\"" >> ${WRKDIR}/collectd-web.sh
 
 do-install:
-       cd ${WRKSRC} && pax -rw -pp . ${DESTDIR}${PREFIX}/share/collectd-web
+       cd ${WRKSRC} && pax -rw -pp [A-Za-z]* ${DESTDIR}${PREFIX}/share/collectd-web
+       ${RM} ${DESTDIR}${PREFIX}/share/collectd-web/cgi-bin/collection.modified.cgi.orig
+       ${INSTALL_SCRIPT} ${WRKDIR}/collectd-web.sh ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${FILESDIR}/collectd-web.conf ${DESTDIR}${PREFIX}/share/examples/collectd-web
 
 .include "../../lang/perl5/module.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/sysutils/collectd-web/distinfo
diff -u pkgsrc/sysutils/collectd-web/distinfo:1.3 pkgsrc/sysutils/collectd-web/distinfo:1.4
--- pkgsrc/sysutils/collectd-web/distinfo:1.3   Tue Oct 26 11:19:26 2021
+++ pkgsrc/sysutils/collectd-web/distinfo       Sat Dec  6 22:24:28 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:19:26 nia Exp $
+$NetBSD: distinfo,v 1.4 2025/12/06 22:24:28 wiz Exp $
 
-BLAKE2s (collectd-web-0.4.1.zip) = b2adcb79fcac54be24fae15ab9d1521fdb7e135a5483f0eac3e804fc544396c5
-SHA512 (collectd-web-0.4.1.zip) = 836d5b9b8fe7e89797c5ce08d216e39d513fe15791a642b9c42b54e1b49d6be2af257d9270b377ad4a288bccf0092dbfdade65ac56c0c4e6418df0c271291a16
-Size (collectd-web-0.4.1.zip) = 979647 bytes
+BLAKE2s (collectd-web-0.11.10.tar.gz) = e459f011168a312f5b1a826365c78b38ee1370d3bb842744dc3d19c3ee010909
+SHA512 (collectd-web-0.11.10.tar.gz) = 0d99d73f0ed089b17738176a15a357a45fd2c5400da61a5e8d8298bae7cd37924083f17dcd10aa6e61e487d371c90303f1c486d773e24a0a3b9f87c5cdac654a
+Size (collectd-web-0.11.10.tar.gz) = 912958 bytes
+SHA1 (patch-cgi-bin_collection.modified.cgi) = 260088618938a76b0b679320e5c23bda2843b004

Added files:

Index: pkgsrc/sysutils/collectd-web/files/collectd-web.conf
diff -u /dev/null pkgsrc/sysutils/collectd-web/files/collectd-web.conf:1.1
--- /dev/null   Sat Dec  6 22:24:29 2025
+++ pkgsrc/sysutils/collectd-web/files/collectd-web.conf        Sat Dec  6 22:24:28 2025
@@ -0,0 +1,12 @@
+# This plugin needs the data in rrdtool format, so that plugin
+# must be enabled in the collectd configuration.
+#
+# Also, the path below needs to be the same path that is configured
+# in the collectd config as data directory for the rrdtool plugin,
+# e.g.:
+#
+# <Plugin rrdtool>
+#        DataDir "/var/db/collectd/rrd"
+# </Plugin>
+#
+datadir: "/var/db/collectd/rrd/"

Index: pkgsrc/sysutils/collectd-web/patches/patch-cgi-bin_collection.modified.cgi
diff -u /dev/null pkgsrc/sysutils/collectd-web/patches/patch-cgi-bin_collection.modified.cgi:1.1
--- /dev/null   Sat Dec  6 22:24:29 2025
+++ pkgsrc/sysutils/collectd-web/patches/patch-cgi-bin_collection.modified.cgi  Sat Dec  6 22:24:28 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-cgi-bin_collection.modified.cgi,v 1.1 2025/12/06 22:24:28 wiz Exp $
+
+In success case, CGI scripts should return 0, not 1.
+https://github.com/httpdss/collectd-web/pull/152
+
+--- cgi-bin/collection.modified.cgi.orig       2025-03-07 22:07:57.000000000 +0000
++++ cgi-bin/collection.modified.cgi
+@@ -379,7 +379,7 @@ sub list_hosts_json {
+         -Charset      => 'utf-8'
+     );
+     print STDOUT to_json( $host_ref, { pretty => 1, indent => 2 } );
+-    return (1);
++    return (0);
+ }    # list_hosts_json
+ 
+ sub _string_to_color {
+@@ -480,7 +480,7 @@ sub action_show_host_json
+     );
+     print STDOUT to_json ([sort (keys %$all_plugins)],
+     { pretty => 1, indent => 2 }) . "\n";
+-    return (1);
++    return (0);
+ } # action_show_host_json
+ 
+ 
+@@ -775,7 +775,7 @@ sub action_show_plugin_json {
+                            year => [@plugin_list_year],
+                            decade => [@plugin_list_decade]},
+     { pretty => 1, indent => 2 }) . "\n";
+-    return (1);
++    return (0);
+ }    # action_show_plugin_json
+ 
+ sub action_show_type {

Prev by Date: CVS commit: [pkgsrc-2025Q3] pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: [pkgsrc-2025Q3] pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index