CVS commit: pkgsrc/misc/getopt

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Jul  1 01:15:55 UTC 2026

Modified Files:
        pkgsrc/misc/getopt: Makefile distinfo
        pkgsrc/misc/getopt/patches: patch-aa

Log Message:
getopt: use ctype.h correctly


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/misc/getopt/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/getopt/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/getopt/patches/patch-aa

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

Modified files:

Index: pkgsrc/misc/getopt/Makefile
diff -u pkgsrc/misc/getopt/Makefile:1.18 pkgsrc/misc/getopt/Makefile:1.19
--- pkgsrc/misc/getopt/Makefile:1.18    Mon Dec  1 10:57:02 2014
+++ pkgsrc/misc/getopt/Makefile Wed Jul  1 01:15:55 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/12/01 10:57:02 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2026/07/01 01:15:55 gutteridge Exp $
 
 DISTNAME=      getopt-1.1.6
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://frodo.looijaard.name/system/files/software/getopt/
 

Index: pkgsrc/misc/getopt/distinfo
diff -u pkgsrc/misc/getopt/distinfo:1.12 pkgsrc/misc/getopt/distinfo:1.13
--- pkgsrc/misc/getopt/distinfo:1.12    Tue May 19 07:57:55 2026
+++ pkgsrc/misc/getopt/distinfo Wed Jul  1 01:15:55 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2026/05/19 07:57:55 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2026/07/01 01:15:55 gutteridge Exp $
 
 BLAKE2s (getopt-1.1.6.tar.gz) = d6be5df3bedf765fe4b4e8a287bf8578d2cb22330f1e3016d665cf03ab963754
 SHA512 (getopt-1.1.6.tar.gz) = aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
 Size (getopt-1.1.6.tar.gz) = 58926 bytes
-SHA1 (patch-aa) = 6062d6b15990142ba8d5556eb0588f948674b4ae
+SHA1 (patch-aa) = 44b80e65033e59c646e36713061a09da2e71f400
 SHA1 (patch-ab) = bd00147c65577de29cd935a714b8ae0852bff0fb
 SHA1 (patch-gnu_getopt.c) = caae6177c2c70d5dcd764e7299135a6efb410d73
 SHA1 (patch-gnu_getopt.h) = 3d8c015786c6e4b451efc7cd294977250a05df9d

Index: pkgsrc/misc/getopt/patches/patch-aa
diff -u pkgsrc/misc/getopt/patches/patch-aa:1.3 pkgsrc/misc/getopt/patches/patch-aa:1.4
--- pkgsrc/misc/getopt/patches/patch-aa:1.3     Tue May 19 07:57:55 2026
+++ pkgsrc/misc/getopt/patches/patch-aa Wed Jul  1 01:15:55 2026
@@ -1,10 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2026/05/19 07:57:55 jperkin Exp $
+$NetBSD: patch-aa,v 1.4 2026/07/01 01:15:55 gutteridge Exp $
 
 Add missing includes.
 
---- getopt.c.orig      2003-01-23 21:51:24.000000000 +0100
+Use ctype.h correctly.
+
+--- getopt.c.orig      2014-11-24 12:33:57.000000000 +0000
 +++ getopt.c
-@@ -58,6 +58,7 @@
+@@ -61,6 +61,7 @@
  #include <string.h>
  #include <unistd.h>
  #include <ctype.h>
@@ -12,3 +14,12 @@ Add missing includes.
  
  #if LIBCGETOPT
  #include <getopt.h>
+@@ -158,7 +159,7 @@ static const char *normalize(const char
+                       /* Newline: replace it with: \n */
+                       *bufptr++ = '\\';
+                       *bufptr++ = 'n';
+-              } else if (shell == TCSH && isspace(*argptr)) {
++              } else if (shell == TCSH && isspace((unsigned char)*argptr)) {
+                       /* Non-newline whitespace: replace it with \<ws> */
+                       *bufptr++ = '\'';
+                       *bufptr++ = '\\';