summaryrefslogtreecommitdiff
path: root/shells/bash/files
diff options
context:
space:
mode:
Diffstat (limited to 'shells/bash/files')
-rw-r--r--shells/bash/files/patch-Makefile.in12
-rw-r--r--shells/bash/files/patch-config-top.h6
-rw-r--r--shells/bash/files/patch-doc_Makefile.in22
-rw-r--r--shells/bash/files/patch-doc_bash.186
-rw-r--r--shells/bash/files/patch-doc_bashref.texi16
-rw-r--r--shells/bash/files/patch-examples_loadables_getconf.c11
-rw-r--r--shells/bash/files/patch-lib_readline_display.c9
7 files changed, 46 insertions, 116 deletions
diff --git a/shells/bash/files/patch-Makefile.in b/shells/bash/files/patch-Makefile.in
index e21144f8db78..cfd72e4d9bdd 100644
--- a/shells/bash/files/patch-Makefile.in
+++ b/shells/bash/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig 2022-09-27 16:41:33 UTC
+--- Makefile.in.orig 2025-07-06 15:36:39 UTC
+++ Makefile.in
-@@ -846,7 +846,9 @@ install: .made installdirs
+@@ -923,7 +923,9 @@ install: .made installdirs
infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
- -( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
- -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+ -( cd $(DEFDIR) ; $(MAKE) $(BASH_MAKEFLAGS) DESTDIR=$(DESTDIR) $@ )
+ -( cd $(PO_DIR) ; $(MAKE) $(BASH_MAKEFLAGS) DESTDIR=$(DESTDIR) $@ )
+.if !$(STATIC_LD:M-static)
- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+ -( cd $(LOADABLES_DIR) && $(MAKE) $(BASH_MAKEFLAGS) DESTDIR=$(DESTDIR) $@ )
+.endif
install-strip:
- $(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
+ $(MAKE) $(BASH_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_STRIP_PROGRAM)' \
diff --git a/shells/bash/files/patch-config-top.h b/shells/bash/files/patch-config-top.h
index db9f68e9dfc4..526b15b6ecfe 100644
--- a/shells/bash/files/patch-config-top.h
+++ b/shells/bash/files/patch-config-top.h
@@ -1,6 +1,6 @@
---- config-top.h.orig 2021-11-05 14:11:12 UTC
-+++ config-top.h 2024-08-01 09:10:04 UTC
-@@ -84,7 +84,7 @@
+--- config-top.h.orig 2024-10-24 18:14:21 UTC
++++ config-top.h
+@@ -79,7 +79,7 @@
#endif
/* Default primary and secondary prompt strings. */
diff --git a/shells/bash/files/patch-doc_Makefile.in b/shells/bash/files/patch-doc_Makefile.in
deleted file mode 100644
index bdb9477dec3f..000000000000
--- a/shells/bash/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- doc/Makefile.in.orig 2022-09-27 16:41:33 UTC
-+++ doc/Makefile.in
-@@ -175,7 +175,7 @@ bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
- $(RM) $@
- ${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi || { ${RM} $@ ; exit 1; }
-
--bashref.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
-+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
- $(RM) $@
- $(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
-
-@@ -188,10 +188,6 @@ bashref.pdf: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
- # $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
- bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
- $(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
--
--bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
-- $(RM) $@
-- $(MAKEINFO) -o $@ --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
-
- bash.txt: bash.1
- bash.ps: bash.1
diff --git a/shells/bash/files/patch-doc_bash.1 b/shells/bash/files/patch-doc_bash.1
index 37b6e073f3a9..bc5c59098c2f 100644
--- a/shells/bash/files/patch-doc_bash.1
+++ b/shells/bash/files/patch-doc_bash.1
@@ -1,63 +1,25 @@
---- doc/bash.1.orig 2022-09-19 15:36:55 UTC
+--- doc/bash.1.orig 2025-04-30 13:04:32 UTC
+++ doc/bash.1
-@@ -31,9 +31,9 @@
- .\" .ll \\n(LLu
- .\" .in \\n()Ru+\\n(INu+\\n()Iu
- .\" .ti \\n(INu
--.\" .ie !\\n()Iu+\\n()Ru-\w\\*(]Xu-3p \{\\*(]X
-+.\" .ie !\\n()Iu+\\n()Ru-\w\\*(]Xu-3p \{\\*(]X
- .\" .br\}
--.\" .el \\*(]X\h|\\n()Iu+\\n()Ru\c
-+.\" .el \\*(]X\h|\\n()Iu+\\n()Ru\c
- .\" .}f
- .\" ..
- .\"
-@@ -204,7 +204,7 @@ library to read command lines when the shell is intera
- .TP
- .B \-\-noprofile
- Do not read either the system-wide startup file
--.FN /etc/profile
-+.FN %%LOCALBASE%%/etc/profile
- or any of the personal initialization files
- .IR ~/.bash_profile ,
- .IR ~/.bash_login ,
-@@ -316,7 +316,7 @@ When
- .B bash
- is invoked as an interactive login shell, or as a non-interactive shell
- with the \fB\-\-login\fP option, it first reads and
--executes commands from the file \fI/etc/profile\fP, if that
-+executes commands from the file \fI%%LOCALBASE%%/etc/profile\fP, if that
- file exists.
- After reading that file, it looks for \fI~/.bash_profile\fP,
- \fI~/.bash_login\fP, and \fI~/.profile\fP, in that order, and reads
-@@ -373,7 +373,7 @@ while conforming to the POSIX standard as well.
- When invoked as an interactive login shell, or a non-interactive
- shell with the \fB\-\-login\fP option, it first attempts to
- read and execute commands from
--.I /etc/profile
-+.I %%LOCALBASE%%/etc/profile
- and
- .IR ~/.profile ,
- in that order.
-@@ -2561,7 +2561,7 @@ The value of this parameter is expanded (see
- .SM
- .B PROMPTING
- below) and used as the primary prompt string. The default value is
--``\fB\es\-\ev\e$ \fP''.
-+``\fB\eu\@\eh\e$ \fP''.
- .TP
- .B PS2
- The value of this parameter is expanded as with
-@@ -11661,10 +11661,10 @@ http://tiswww.case.edu/~chet/bash/POSIX -- a descripti
- .SH FILES
- .PD 0
- .TP
--.FN /bin/bash
-+.FN %%PREFIX%%/bin/bash
- The \fBbash\fP executable
- .TP
--.FN /etc/profile
-+.FN %%LOCALBASE%%/etc/profile
- The systemwide initialization file, executed for login shells
- .TP
- .FN ~/.bash_profile
+@@ -6632,7 +6632,7 @@ If that file does not exist or cannot be read, \fBrea
+ If that variable is unset, the default is
+ .FN \*~/.inputrc .
+ If that file does not exist or cannot be read, \fBreadline\fP looks for
+-.FN /etc/inputrc .
++.FN /usr/local/usr/local/etc/inputrc .
+ When a program that uses the \fBreadline\fP library starts up,
+ \fBreadline\fP reads the initialization file
+ and sets the key bindings and variables found there,
+@@ -7398,11 +7398,11 @@ For example, the following directive would read
+ This directive takes a single filename as an argument and reads commands
+ and key bindings from that file.
+ For example, the following directive would read
+-.FN /etc/inputrc :
++.FN /usr/local/usr/local/etc/inputrc :
+ .PP
+ .RS
+ .nf
+-\fB$include\fP \^ \fI/etc/inputrc\fP
++\fB$include\fP \^ \fI/usr/local/usr/local/etc/inputrc\fP
+ .fi
+ .RE
+ .SS Searching
diff --git a/shells/bash/files/patch-doc_bashref.texi b/shells/bash/files/patch-doc_bashref.texi
index 8be950faba99..56f59863f5f1 100644
--- a/shells/bash/files/patch-doc_bashref.texi
+++ b/shells/bash/files/patch-doc_bashref.texi
@@ -1,4 +1,4 @@
---- doc/bashref.texi.orig 2022-09-19 15:41:39 UTC
+--- doc/bashref.texi.orig 2025-05-27 15:56:19 UTC
+++ doc/bashref.texi
@@ -1,6 +1,6 @@
\input texinfo.tex @c -*- texinfo -*-
@@ -8,21 +8,21 @@
@settitle Bash Reference Manual
@include version.texi
-@@ -8,7 +8,7 @@
+@@ -58,7 +58,7 @@ This text is a brief description of the features that
+ @top Bash Features
- @copying
This text is a brief description of the features that are present in
-the Bash shell (version @value{VERSION}, @value{UPDATED}).
+the Bash shell (version @value{VERSION}, @value{UPDATED})
+ The Bash home page is @url{http://www.gnu.org/software/bash/}.
This is Edition @value{EDITION}, last updated @value{UPDATED},
- of @cite{The GNU Bash Reference Manual},
-@@ -6004,7 +6004,7 @@ A null directory name may appear as two adjacent colon
- or trailing colon.
+@@ -6720,7 +6720,7 @@ The primary prompt string.
@item PS1
--The primary prompt string. The default value is @samp{\s-\v\$ }.
-+The primary prompt string. The default value is @samp{[\u@@\h \w]\$ }.
+ The primary prompt string.
+-The default value is @samp{\s-\v\$ }.
++The default value is @samp{[\u@@\h \w]\$ }.
@xref{Controlling the Prompt}, for the complete list of escape
sequences that are expanded before @env{PS1} is displayed.
diff --git a/shells/bash/files/patch-examples_loadables_getconf.c b/shells/bash/files/patch-examples_loadables_getconf.c
deleted file mode 100644
index 48d14a055ede..000000000000
--- a/shells/bash/files/patch-examples_loadables_getconf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/loadables/getconf.c.orig 2022-10-01 03:42:16 UTC
-+++ examples/loadables/getconf.c
-@@ -21,7 +21,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <error.h>
--#include <libintl.h>
-+#include <gettext.h>
- #include <locale.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/shells/bash/files/patch-lib_readline_display.c b/shells/bash/files/patch-lib_readline_display.c
index f81aba551533..4d8141cb7441 100644
--- a/shells/bash/files/patch-lib_readline_display.c
+++ b/shells/bash/files/patch-lib_readline_display.c
@@ -1,13 +1,14 @@
---- lib/readline/display.c.orig 2022-04-05 14:47:31 UTC
+--- lib/readline/display.c.orig 2025-05-02 13:20:32 UTC
+++ lib/readline/display.c
-@@ -953,7 +953,10 @@ rl_redisplay (void)
+@@ -999,7 +999,10 @@ rl_redisplay (void)
the line breaks in the prompt string in expand_prompt, taking invisible
characters into account, and if lpos exceeds the screen width, we copy
the data in the loop below. */
+- lpos = local_prompt ? prompt_physical_chars + modmark : 0;
+ if (local_prompt)
- lpos = prompt_physical_chars + modmark;
++ lpos = local_prompt ? prompt_physical_chars + modmark : 0;
+ else
-+ lpos = 0;
++ lpos = 0;
#if defined (HANDLE_MULTIBYTE)
memset (line_state_invisible->wrapped_line, 0, line_state_invisible->wbsize * sizeof (int));
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 22:32:36 +0000