CVS commit: pkgsrc/net/knot

["Marcin Gondek" <drixter%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   drixter
Date:           Sat Aug 29 19:55:15 UTC 2026

Modified Files:
        pkgsrc/net/knot: Makefile distinfo
Added Files:
        pkgsrc/net/knot/patches: patch-src_utils_knotc_interactive.c

Log Message:
knot: Fix from upstream to properly compile on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/knot/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/knot/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/knot/patches/patch-src_utils_knotc_interactive.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/knot/Makefile
diff -u pkgsrc/net/knot/Makefile:1.101 pkgsrc/net/knot/Makefile:1.102
--- pkgsrc/net/knot/Makefile:1.101      Tue Aug 18 19:01:10 2026
+++ pkgsrc/net/knot/Makefile    Sat Aug 29 19:55:15 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2026/08/18 19:01:10 drixter Exp $
+# $NetBSD: Makefile,v 1.102 2026/08/29 19:55:15 drixter Exp $
 
 DISTNAME=      knot-3.5.7
 CATEGORIES=    net
@@ -30,6 +30,9 @@ CONFIGURE_ARGS.NetBSD+=       --enable-recvmms
 CFLAGS+=       -march=i586
 .endif
 
+CFLAGS.SunOS+= -D_XPG4_2
+CFLAGS.SunOS+= -D__EXTENSIONS__
+
 USE_LIBTOOL=   yes
 USE_TOOLS+=    bison flex gmake pkg-config
 

Index: pkgsrc/net/knot/distinfo
diff -u pkgsrc/net/knot/distinfo:1.55 pkgsrc/net/knot/distinfo:1.56
--- pkgsrc/net/knot/distinfo:1.55       Tue Aug 18 19:01:11 2026
+++ pkgsrc/net/knot/distinfo    Sat Aug 29 19:55:15 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.55 2026/08/18 19:01:11 drixter Exp $
+$NetBSD: distinfo,v 1.56 2026/08/29 19:55:15 drixter Exp $
 
 BLAKE2s (knot-3.5.7.tar.xz) = 231e114cfc5d035243887998bf44d9ce27a26e7ff5e0e35e9bb54f4e5fb2f7da
 SHA512 (knot-3.5.7.tar.xz) = 83c0a6aaf85ba079639b7fb06cf7cd43daf184573414f74b8da8f795f23a4b0c2361780e6d0622b5fabe88ac62e8dcc3fb2b7f05abdb967b27917539fb063dfc
 Size (knot-3.5.7.tar.xz) = 1735896 bytes
 SHA1 (patch-samples_Makefile.in) = 499b8742dbd948e489b01d512bc7a8d8e4fe2e7b
+SHA1 (patch-src_utils_knotc_interactive.c) = c0ea7183530eeeaa8fc7a5aae4ee244fd115c15e

Added files:

Index: pkgsrc/net/knot/patches/patch-src_utils_knotc_interactive.c
diff -u /dev/null pkgsrc/net/knot/patches/patch-src_utils_knotc_interactive.c:1.1
--- /dev/null   Sat Aug 29 19:55:15 2026
+++ pkgsrc/net/knot/patches/patch-src_utils_knotc_interactive.c Sat Aug 29 19:55:15 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_utils_knotc_interactive.c,v 1.1 2026/08/29 19:55:15 drixter Exp $
+
+Fix from upstream to properly compile on SunOS
+
+--- /usr/work/amd64/wip/knot/work/knot-3.5.7/src/utils/knotc/interactive.c.orig        2026-08-29 19:17:24.182700199 +0000
++++ /usr/work/amd64/wip/knot/work/knot-3.5.7/src/utils/knotc/interactive.c
+@@ -359,11 +359,16 @@ static void path_lookup(EditLine *el, co
+       struct stat sb;
+       for (int i = 0; i < nnames; ++i) {
+               const struct dirent *it = namelist[i];
++#ifdef __sun
++              strlcpy(base, it->d_name, PATH_MAX - (size_t)(base - path));
++              bool is_dir = !stat(path, &sb) && S_ISDIR(sb.st_mode);
++#else
+               bool is_dir = (it->d_type == DT_DIR);
+               if (it->d_type == DT_LNK) {
+                       strlcpy(base, it->d_name, PATH_MAX - (size_t)(base - path));
+                       is_dir = !stat(path, &sb) && S_ISDIR(sb.st_mode);
+               }
++#endif
+               if ((!dirsonly || is_dir) &&
+                   (strcmp(it->d_name, ".") && strcmp(it->d_name, ".."))) {
+                       char buf[NAME_MAX + 2];  // Max. name length + slash + terminator.