CVS commit: pkgsrc/net/xymonclient
"Thomas Klausner" <[email protected]> Tue, 28 Jul 2026 21:23:17 +0000
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: wiz
Date: Tue Jul 28 21:23:17 UTC 2026
Modified Files:
pkgsrc/net/xymonclient: Makefile distinfo
Added Files:
pkgsrc/net/xymonclient/patches: patch-lib_loadhosts__file.c
patch-lib_stackio.c
Log Message:
xymonclient: Fix ctype(3) usage.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/xymonclient/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/xymonclient/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/xymonclient/patches/patch-lib_loadhosts__file.c \
pkgsrc/net/xymonclient/patches/patch-lib_stackio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 4.4 KB)
Modified files:
Index: pkgsrc/net/xymonclient/Makefile
diff -u pkgsrc/net/xymonclient/Makefile:1.29 pkgsrc/net/xymonclient/Makefile:1.30
--- pkgsrc/net/xymonclient/Makefile:1.29 Fri Apr 11 01:40:17 2025
+++ pkgsrc/net/xymonclient/Makefile Tue Jul 28 21:23:16 2026
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2025/04/11 01:40:17 maya Exp $
+# $NetBSD: Makefile,v 1.30 2026/07/28 21:23:16 wiz Exp $
DISTNAME= xymon-4.3.30
PKGNAME= ${DISTNAME:S/xymon/xymonclient/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/}
MAINTAINER= [email protected]
HOMEPAGE= https://xymon.sourceforge.io/
COMMENT= Network services monitor a la Big Brother
-
LICENSE= gnu-gpl-v2
MAKE_JOBS_SAFE= NO
Index: pkgsrc/net/xymonclient/distinfo
diff -u pkgsrc/net/xymonclient/distinfo:1.22 pkgsrc/net/xymonclient/distinfo:1.23
--- pkgsrc/net/xymonclient/distinfo:1.22 Fri Apr 11 01:40:17 2025
+++ pkgsrc/net/xymonclient/distinfo Tue Jul 28 21:23:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2025/04/11 01:40:17 maya Exp $
+$NetBSD: distinfo,v 1.23 2026/07/28 21:23:16 wiz Exp $
BLAKE2s (xymon-4.3.30.tar.gz) = 03a385a0e32188d4ca6fdbaa55bbb92d053ec706ee70ca0bcf483c3f5611a85f
SHA512 (xymon-4.3.30.tar.gz) = f3f16ff55293d7d76cb0355151a82545a2b1ad708b59c031640c240379807228dca4ffa9c48a4e20ab75e270bda18b7306ea165b65eb18c9c6471b395fda7b62
@@ -25,4 +25,6 @@ SHA1 (patch-client_xymonclient-freebsd.s
SHA1 (patch-client_xymonclient-netbsd.sh) = 739a201806144ef0e34c1f668ad3a4d9e2b9f9fb
SHA1 (patch-common_Makefile) = 32b7da06cd9d22f98ee0f83bb36ed6441c066707
SHA1 (patch-configure) = 305a74a2383dcd37ea93456272d4254483023aa5
+SHA1 (patch-lib_loadhosts__file.c) = 551261f0cf4d6ff40abcb8e67767d5f4ee406b2c
+SHA1 (patch-lib_stackio.c) = d3cc1e91ce90b94e126728d34349d3e614f31269
SHA1 (patch-lib_suid.c) = e25323b52ae5ec03166bf94c3523dadf835754d8
Added files:
Index: pkgsrc/net/xymonclient/patches/patch-lib_loadhosts__file.c
diff -u /dev/null pkgsrc/net/xymonclient/patches/patch-lib_loadhosts__file.c:1.1
--- /dev/null Tue Jul 28 21:23:17 2026
+++ pkgsrc/net/xymonclient/patches/patch-lib_loadhosts__file.c Tue Jul 28 21:23:17 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_loadhosts__file.c,v 1.1 2026/07/28 21:23:17 wiz Exp $
+
+Fix ctype(3) usage.
+
+--- lib/loadhosts_file.c.orig 2026-07-28 21:21:15.668395905 +0000
++++ lib/loadhosts_file.c
+@@ -175,7 +175,7 @@ int load_hostnames(char *hostsfn, char *extrainclude,
+ inbol += strspn(inbol, " \t");
+ ineol = strchr(inbol, '\n');
+ if (ineol) {
+- while ((ineol > inbol) && (isspace(*ineol) || (*ineol == '\n'))) ineol--;
++ while ((ineol > inbol) && (isspace((unsigned char)*ineol) || (*ineol == '\n'))) ineol--;
+ if (*ineol != '\n') ineol++;
+
+ insavchar = *ineol;
Index: pkgsrc/net/xymonclient/patches/patch-lib_stackio.c
diff -u /dev/null pkgsrc/net/xymonclient/patches/patch-lib_stackio.c:1.1
--- /dev/null Tue Jul 28 21:23:17 2026
+++ pkgsrc/net/xymonclient/patches/patch-lib_stackio.c Tue Jul 28 21:23:17 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_stackio.c,v 1.1 2026/07/28 21:23:17 wiz Exp $
+
+Fix ctype(3) usage.
+
+--- lib/stackio.c.orig 2026-07-28 21:20:40.501578374 +0000
++++ lib/stackio.c
+@@ -439,7 +439,7 @@ char *stackfgets(strbuffer_t *buffer, char *extraincl)
+ eol = bufpastwhitespace + strcspn(bufpastwhitespace, "\r\n"); if (eol) { eolchar = *eol; *eol = '\0'; }
+ newfn = bufpastwhitespace + strcspn(bufpastwhitespace, " \t");
+ newfn += strspn(newfn, " \t");
+- while (*newfn && isspace(*(newfn + strlen(newfn) - 1))) *(newfn + strlen(newfn) -1) = '\0';
++ while (*newfn && isspace((unsigned char)*(newfn + strlen(newfn) - 1))) *(newfn + strlen(newfn) -1) = '\0';
+
+ if (*newfn && (stackfopen(newfn, "r", (void **)fdhead->listhead) != NULL))
+ return stackfgets(buffer, extraincl);
+@@ -457,7 +457,7 @@ char *stackfgets(strbuffer_t *buffer, char *extraincl)
+ eol = bufpastwhitespace + strcspn(bufpastwhitespace, "\r\n"); if (eol) { eolchar = *eol; *eol = '\0'; }
+ dirfn = bufpastwhitespace + 9;
+ dirfn += strspn(dirfn, " \t");
+- while (*dirfn && isspace(*(dirfn + strlen(dirfn) - 1))) *(dirfn + strlen(dirfn) -1) = '\0';
++ while (*dirfn && isspace((unsigned char)*(dirfn + strlen(dirfn) - 1))) *(dirfn + strlen(dirfn) -1) = '\0';
+
+ if (*dirfn) addtofnlist(dirfn, optional, (void **)fdhead->listhead);
+ if (fnlist && (stackfopen(fnlist->name, "r", (void **)fdhead->listhead) != NULL)) {