CVS commit: pkgsrc/net/xymon

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 18 10:09:22 UTC 2025

Modified Files:
        pkgsrc/net/xymon: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/xymon/patches: patch-build_test-rrd.c patch-web_perfdata.c
            patch-web_showgraph.c patch-xymond_do__rrd.c

Log Message:
xymon: fix build on NetBSD 11

While here:
- do not install backup file
- sync PLIST with installed files

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/net/xymon/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/xymon/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/xymon/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/xymon/patches/patch-build_test-rrd.c \
    pkgsrc/net/xymon/patches/patch-web_perfdata.c \
    pkgsrc/net/xymon/patches/patch-xymond_do__rrd.c
cvs rdiff -u -r0 -r1.3 pkgsrc/net/xymon/patches/patch-web_showgraph.c

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

Modified files:

Index: pkgsrc/net/xymon/Makefile
diff -u pkgsrc/net/xymon/Makefile:1.85 pkgsrc/net/xymon/Makefile:1.86
--- pkgsrc/net/xymon/Makefile:1.85      Thu Oct 23 20:38:56 2025
+++ pkgsrc/net/xymon/Makefile   Thu Dec 18 10:09:22 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2025/10/23 20:38:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.86 2025/12/18 10:09:22 wiz Exp $
 
 DISTNAME=              xymon-4.3.30
-PKGREVISION=           20
+PKGREVISION=           21
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=xymon/}
 
@@ -181,7 +180,7 @@ CFILES+=            xymon-apache.conf xymonmenu.cf
 CONF_FILES_PERMS+=     ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0644
 .endfor
 
-CFILES2=               critical.cfg critical.cfg.bak
+CFILES2=               critical.cfg
 .for file in ${CFILES2}
 CONF_FILES_PERMS+=     ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR.xymon}/${file} ${XYMONUSER} ${XYMONGROUP} 0664
 .endfor
@@ -220,6 +219,7 @@ post-install:
        chmod 0755 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir}
        chmod 0644 ${DESTDIR}${EXAMPLEDIR}/www/help/manpages/${dir}/*
 .endfor
+       ${RM} ${DESTDIR}${PREFIX}/share/examples/xymon/critical.cfg.bak
 
 .include "options.mk"
 .include "../../databases/rrdtool/buildlink3.mk"

Index: pkgsrc/net/xymon/PLIST
diff -u pkgsrc/net/xymon/PLIST:1.7 pkgsrc/net/xymon/PLIST:1.8
--- pkgsrc/net/xymon/PLIST:1.7  Tue Feb 16 05:58:56 2016
+++ pkgsrc/net/xymon/PLIST      Thu Dec 18 10:09:22 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/02/16 05:58:56 spz Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/12/18 10:09:22 wiz Exp $
 libexec/xymon/ackinfo.cgi
 libexec/xymon/acknowledge.cgi
 libexec/xymon/acknowledgements.cgi
@@ -29,10 +29,8 @@ libexec/xymon/cgi-bin/hostgraphs.sh
 libexec/xymon/cgi-bin/hostlist.sh
 libexec/xymon/cgi-bin/nongreen.sh
 libexec/xymon/cgi-bin/notifications.sh
-libexec/xymon/cgi-bin/perfdata.sh
 libexec/xymon/cgi-bin/report.sh
 libexec/xymon/cgi-bin/reportlog.sh
-libexec/xymon/cgi-bin/showgraph.sh
 libexec/xymon/cgi-bin/snapshot.sh
 libexec/xymon/cgi-bin/svcstatus.sh
 libexec/xymon/cgi-bin/topchanges.sh
@@ -61,11 +59,9 @@ libexec/xymon/hostgraphs.cgi
 libexec/xymon/hostlist.cgi
 libexec/xymon/moverrd.sh
 libexec/xymon/notifications.cgi
-libexec/xymon/perfdata.cgi
 libexec/xymon/report.cgi
 libexec/xymon/reportlog.cgi
 libexec/xymon/rrdcachectl
-libexec/xymon/showgraph.cgi
 libexec/xymon/snapshot.cgi
 libexec/xymon/statusreport.cgi
 libexec/xymon/svcstatus.cgi
@@ -176,7 +172,6 @@ share/examples/xymon/client-local.cfg
 share/examples/xymon/columndoc.csv
 share/examples/xymon/combo.cfg
 share/examples/xymon/critical.cfg
-share/examples/xymon/critical.cfg.bak
 share/examples/xymon/graphs.cfg
 share/examples/xymon/holidays.cfg
 share/examples/xymon/hosts.cfg

Index: pkgsrc/net/xymon/distinfo
diff -u pkgsrc/net/xymon/distinfo:1.23 pkgsrc/net/xymon/distinfo:1.24
--- pkgsrc/net/xymon/distinfo:1.23      Mon Mar 11 10:47:29 2024
+++ pkgsrc/net/xymon/distinfo   Thu Dec 18 10:09:22 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2024/03/11 10:47:29 jperkin Exp $
+$NetBSD: distinfo,v 1.24 2025/12/18 10:09:22 wiz Exp $
 
 BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f
 SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62
@@ -24,10 +24,14 @@ SHA1 (patch-build_Makefile.generic) = e9
 SHA1 (patch-build_c-ares.sh) = c958992639b45431056d91939a345e703131ca2d
 SHA1 (patch-build_rrd.sh) = cfafece75defb13b413917bfddedb41cb9bb3c8b
 SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f
+SHA1 (patch-build_test-rrd.c) = 7bf3c76e7a13afab975a2a66c108cff6358aaf62
 SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707
 SHA1 (patch-configure) = 3754b9056c365b8664e5fc9620b17c4e13453b2e
 SHA1 (patch-web_Makefile) = a27fbb7e97ce0c2f30093d5b05b0af2708fb594b
+SHA1 (patch-web_perfdata.c) = 17bd0467495400921d70add3e8a8db89f730afb2
+SHA1 (patch-web_showgraph.c) = 65c74d4ffbda88f9975ade15eca67b7632a1a30c
 SHA1 (patch-xymond_client_netbsd.c) = 9034777cbf12e3e168cf1598bfd444468e3a5086
+SHA1 (patch-xymond_do__rrd.c) = dc76f21c3ab7c85c5b2874f242bb1ec2e31b619f
 SHA1 (patch-xymond_rrd_do__disk.c) = e72cb0364e4e949e02a045da0abca46083624253
 SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae
 SHA1 (patch-xymonproxy_Makefile) = 8ecfa4ceb66f66b7d5f40c01339479b26865746e

Added files:

Index: pkgsrc/net/xymon/patches/patch-build_test-rrd.c
diff -u /dev/null pkgsrc/net/xymon/patches/patch-build_test-rrd.c:1.1
--- /dev/null   Thu Dec 18 10:09:22 2025
+++ pkgsrc/net/xymon/patches/patch-build_test-rrd.c     Thu Dec 18 10:09:22 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_test-rrd.c,v 1.1 2025/12/18 10:09:22 wiz Exp $
+
+Adapt for recent rrdtool.
+
+--- build/test-rrd.c.orig      2025-12-18 09:52:58.681306447 +0000
++++ build/test-rrd.c
+@@ -4,7 +4,7 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-      char *rrdargs[] = {
++      const char *rrdargs[] = {
+               "rrdgraph",
+               "xymongen.png",
+               "-s", "e - 48d",
Index: pkgsrc/net/xymon/patches/patch-web_perfdata.c
diff -u /dev/null pkgsrc/net/xymon/patches/patch-web_perfdata.c:1.1
--- /dev/null   Thu Dec 18 10:09:22 2025
+++ pkgsrc/net/xymon/patches/patch-web_perfdata.c       Thu Dec 18 10:09:22 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-web_perfdata.c,v 1.1 2025/12/18 10:09:22 wiz Exp $
+
+Adapt for recent rrdtool.
+
+--- web/perfdata.c.orig        2025-12-18 10:01:33.866390199 +0000
++++ web/perfdata.c
+@@ -111,7 +111,7 @@ int oneset(char *hostname, char *rrdname
+       rrdargs[9] = NULL;
+ 
+       optind = opterr = 0; rrd_clear_error();
+-      result = rrd_fetch(9, rrdargs,
++      result = rrd_fetch(9, (const char **)rrdargs,
+                          &start, &end, &step, &dscount, &dsnames, &data);
+ 
+       if (result != 0) {
Index: pkgsrc/net/xymon/patches/patch-xymond_do__rrd.c
diff -u /dev/null pkgsrc/net/xymon/patches/patch-xymond_do__rrd.c:1.1
--- /dev/null   Thu Dec 18 10:09:22 2025
+++ pkgsrc/net/xymon/patches/patch-xymond_do__rrd.c     Thu Dec 18 10:09:22 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-xymond_do__rrd.c,v 1.1 2025/12/18 10:09:22 wiz Exp $
+
+Adapt for recent rrdtool.
+
+--- xymond/do_rrd.c.orig       2025-12-18 09:56:14.972038243 +0000
++++ xymond/do_rrd.c
+@@ -216,7 +216,7 @@ static void setupinterval(int intvl)
+ static int flush_cached_updates(updcacheitem_t *cacheitem, char *newdata)
+ {
+       /* Flush any updates we've cached */
+-      char *updparams[5+CACHESZ+1] = { "rrdupdate", filedir, "-t", NULL, NULL, NULL, };
++      const char *updparams[5+CACHESZ+1] = { "rrdupdate", filedir, "-t", NULL, NULL, NULL, };
+       int i, pcount, result;
+ 
+       dbgprintf("Flushing '%s' with %d updates pending, template '%s'\n", 
+@@ -378,7 +378,7 @@ static int create_and_update_rrd(char *h
+                * we MUST reset this before every call.
+                */
+               optind = opterr = 0; rrd_clear_error();
+-              result = rrd_create(4+pcount, rrdcreate_params);
++              result = rrd_create(4+pcount, (const char **)rrdcreate_params);
+               xfree(rrdcreate_params);
+               if (rrakey) xfree(rrakey);
+ 
+@@ -590,7 +590,7 @@ static int rrddatasets(char *hostname, c
+       struct stat st;
+ 
+       int result;
+-      char *fetch_params[] = { "rrdfetch", filedir, "AVERAGE", "-s", "-30m", NULL };
++      const char *fetch_params[] = { "rrdfetch", filedir, "AVERAGE", "-s", "-30m", NULL };
+       time_t starttime, endtime;
+       unsigned long steptime, dscount;
+       rrd_value_t *rrddata;

Index: pkgsrc/net/xymon/patches/patch-web_showgraph.c
diff -u /dev/null pkgsrc/net/xymon/patches/patch-web_showgraph.c:1.3
--- /dev/null   Thu Dec 18 10:09:22 2025
+++ pkgsrc/net/xymon/patches/patch-web_showgraph.c      Thu Dec 18 10:09:22 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-web_showgraph.c,v 1.3 2025/12/18 10:09:22 wiz Exp $
+
+Adapt for recent rrdtool.
+
+--- web/showgraph.c.orig       2025-12-18 09:59:43.766879792 +0000
++++ web/showgraph.c
+@@ -1215,7 +1215,7 @@ void generate_graph(char *gdeffn, char *
+       rrd_clear_error();
+ 
+ #ifdef RRDTOOL12
+-      result = rrd_graph(rrdargcount, rrdargs, &calcpr, &xsize, &ysize, NULL, &ymin, &ymax);
++      result = rrd_graph(rrdargcount, (const char **)rrdargs, &calcpr, &xsize, &ysize, NULL, &ymin, &ymax);
+ 
+       /*
+        * If we have neither the upper- nor lower-limits of the graph, AND we allow vertical