This commit is contained in:
2025-08-26 08:11:42 +02:00
parent 18e2a5368d
commit 67c8d5ea09
189 changed files with 8108 additions and 980 deletions

View File

@@ -0,0 +1,12 @@
--- Makefile.in.orig 2022-09-27 16:41:33 UTC
+++ Makefile.in
@@ -846,7 +846,9 @@ install: .made installdirs
infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
-( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
-( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+.if !$(STATIC_LD:M-static)
-( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+.endif
install-strip:
$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \

View File

@@ -0,0 +1,11 @@
--- config-top.h.orig 2021-11-05 13:11:12 UTC
+++ config-top.h
@@ -84,7 +84,7 @@
#endif
/* Default primary and secondary prompt strings. */
-#define PPROMPT "\\s-\\v\\$ "
+#define PPROMPT "[\\u@\\h \\w]\\$ "
#define SPROMPT "> "
/* Undefine this if you don't want the ksh-compatible behavior of reprinting

View File

@@ -0,0 +1,22 @@
--- 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

View File

@@ -0,0 +1,63 @@
--- doc/bash.1.orig 2022-09-19 15:36:55 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

View File

@@ -0,0 +1,28 @@
--- doc/bashref.texi.orig 2022-09-19 15:41:39 UTC
+++ doc/bashref.texi
@@ -1,6 +1,6 @@
\input texinfo.tex @c -*- texinfo -*-
@c %**start of header
-@setfilename bashref.info
+@setfilename bash.info
@settitle Bash Reference Manual
@include version.texi
@@ -8,7 +8,7 @@
@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})
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.
@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]\$ }.
@xref{Controlling the Prompt}, for the complete list of escape
sequences that are expanded before @env{PS1} is displayed.

View File

@@ -0,0 +1,13 @@
--- lib/readline/display.c.orig 2022-04-05 14:47:31 UTC
+++ lib/readline/display.c
@@ -953,7 +953,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. */
+ if (local_prompt)
lpos = prompt_physical_chars + modmark;
+ else
+ lpos = 0;
#if defined (HANDLE_MULTIBYTE)
memset (line_state_invisible->wrapped_line, 0, line_state_invisible->wbsize * sizeof (int));

View File

@@ -0,0 +1,15 @@
[
{ type: install
message: <<EOM
bash requires fdescfs(5) mounted on /dev/fd
If you have not done it yet, please do the following:
mount -t fdescfs fdescfs /dev/fd
To make it permanent, you need the following lines in /etc/fstab:
fdescfs /dev/fd fdescfs rw,late 0 0
EOM
}
]