CVS commit: pkgsrc/net/sysmon

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Thu Nov 13 01:33:14 UTC 2025

Modified Files:
        pkgsrc/net/sysmon: Makefile distinfo
Added Files:
        pkgsrc/net/sysmon/patches: patch-syswatch.c

Log Message:
(net/sysmon) Experimental fix for build with gcc 14.3.0, (having warned with earlier gcc)

Thanks for @tristelo for correct patch


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/sysmon/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/sysmon/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/sysmon/patches/patch-syswatch.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/sysmon/Makefile
diff -u pkgsrc/net/sysmon/Makefile:1.14 pkgsrc/net/sysmon/Makefile:1.15
--- pkgsrc/net/sysmon/Makefile:1.14     Mon Mar  3 20:29:29 2025
+++ pkgsrc/net/sysmon/Makefile  Thu Nov 13 01:33:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2025/03/03 20:29:29 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2025/11/13 01:33:13 mef Exp $
 
 DISTNAME=              sysmon-0.93
 PKGREVISION=           2
@@ -12,6 +12,13 @@ LICENSE=             gnu-gpl-v2
 
 GNU_CONFIGURE=         yes
 
+# loadconfig.c: In function 'loadconfig':
+# loadconfig.c:843:9: error: implicit declaration of function 'sysmon_conf_yylex' [-Wimplicit-function-declaration]
+#   843 |         sysmon_conf_yylex();
+#       |         ^~~~~~~~~~~~~~~~~
+
+CFLAGS+=               -Wno-implicit-function-declaration
+
 BUILD_DEFS+=           IPV6_READY
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
@@ -23,7 +30,7 @@ CONF_FILES=           ${EGDIR}/sysmon.conf.dist \
                        ${PKG_SYSCONFDIR}/sysmon.conf
 
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     ${WRKSRC}/autoconf/Makefile.in
+SUBST_FILES.paths=     autoconf/Makefile.in
 SUBST_STAGE.paths=     pre-configure
 SUBST_SED.paths=       -e 's,@destdir@,${DESTDIR},g'
 

Index: pkgsrc/net/sysmon/distinfo
diff -u pkgsrc/net/sysmon/distinfo:1.6 pkgsrc/net/sysmon/distinfo:1.7
--- pkgsrc/net/sysmon/distinfo:1.6      Tue Oct 26 11:06:59 2021
+++ pkgsrc/net/sysmon/distinfo  Thu Nov 13 01:33:13 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:06:59 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/11/13 01:33:13 mef Exp $
 
 BLAKE2s (sysmon-0.93.tar.gz) = b51e68f3e67150a29615a8aab494c053376b8d6ba40118327cef53a536ae4fed
 SHA512 (sysmon-0.93.tar.gz) = 367ec53cf5253a1fd83eee4837206d9551ea2b2d8e62cd910f4c0a7f1090bc6a519277e94ea1e08f8354a7a88fcc6b4d5092bc481385b57547496558e47e85c8
 Size (sysmon-0.93.tar.gz) = 519522 bytes
 SHA1 (patch-aa) = ed38753f2298875032593e780cbac3266b875031
 SHA1 (patch-configure) = 42cf75b0a2c8eb1c1e3f48978b9c963be4627e51
+SHA1 (patch-syswatch.c) = 29cd30bbc4c8c3f436f37cf481a096b36a982a4c

Added files:

Index: pkgsrc/net/sysmon/patches/patch-syswatch.c
diff -u /dev/null pkgsrc/net/sysmon/patches/patch-syswatch.c:1.1
--- /dev/null   Thu Nov 13 01:33:14 2025
+++ pkgsrc/net/sysmon/patches/patch-syswatch.c  Thu Nov 13 01:33:13 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-syswatch.c,v 1.1 2025/11/13 01:33:13 mef Exp $
+
+Avoid error with gcc-14.3.0  (Thanks @tristelo) 
++----------------------
+| syswatch.c:799:84: error: passing argument 4 of 'qsort' from incompatible pointer type [-Wincompatible-pointer-types]
+|   799 |                         qsort(queue_list, numele, sizeof(struct graph_elements *), q_time_cmp);
+|       |                                                                                    ^~~~~~~~~~
+|       |                                                                                    |
+|       |                                                                                    int (*)(void **, void **)
+| In file included from config.h:10,
+|                  from syswatch.c:2:
+| | usr/include/stdlib.h:117:40: note: expected 'int (*)(const void *, const void *)' but argument is of type 'int (*)(void **, void **)'
+|  117 | void     qsort(void *, size_t, size_t, int (*)(const void *, const void *));
+|      |                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| *** [syswatch.o] Error code 1
++----------------------
+
+--- src/syswatch.c.orig        2014-07-10 01:29:39.000000000 +0900
++++ src/syswatch.c     2025-11-13 10:12:50.302148951 +0900
+@@ -681,12 +681,12 @@ void walk_queue_checks(struct graph_elem
+ /*
+  * time comparison function for qsort
+  */
+-int q_time_cmp(void **arg_a, void **arg_b)
++int q_time_cmp(const void *arg_a, const void *arg_b)
+ {
+         struct graph_elements *sort_a, *sort_b;
+ 
+-        sort_a = *arg_a;
+-        sort_b = *arg_b;
++        sort_a = *(struct graph_elements **)arg_a ;
++        sort_b = *(struct graph_elements **)arg_b;
+ 
+       /* if they're both null, then they're equal */
+       if ((sort_a == NULL) && (sort_b == NULL))