CVS commit: pkgsrc/shells/bash

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/shells/bash
From: "Jonathan Schleifer" <js%netbsd.org@localhost>
Date: Sun, 5 Oct 2025 11:18:27 +0000

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 11:18:27 UTC 2025

Modified Files:
        pkgsrc/shells/bash: distinfo
        pkgsrc/shells/bash/patches: patch-builtins_common.h patch-error.h
            patch-externs.h patch-lib_readline_readline.h
Added Files:
        pkgsrc/shells/bash/patches: patch-bashline.c patch-builtins_printf.def
            patch-configure patch-print_cmd.c

Log Message:
shells/bash: More printf and QNX fixes

Still not there yet.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/shells/bash/patches/patch-bashline.c \
    pkgsrc/shells/bash/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/bash/patches/patch-builtins_common.h \
    pkgsrc/shells/bash/patches/patch-error.h \
    pkgsrc/shells/bash/patches/patch-externs.h \
    pkgsrc/shells/bash/patches/patch-lib_readline_readline.h
cvs rdiff -u -r0 -r1.3 pkgsrc/shells/bash/patches/patch-builtins_printf.def
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/bash/patches/patch-print_cmd.c

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.90 pkgsrc/shells/bash/distinfo:1.91
--- pkgsrc/shells/bash/distinfo:1.90    Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/distinfo Sun Oct  5 11:18:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2025/10/05 03:16:21 js Exp $
+$NetBSD: distinfo,v 1.91 2025/10/05 11:18:27 js Exp $
 
 BLAKE2s (bash-5.3/bash-5.3.tar.gz) = d4ed22a4b1e170ae9eee8732048cb649aa1d0c4dded08f23abefd7a581822afc
 SHA512 (bash-5.3/bash-5.3.tar.gz) = 426702c8b0fb9e0c9956259973ce5b657890fd47f4f807a64febf20077bb48d0b91474ed6e843d2ef277186b46c5fffa79b808da9b48d4ec027d5e2de1b28ed8
@@ -13,9 +13,13 @@ BLAKE2s (bash-5.3/bash53-003) = 31eed599
 SHA512 (bash-5.3/bash53-003) = 3d4004653cb3f2cba984e67b8e7ae54c19351e176b62bb415f88fdd482ae04be063dacf6303c8343ab6c8bf4f2388026c1742ac603a5cd5c330db22a4b76f4cb
 Size (bash-5.3/bash53-003) = 2683 bytes
 SHA1 (patch-Makefile.in) = 5e5333bfbb7ea03207e01ea75caeca0d9c9ecdc0
+SHA1 (patch-bashline.c) = 0f44d7995ff839b0a7ce6a6b55711a151fa94688
 SHA1 (patch-builtins_common.h) = c5b97e165fe06c612d340f683695c5c6a115c274
+SHA1 (patch-builtins_printf.def) = 2c471747403ca3b278f4452ee90e69c745145740
+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-externs.h) = 8991b42d873790415ee1c9ae2cae84fe6d5a7774
 SHA1 (patch-lib_readline_readline.h) = d453ce8a9ab8916f3f122b845f2254038d3cf063
+SHA1 (patch-print_cmd.c) = 73032d863c502dab071ad1c9ed06501506bab956

Index: pkgsrc/shells/bash/patches/patch-builtins_common.h
diff -u pkgsrc/shells/bash/patches/patch-builtins_common.h:1.1 pkgsrc/shells/bash/patches/patch-builtins_common.h:1.2
--- pkgsrc/shells/bash/patches/patch-builtins_common.h:1.1      Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-builtins_common.h  Sun Oct  5 11:18:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-builtins_common.h,v 1.1 2025/10/05 03:16:21 js Exp $
+$NetBSD: patch-builtins_common.h,v 1.2 2025/10/05 11:18:27 js Exp $
 
 Fix building when printf is defined to libintl_printf.
 
Index: pkgsrc/shells/bash/patches/patch-error.h
diff -u pkgsrc/shells/bash/patches/patch-error.h:1.1 pkgsrc/shells/bash/patches/patch-error.h:1.2
--- pkgsrc/shells/bash/patches/patch-error.h:1.1        Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-error.h    Sun Oct  5 11:18:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-error.h,v 1.1 2025/10/05 03:16:21 js Exp $
+$NetBSD: patch-error.h,v 1.2 2025/10/05 11:18:27 js Exp $
 
 Fix building when printf is defined to libintl_printf.
 
Index: pkgsrc/shells/bash/patches/patch-externs.h
diff -u pkgsrc/shells/bash/patches/patch-externs.h:1.1 pkgsrc/shells/bash/patches/patch-externs.h:1.2
--- pkgsrc/shells/bash/patches/patch-externs.h:1.1      Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-externs.h  Sun Oct  5 11:18:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-externs.h,v 1.1 2025/10/05 03:16:21 js Exp $
+$NetBSD: patch-externs.h,v 1.2 2025/10/05 11:18:27 js Exp $
 
 Fix building when printf is defined to libintl_printf.
 
Index: pkgsrc/shells/bash/patches/patch-lib_readline_readline.h
diff -u pkgsrc/shells/bash/patches/patch-lib_readline_readline.h:1.1 pkgsrc/shells/bash/patches/patch-lib_readline_readline.h:1.2
--- pkgsrc/shells/bash/patches/patch-lib_readline_readline.h:1.1        Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-lib_readline_readline.h    Sun Oct  5 11:18:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_readline_readline.h,v 1.1 2025/10/05 03:16:21 js Exp $
+$NetBSD: patch-lib_readline_readline.h,v 1.2 2025/10/05 11:18:27 js Exp $
 
 Fix building when printf is defined to libintl_printf.
 

Added files:

Index: pkgsrc/shells/bash/patches/patch-bashline.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-bashline.c:1.4
--- /dev/null   Sun Oct  5 11:18:27 2025
+++ pkgsrc/shells/bash/patches/patch-bashline.c Sun Oct  5 11:18:27 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-bashline.c,v 1.4 2025/10/05 11:18:27 js Exp $
+
+--- bashline.c.orig    2025-06-25 19:53:44.000000000 +0000
++++ bashline.c
+@@ -4142,7 +4142,7 @@ vi_advance_point (void)
+       }
+     }
+ #else
+-    rl_point++:
++    rl_point++;
+ #endif
+   return point;
+ }
Index: pkgsrc/shells/bash/patches/patch-configure
diff -u /dev/null pkgsrc/shells/bash/patches/patch-configure:1.4
--- /dev/null   Sun Oct  5 11:18:27 2025
+++ pkgsrc/shells/bash/patches/patch-configure  Sun Oct  5 11:18:27 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.4 2025/10/05 11:18:27 js Exp $
+
+--- configure.orig     2025-06-30 14:05:30.000000000 +0000
++++ configure
+@@ -23152,8 +23152,7 @@ linux*)                LOCAL_LDFLAGS=-rdynamic          # all
+               esac ;;
+ netbsd*|openbsd*)     LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ freebsd*|midnightbsd*)        LOCAL_CFLAGS='-DHEREDOC_PIPESIZE=4096' ;;
+-*qnx[67]*)    LOCAL_LIBS="-lncurses" ;;
+-*qnx*)                LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
++*qnx*)                LOCAL_LIBS="-lncurses" ;;
+ powerux*)     LOCAL_LIBS="-lgen" ;;
+ cygwin*|msys*)        LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE -D_ALL_SOURCE -DRECYCLES_PIDS" ;;

Index: pkgsrc/shells/bash/patches/patch-builtins_printf.def
diff -u /dev/null pkgsrc/shells/bash/patches/patch-builtins_printf.def:1.3
--- /dev/null   Sun Oct  5 11:18:27 2025
+++ pkgsrc/shells/bash/patches/patch-builtins_printf.def        Sun Oct  5 11:18:27 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-builtins_printf.def,v 1.3 2025/10/05 11:18:27 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- builtins/printf.def.orig   2025-03-17 15:49:35.000000000 +0000
++++ builtins/printf.def
+@@ -184,11 +184,11 @@ extern int errno;
+ extern time_t shell_start_time;
+ 
+ #if !HAVE_ASPRINTF
+-extern int asprintf (char **, const char *, ...) __attribute__((__format__ (printf, 2, 3)));
++extern int asprintf (char **, const char *, ...) __attribute__((__format__ (__printf__, 2, 3)));
+ #endif
+ 
+ #if !HAVE_VSNPRINTF
+-extern int vsnprintf (char *, size_t, const char *, va_list) __attribute__((__format__ (printf, 3, 0)));
++extern int vsnprintf (char *, size_t, const char *, va_list) __attribute__((__format__ (__printf__, 3, 0)));
+ #endif
+ 
+ static inline void printf_erange (char *);
+@@ -197,7 +197,7 @@ static int printstr (char *, char *, siz
+ static int tescape (char *, char *, int *, int *);
+ static char *bexpand (char *, size_t, int *, size_t *);
+ static char *vbadd (char *, int);
+-static int vbprintf (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++static int vbprintf (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ static char *mklong (char *, char *, size_t);
+ static int getchr (void);
+ static char *getstr (void);
+@@ -355,7 +355,9 @@ printf_builtin (WORD_LIST *list)
+ 
+   garglist = orig_arglist = list->next;
+ 
++#if defined (HANDLE_MULTIBYTE)
+   mb_cur_max = MB_CUR_MAX;
++#endif
+ 
+   /* Basic algorithm is to scan the format string for conversion
+      specifications -- once one is found, find out if the field

Index: pkgsrc/shells/bash/patches/patch-print_cmd.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-print_cmd.c:1.1
--- /dev/null   Sun Oct  5 11:18:27 2025
+++ pkgsrc/shells/bash/patches/patch-print_cmd.c        Sun Oct  5 11:18:27 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-print_cmd.c,v 1.1 2025/10/05 11:18:27 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- print_cmd.c.orig   2025-03-07 23:50:21.000000000 +0000
++++ print_cmd.c
+@@ -54,8 +54,8 @@ static int indentation_amount = 4;
+ 
+ typedef void PFUNC (const char *, ...);
+ 
+-static void cprintf (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
+-static void xprintf (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
++static void cprintf (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
++static void xprintf (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ static void uw_reset_locals (void *);
+

Prev by Date: Re: CVS commit: pkgsrc/misc/tmux
Next by Date: CVS commit: pkgsrc/devel/libgetopt
Previous by Thread: CVS commit: pkgsrc/misc/tmux/patches
Next by Thread: CVS commit: pkgsrc/devel/libgetopt
Indexes:

Home | Main Index | Thread Index | Old Index