CVS commit: pkgsrc/shells/bash

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Fri Oct 10 20:48:02 UTC 2025

Modified Files:
        pkgsrc/shells/bash: distinfo
        pkgsrc/shells/bash/patches: patch-examples_loadables_finfo.c
Added Files:
        pkgsrc/shells/bash/patches: patch-lib_glob_smatch.c
            patch-lib_readline_rlprivate.h

Log Message:
Make shells/bash build and work on QNX


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/bash/patches/patch-lib_glob_smatch.c \
    pkgsrc/shells/bash/patches/patch-lib_readline_rlprivate.h

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

Modified files:

Index: pkgsrc/shells/bash/distinfo
diff -u pkgsrc/shells/bash/distinfo:1.91 pkgsrc/shells/bash/distinfo:1.92
--- pkgsrc/shells/bash/distinfo:1.91    Sun Oct  5 11:18:27 2025
+++ pkgsrc/shells/bash/distinfo Fri Oct 10 20:48:02 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2025/10/05 11:18:27 js Exp $
+$NetBSD: distinfo,v 1.92 2025/10/10 20:48:02 js Exp $
 
 BLAKE2s (bash-5.3/bash-5.3.tar.gz) = d4ed22a4b1e170ae9eee8732048cb649aa1d0c4dded08f23abefd7a581822afc
 SHA512 (bash-5.3/bash-5.3.tar.gz) = 426702c8b0fb9e0c9956259973ce5b657890fd47f4f807a64febf20077bb48d0b91474ed6e843d2ef277186b46c5fffa79b808da9b48d4ec027d5e2de1b28ed8
@@ -19,7 +19,9 @@ SHA1 (patch-builtins_printf.def) = 2c471
 SHA1 (patch-configure) = 9082e70f60e05f80e53c264ea021be55066d97b3
 SHA1 (patch-error.h) = 18ce41a5a366c7fcb7294774821d440e17ca51af
 SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
-SHA1 (patch-examples_loadables_finfo.c) = 3151c7cc860f263ff055654aadb61cc62141e157
+SHA1 (patch-examples_loadables_finfo.c) = 0e20095f48244c53856161279f144b13d82ad459
 SHA1 (patch-externs.h) = 8991b42d873790415ee1c9ae2cae84fe6d5a7774
+SHA1 (patch-lib_glob_smatch.c) = 1ec6931a8a9bf8e0ef95ce24c56ea0f838682d85
 SHA1 (patch-lib_readline_readline.h) = d453ce8a9ab8916f3f122b845f2254038d3cf063
+SHA1 (patch-lib_readline_rlprivate.h) = 83356d26e044fb58a570d9fa914d4957cc12823d
 SHA1 (patch-print_cmd.c) = 73032d863c502dab071ad1c9ed06501506bab956

Index: pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c
diff -u pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c:1.1 pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c:1.2
--- pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c:1.1     Thu Jul 10 14:36:20 2025
+++ pkgsrc/shells/bash/patches/patch-examples_loadables_finfo.c Fri Oct 10 20:48:02 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_loadables_finfo.c,v 1.1 2025/07/10 14:36:20 jperkin Exp $
+$NetBSD: patch-examples_loadables_finfo.c,v 1.2 2025/10/10 20:48:02 js Exp $
 
 MAJOR_IN_MKDEV is not in config.h so will never be defined, for now just go
 with the simple workaround for illumos which will definitely need mkdev.h.
@@ -14,3 +14,12 @@ with the simple workaround for illumos w
  #  include <sys/mkdev.h>
  #endif
  #ifdef MAJOR_IN_SYSMACROS
+@@ -273,7 +273,7 @@ printst(struct stat *st)
+ 
+       ma = major (st->st_rdev);
+       mi = minor (st->st_rdev);
+-#if defined (makedev)
++#if defined (makedev) && !defined(__QNX__)
+       d = makedev (ma, mi);
+ #else
+       d = st->st_rdev & 0xFF;

Added files:

Index: pkgsrc/shells/bash/patches/patch-lib_glob_smatch.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-lib_glob_smatch.c:1.1
--- /dev/null   Fri Oct 10 20:48:02 2025
+++ pkgsrc/shells/bash/patches/patch-lib_glob_smatch.c  Fri Oct 10 20:48:02 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_glob_smatch.c,v 1.1 2025/10/10 20:48:02 js Exp $
+
+--- lib/glob/smatch.c.orig     2023-05-29 18:15:17.000000000 +0000
++++ lib/glob/smatch.c
+@@ -137,6 +137,8 @@ rangecmp (int c1, int c2, int forcecoll)
+ #endif /* !HAVE_STRCOLL */
+ 
+ #if defined (HAVE_STRCOLL)
++extern int locale_utf8locale;
++
+ /* Returns 1 if chars C and EQUIV collate equally in the current locale. */
+ static int
+ collseqcmp (int c, int equiv)
Index: pkgsrc/shells/bash/patches/patch-lib_readline_rlprivate.h
diff -u /dev/null pkgsrc/shells/bash/patches/patch-lib_readline_rlprivate.h:1.1
--- /dev/null   Fri Oct 10 20:48:02 2025
+++ pkgsrc/shells/bash/patches/patch-lib_readline_rlprivate.h   Fri Oct 10 20:48:02 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_readline_rlprivate.h,v 1.1 2025/10/10 20:48:02 js Exp $
+
+--- lib/readline/rlprivate.h.orig      2025-03-07 23:51:02.000000000 +0000
++++ lib/readline/rlprivate.h
+@@ -344,6 +344,8 @@ extern int _rl_timeout_handle_sigalrm (v
+ 
+ #endif
+ #if defined (RL_TIMEOUT_USE_SELECT)
++#include <signal.h>
++#include <sys/select.h>
+ extern int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
+ #endif
+