CVS commit: pkgsrc/textproc/the_silver_searcher

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Aug 29 12:17:31 UTC 2025

Modified Files:
        pkgsrc/textproc/the_silver_searcher: Makefile distinfo
        pkgsrc/textproc/the_silver_searcher/patches: patch-src_main.c

Log Message:
the_silver_searcher: address ctype(3) abuses

Address all ctype(3) abuses.

PKGREVISION++

Reported by <abs> via current-users@ ML and correctly guessed by
<martin>.
Thanks David and Martin!


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/the_silver_searcher/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/the_silver_searcher/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c

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

Modified files:

Index: pkgsrc/textproc/the_silver_searcher/Makefile
diff -u pkgsrc/textproc/the_silver_searcher/Makefile:1.19 pkgsrc/textproc/the_silver_searcher/Makefile:1.20
--- pkgsrc/textproc/the_silver_searcher/Makefile:1.19   Thu Aug  9 11:02:17 2018
+++ pkgsrc/textproc/the_silver_searcher/Makefile        Fri Aug 29 12:17:31 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2018/08/09 11:02:17 leot Exp $
+# $NetBSD: Makefile,v 1.20 2025/08/29 12:17:31 leot Exp $
 
 DISTNAME=      the_silver_searcher-2.2.0
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  http://geoff.greer.fm/ag/releases/
 

Index: pkgsrc/textproc/the_silver_searcher/distinfo
diff -u pkgsrc/textproc/the_silver_searcher/distinfo:1.22 pkgsrc/textproc/the_silver_searcher/distinfo:1.23
--- pkgsrc/textproc/the_silver_searcher/distinfo:1.22   Tue Apr  2 01:28:00 2024
+++ pkgsrc/textproc/the_silver_searcher/distinfo        Fri Aug 29 12:17:31 2025
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.22 2024/04/02 01:28:00 charlotte Exp $
+$NetBSD: distinfo,v 1.23 2025/08/29 12:17:31 leot Exp $
 
 BLAKE2s (the_silver_searcher-2.2.0.tar.gz) = cefd4d8ca1dd8c0223208e97c2681555586ac3c449e808a6a0fd09f9e70f9b02
 SHA512 (the_silver_searcher-2.2.0.tar.gz) = 89d4e4f7f34c0d57aa880e7c3466f0373b961744a89ad30541e89e2d614322ab46c8044ec458406a117f74b0fea14cd3063fa4e0624a96526aa23eaccd6f1141
 Size (the_silver_searcher-2.2.0.tar.gz) = 190585 bytes
-SHA1 (patch-src_main.c) = f63cedaae7efbab37be2758192ccc68175e41bc7
+SHA1 (patch-src_ignore.c) = 4b7a3c5d8fe7846a28b181a20e2f301b0dcd4ac6
+SHA1 (patch-src_main.c) = d73e56d4bc527a7c178f30276975d1a3302c73fb
 SHA1 (patch-src_scandir.c) = 41c0af602ef478db39bd48315b0fb1a644a9db91
+SHA1 (patch-src_util.c) = 223e5b1027c502b2478caf9ef6cd48f4b4ea2611

Index: pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c
diff -u pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c:1.2 pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c:1.3
--- pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c:1.2    Tue Apr  2 01:28:00 2024
+++ pkgsrc/textproc/the_silver_searcher/patches/patch-src_main.c        Fri Aug 29 12:17:31 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-src_main.c,v 1.2 2024/04/02 01:28:00 charlotte Exp $
+$NetBSD: patch-src_main.c,v 1.3 2025/08/29 12:17:31 leot Exp $
 
-DragonFly also has a particular 'cpuset' type.
+- Fix ctype(3) abuses
+- DragonFly also has a particular 'cpuset' type
 
---- src/main.c.orig    2022-05-23 22:57:49.749747000 -0700
-+++ src/main.c 2022-05-23 22:58:26.439723000 -0700
-@@ -156,7 +156,7 @@
+--- src/main.c.orig    2018-08-07 06:20:25.000000000 +0000
++++ src/main.c
+@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
+             /* Search routine needs the query to be lowercase */
+             char *c = opts.query;
+             for (; *c != '\0'; ++c) {
+-                *c = (char)tolower(*c);
++                *c = (char)tolower((unsigned char)*c);
+             }
+         }
+         generate_alpha_skip(opts.query, opts.query_len, alpha_skip_lookup, opts.casing == CASE_SENSITIVE);
+@@ -156,7 +156,7 @@ int main(int argc, char **argv) {
              if (opts.use_thread_affinity) {
  #ifdef __linux__
                  cpu_set_t cpu_set;