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 03:16:21 +0000

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 03:16:21 UTC 2025

Modified Files:
        pkgsrc/shells/bash: distinfo
Added Files:
        pkgsrc/shells/bash/patches: patch-builtins_common.h patch-error.h
            patch-externs.h patch-lib_readline_readline.h

Log Message:
shells/bash: Fix building when printf is defined to libintl_printf


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.1 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

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.89 pkgsrc/shells/bash/distinfo:1.90
--- pkgsrc/shells/bash/distinfo:1.89    Thu Jul 31 21:48:09 2025
+++ pkgsrc/shells/bash/distinfo Sun Oct  5 03:16:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2025/07/31 21:48:09 gutteridge Exp $
+$NetBSD: distinfo,v 1.90 2025/10/05 03:16:21 js Exp $
 
 BLAKE2s (bash-5.3/bash-5.3.tar.gz) = d4ed22a4b1e170ae9eee8732048cb649aa1d0c4dded08f23abefd7a581822afc
 SHA512 (bash-5.3/bash-5.3.tar.gz) = 426702c8b0fb9e0c9956259973ce5b657890fd47f4f807a64febf20077bb48d0b91474ed6e843d2ef277186b46c5fffa79b808da9b48d4ec027d5e2de1b28ed8
@@ -13,5 +13,9 @@ 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-builtins_common.h) = c5b97e165fe06c612d340f683695c5c6a115c274
+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

Added files:

Index: pkgsrc/shells/bash/patches/patch-builtins_common.h
diff -u /dev/null pkgsrc/shells/bash/patches/patch-builtins_common.h:1.1
--- /dev/null   Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-builtins_common.h  Sun Oct  5 03:16:21 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-builtins_common.h,v 1.1 2025/10/05 03:16:21 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- builtins/common.h.orig     2024-10-23 19:40:02.000000000 +0000
++++ builtins/common.h
+@@ -82,8 +82,8 @@ do { \
+ #define MAX_ATTRIBUTES                16
+ 
+ /* Functions from common.c */
+-extern void builtin_error (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
+-extern void builtin_warning (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
++extern void builtin_error (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
++extern void builtin_warning (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
+ extern void builtin_usage (void);
+ extern void no_args (WORD_LIST *, int);
+ extern int no_options (WORD_LIST *);
Index: pkgsrc/shells/bash/patches/patch-error.h
diff -u /dev/null pkgsrc/shells/bash/patches/patch-error.h:1.1
--- /dev/null   Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-error.h    Sun Oct  5 03:16:21 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-error.h,v 1.1 2025/10/05 03:16:21 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- error.h.orig       2024-10-24 18:24:03.000000000 +0000
++++ error.h
+@@ -30,36 +30,36 @@ extern char *get_name_for_error (void);
+ extern void file_error (const char *);
+ 
+ /* Report a programmer's error, and abort.  Pass REASON, and ARG1 ... ARG5. */
+-extern void programming_error (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void programming_error (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* General error reporting.  Pass FORMAT and ARG1 ... ARG5. */
+-extern void report_error (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
++extern void report_error (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Error messages for parts of the parser that don't call report_syntax_error */
+-extern void parser_error (int, const char *, ...) __attribute__((__format__ (printf, 2, 3)));
++extern void parser_error (int, const char *, ...) __attribute__((__format__ (__printf__, 2, 3)));
+ 
+ /* Report an unrecoverable error and exit.  Pass FORMAT and ARG1 ... ARG5. */
+-extern void fatal_error (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void fatal_error (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Report a system error, like BSD warn(3). */
+-extern void sys_error (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void sys_error (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Report an internal error. */
+-extern void internal_error (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void internal_error (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Report an internal warning. */
+-extern void internal_warning (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
++extern void internal_warning (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Report an internal warning for debugging purposes. */
+-extern void internal_debug (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void internal_debug (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Report an internal informational notice. */
+-extern void internal_inform (const char *, ...) __attribute__((__format__ (printf, 1, 2)));
++extern void internal_inform (const char *, ...) __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ /* Debugging functions, not enabled in released version. */
+ extern char *strescape (const char *);
+-extern void itrace (const char *, ...) __attribute__ ((__format__ (printf, 1, 2)));
+-extern void trace (const char *, ...) __attribute__ ((__format__ (printf, 1, 2)));
++extern void itrace (const char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
++extern void trace (const char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+ 
+ /* Report an error having to do with command parsing or execution. */
+ extern void command_error (const char *, int, int, int);
Index: pkgsrc/shells/bash/patches/patch-externs.h
diff -u /dev/null pkgsrc/shells/bash/patches/patch-externs.h:1.1
--- /dev/null   Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-externs.h  Sun Oct  5 03:16:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-externs.h,v 1.1 2025/10/05 03:16:21 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- externs.h.orig     2025-03-07 23:48:53.000000000 +0000
++++ externs.h
+@@ -217,7 +217,7 @@ extern int compat_init (void);
+ 
+ /* Declarations for functions defined in lib/sh/dprintf.c */
+ #if !defined (HAVE_DPRINTF)
+-extern void dprintf (int, const char *, ...)  __attribute__((__format__ (printf, 2, 3)));
++extern void dprintf (int, const char *, ...)  __attribute__((__format__ (__printf__, 2, 3)));
+ #endif
+ 
+ /* Declarations for functions defined in lib/sh/fmtulong.c */
Index: pkgsrc/shells/bash/patches/patch-lib_readline_readline.h
diff -u /dev/null pkgsrc/shells/bash/patches/patch-lib_readline_readline.h:1.1
--- /dev/null   Sun Oct  5 03:16:21 2025
+++ pkgsrc/shells/bash/patches/patch-lib_readline_readline.h    Sun Oct  5 03:16:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_readline_readline.h,v 1.1 2025/10/05 03:16:21 js Exp $
+
+Fix building when printf is defined to libintl_printf.
+
+--- lib/readline/readline.h.orig       2024-11-15 17:22:56.000000000 +0000
++++ lib/readline/readline.h
+@@ -409,7 +409,7 @@ extern void rl_activate_mark (void);
+ extern void rl_deactivate_mark (void);
+ extern int rl_mark_active_p (void);
+ 
+-extern int rl_message (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
++extern int rl_message (const char *, ...)  __attribute__((__format__ (__printf__, 1, 2)));
+ 
+ extern int rl_show_char (int);
+

Prev by Date: CVS commit: pkgsrc/devel/libevent
Next by Date: CVS commit: pkgsrc/devel/libevent
Previous by Thread: CVS commit: pkgsrc/devel/libevent
Next by Thread: CVS commit: pkgsrc/devel/libevent
Indexes:

Home | Main Index | Thread Index | Old Index