CVS commit: pkgsrc/devel/idutils

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Oct 26 22:22:14 UTC 2026

Modified Files:
        pkgsrc/devel/idutils: Makefile distinfo
        pkgsrc/devel/idutils/patches: patch-aj

Log Message:
fix word_match() / IS_ALNUM() / TOLOWER() macros for ctype abuse.

i had a gid.core, and it showed this was the problem, and doing the
correct cast (unsigned char) fixes the crash.

bump pkg revision.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/idutils/Makefile \
    pkgsrc/devel/idutils/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/idutils/patches/patch-aj

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

Modified files:

Index: pkgsrc/devel/idutils/Makefile
diff -u pkgsrc/devel/idutils/Makefile:1.14 pkgsrc/devel/idutils/Makefile:1.15
--- pkgsrc/devel/idutils/Makefile:1.14  Sun May  3 08:03:00 2020
+++ pkgsrc/devel/idutils/Makefile       Mon Oct 26 22:22:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/05/03 08:03:00 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2026/10/26 22:22:14 mrg Exp $
 
 DISTNAME=      idutils-4.6
 CATEGORIES=    devel
@@ -10,6 +10,8 @@ HOMEPAGE=     https://www.gnu.org/software/i
 COMMENT=       Classic Berkeley gid/lid tools for looking up variables in code
 LICENSE=       gnu-gpl-v3
 
+PKGREVISION=   1
+
 CONFLICTS=     sh-utils>=2.0nb2 coreutils-[0-9]*
 
 USE_PKGLOCALEDIR=      yes
Index: pkgsrc/devel/idutils/distinfo
diff -u pkgsrc/devel/idutils/distinfo:1.14 pkgsrc/devel/idutils/distinfo:1.15
--- pkgsrc/devel/idutils/distinfo:1.14  Tue Oct 26 10:15:05 2021
+++ pkgsrc/devel/idutils/distinfo       Mon Oct 26 22:22:14 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:15:05 nia Exp $
+$NetBSD: distinfo,v 1.15 2026/10/26 22:22:14 mrg Exp $
 
 BLAKE2s (idutils-4.6.tar.xz) = 93f134466696d430c64e6983c374ca86e278234d6d3f32fdf8199d9a03946e48
 SHA512 (idutils-4.6.tar.xz) = 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 05b38bed7f2a471b3696d5
 SHA1 (patch-ad) = 12326348db69cb0a991a37568d3765cac7b15456
 SHA1 (patch-ae) = a026e1658e209ee927054296f423fe3536412b45
 SHA1 (patch-ai) = 5e64a7c67075a3d308b6e66252559afa20d02639
-SHA1 (patch-aj) = 8381724be238e518a86377b3226cf05e99b83f1d
+SHA1 (patch-aj) = a2314863010197b7283d46324692d547814a2131
 SHA1 (patch-ak) = c2b3573a5386e77fc6bc1d5a4e89ccd1af830630
 SHA1 (patch-al) = 163e06074da62edbcacd459788cfea3528e94e30
 SHA1 (patch-configure) = 06e53f65b7515276f054049c502b3187ba7a156f

Index: pkgsrc/devel/idutils/patches/patch-aj
diff -u pkgsrc/devel/idutils/patches/patch-aj:1.4 pkgsrc/devel/idutils/patches/patch-aj:1.5
--- pkgsrc/devel/idutils/patches/patch-aj:1.4   Mon Dec 15 11:35:42 2014
+++ pkgsrc/devel/idutils/patches/patch-aj       Mon Oct 26 22:22:14 2026
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.4 2014/12/15 11:35:42 mef Exp $
+$NetBSD: patch-aj,v 1.5 2026/10/26 22:22:14 mrg Exp $
 
---- src/lid.c.orig     2012-01-31 21:22:05.000000000 +0900
-+++ src/lid.c  2014-11-20 23:12:39.000000000 +0900
+--- src/lid.c.orig     2012-01-31 04:22:05.000000000 -0800
++++ src/lid.c  2026-10-26 15:06:09.682440695 -0700
 @@ -32,7 +32,6 @@
  #include <dirname.h>
  #include <unistd.h>
@@ -10,6 +10,17 @@ $NetBSD: patch-aj,v 1.4 2014/12/15 11:35
  #include <regex.h>
  #include <xalloc.h>
  #include <pathmax.h>
+@@ -139,8 +138,8 @@ static void savetty (void);
+ static void restoretty (void);
+ static void chartty (void);
+ 
+-#define       TOLOWER(c)      (isupper (c) ? tolower (c) : (c))
+-#define IS_ALNUM(c)   (isalnum (c) || (c) == '_')
++#define       TOLOWER(c)      (isupper ((unsigned char)c) ? tolower ((unsigned char)c) : (c))
++#define IS_ALNUM(c)   (isalnum ((unsigned char)c) || (c) == '_')
+ 
+ /* Sorry about all the globals, but it's really cleaner this way. */
+ 
 @@ -562,10 +561,11 @@ report_filenames (char const *name, stru
  static void
  report_grep (char const *name, struct file_link **flinkv)