git: 3508799be924 - main - shells/bash: Update to 5.3

Reply: Sergey A. Osokin: "Re: git: 3508799be924 - main - shells/bash: Update to 5.3"
Reply: Matthias Fechner : "Re: git: 3508799be924 - main - shells/bash: Update to 5.3"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Emanuel Haupt <ehaupt_at_FreeBSD.org>
Date: Mon, 07 Jul 2025 18:07:29 UTC
The branch main has been updated by ehaupt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3508799be924c3e1594e54067b94395db7a68fcf

commit 3508799be924c3e1594e54067b94395db7a68fcf
Author:     Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2025-07-07 18:03:00 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2025-07-07 18:03:17 +0000

    shells/bash: Update to 5.3
    
    Changes:        https://lists.gnu.org/archive/html/bash-announce/2025-07/msg00000.html
---
 shells/bash/Makefile                               | 35 +++++----
 shells/bash/distinfo                               | 80 +-------------------
 shells/bash/files/patch-Makefile.in                | 12 +--
 shells/bash/files/patch-config-top.h               |  6 +-
 shells/bash/files/patch-doc_Makefile.in            | 22 ------
 shells/bash/files/patch-doc_bash.1                 | 86 ++++++----------------
 shells/bash/files/patch-doc_bashref.texi           | 16 ++--
 .../bash/files/patch-examples_loadables_getconf.c  | 11 ---
 shells/bash/files/patch-lib_readline_display.c     |  9 ++-
 shells/bash/pkg-plist                              |  9 +++
 10 files changed, 77 insertions(+), 209 deletions(-)

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 1062baa440fa..58ad513117f5 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,17 +1,20 @@
+# Please keep the commented variables for now, as we will need them once
+# the first patchset is released
+
 PORTNAME=		bash
-PATCHLEVEL=		37
-PORTVERSION=		5.2.${PATCHLEVEL:S/^0//g}
-PORTREVISION=		1
+#PATCHLEVEL=		0
+#PORTVERSION=		5.3.${PATCHLEVEL:S/^0//g}
+PORTVERSION=		5.3
 CATEGORIES=		shells
 MASTER_SITES=		GNU
-DISTNAME=		${PORTNAME}-${PORTVERSION:R}
+#DISTNAME=		${PORTNAME}-${PORTVERSION:R}
 DIST_SUBDIR=		${PORTNAME}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/
-PATCHFILES!=		/usr/bin/jot -s " " -w \
-			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
-			${PATCHLEVEL} 1 ${PATCHLEVEL}
+#PATCH_SITES=		GNU/${PORTNAME}/${DISTNAME}-patches/
+#PATCHFILES!=		/usr/bin/jot -s " " -w \
+#			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
+#			${PATCHLEVEL} 1 ${PATCHLEVEL}
 
 MAINTAINER=		ehaupt@FreeBSD.org
 COMMENT=		GNU Project's Bourne Again SHell
@@ -34,14 +37,13 @@ INFO=			bash
 PORTDOCS=		FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \
 			bash.html bashref.html
 
-OPTIONS_DEFINE=		FDESCFS PORTS_READLINE HELP NLS STATIC SYSBASHRC \
+OPTIONS_DEFINE=		FDESCFS HELP NLS STATIC SYSBASHRC \
 			SYSLOG DOCS
-OPTIONS_DEFAULT=	HELP PORTS_READLINE
+OPTIONS_DEFAULT=	HELP
 OPTIONS_SUB=		yes
 
 FDESCFS_DESC=		Enable use of /dev/fd
 HELP_DESC=		Enable builtin help
-PORTS_READLINE_DESC=	libreadline from ports instead of bundled one
 SYSBASHRC_DESC=		Enable system-wide rc files
 
 FDESCFS_CONFIGURE_ENV_OFF=	bash_cv_dev_fd=absent
@@ -51,14 +53,15 @@ HELP_CONFIGURE_ENABLE=	help-builtin
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-PORTS_READLINE_BUILD_DEPENDS=	readline>=8.2:devel/readline
-PORTS_READLINE_USES=	readline
-PORTS_READLINE_CONFIGURE_WITH=	installed-readline
+# Needs readline 8.3
+#PORTS_READLINE_BUILD_DEPENDS=	readline>=8.2:devel/readline
+#PORTS_READLINE_USES=	readline
+#PORTS_READLINE_CONFIGURE_WITH=	installed-readline
 
 .if empty(PKGNAMESUFFIX)
-CONFLICTS+=	bash-static bash53-static
+CONFLICTS+=	bash-static
 .else
-CONFLICTS+=	bash bash53
+CONFLICTS+=	bash
 .endif
 CONFLICTS+=	bashc
 
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 24949297997c..76fc988fea91 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,77 +1,3 @@
-TIMESTAMP = 1727157507
-SHA256 (bash/bash-5.2.tar.gz) = a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
-SIZE (bash/bash-5.2.tar.gz) = 10950833
-SHA256 (bash/bash52-001) = f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a
-SIZE (bash/bash52-001) = 1381
-SHA256 (bash/bash52-002) = 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8
-SIZE (bash/bash52-002) = 1328
-SHA256 (bash/bash52-003) = 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff
-SIZE (bash/bash52-003) = 2157
-SHA256 (bash/bash52-004) = 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512
-SIZE (bash/bash52-004) = 2016
-SHA256 (bash/bash52-005) = ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357
-SIZE (bash/bash52-005) = 1515
-SHA256 (bash/bash52-006) = d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c
-SIZE (bash/bash52-006) = 8790
-SHA256 (bash/bash52-007) = 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490
-SIZE (bash/bash52-007) = 9072
-SHA256 (bash/bash52-008) = 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8
-SIZE (bash/bash52-008) = 1771
-SHA256 (bash/bash52-009) = f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd
-SIZE (bash/bash52-009) = 1316
-SHA256 (bash/bash52-010) = c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd
-SIZE (bash/bash52-010) = 2045
-SHA256 (bash/bash52-011) = 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4
-SIZE (bash/bash52-011) = 1229
-SHA256 (bash/bash52-012) = 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
-SIZE (bash/bash52-012) = 9107
-SHA256 (bash/bash52-013) = 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
-SIZE (bash/bash52-013) = 1503
-SHA256 (bash/bash52-014) = 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
-SIZE (bash/bash52-014) = 3245
-SHA256 (bash/bash52-015) = ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a
-SIZE (bash/bash52-015) = 8088
-SHA256 (bash/bash52-016) = 155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915
-SIZE (bash/bash52-016) = 1225
-SHA256 (bash/bash52-017) = 1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89
-SIZE (bash/bash52-017) = 1396
-SHA256 (bash/bash52-018) = 4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80
-SIZE (bash/bash52-018) = 151467
-SHA256 (bash/bash52-019) = 325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282
-SIZE (bash/bash52-019) = 2548
-SHA256 (bash/bash52-020) = b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d
-SIZE (bash/bash52-020) = 1459
-SHA256 (bash/bash52-021) = 8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd
-SIZE (bash/bash52-021) = 1890
-SHA256 (bash/bash52-022) = 78b5230a49594ec30811e72dcd0f56d1089710ec7828621022d08507aa57e470
-SIZE (bash/bash52-022) = 1305
-SHA256 (bash/bash52-023) = af905502e2106c8510ba2085aa2b56e64830fc0fdf6ee67ebb459ac11696dcd3
-SIZE (bash/bash52-023) = 1817
-SHA256 (bash/bash52-024) = 971534490117eb05d97d7fd81f5f9d8daf927b4d581231844ffae485651b02c3
-SIZE (bash/bash52-024) = 2298
-SHA256 (bash/bash52-025) = 5138f487e7cf71a6323dc81d22419906f1535b89835cc2ff68847e1a35613075
-SIZE (bash/bash52-025) = 1454
-SHA256 (bash/bash52-026) = 96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac
-SIZE (bash/bash52-026) = 1372
-SHA256 (bash/bash52-027) = e12a890a2e4f0d9c6ec1ce65b73da4fe116c8e4209bac8ac9dc4cd96f486ab39
-SIZE (bash/bash52-027) = 1881
-SHA256 (bash/bash52-028) = 6042780ba2893daca4a3f0f9b65728592cd7bb6d4cebe073855a6aad4d63aac1
-SIZE (bash/bash52-028) = 1571
-SHA256 (bash/bash52-029) = 125cacb37e625471924b3ee06c54cb1bf21b3b7fe0e569d24a681b0ec4a29987
-SIZE (bash/bash52-029) = 3619
-SHA256 (bash/bash52-030) = c3ff73230e123acdb5ac216921a386df8f74340459533d776d02811a1f76698f
-SIZE (bash/bash52-030) = 4111
-SHA256 (bash/bash52-031) = c2d1b7be2df771126105020af7fafa00fffd4deff4a4e45d60fc6a235bcba795
-SIZE (bash/bash52-031) = 1159
-SHA256 (bash/bash52-032) = 7b9c77daeca93ff711781d7537234166e83ed9835ce1ee7dcd5742319c372a16
-SIZE (bash/bash52-032) = 1529
-SHA256 (bash/bash52-033) = 013ec6cc10ad98060a7c34ed5c11187bcc5bf4510f32de0d545db89a9a52a2e2
-SIZE (bash/bash52-033) = 2131
-SHA256 (bash/bash52-034) = 899fbb3b338048fe52a9c8252bf65ef1194cdff4f7a3fb3316f5f2396143232e
-SIZE (bash/bash52-034) = 4134
-SHA256 (bash/bash52-035) = 821a0a47fa692bb0a39482728b1b396bf951e2912768fea6f3026c813c1913e5
-SIZE (bash/bash52-035) = 3413
-SHA256 (bash/bash52-036) = 15c93f4936a5e5b88301f3ede767a23d3dd19635af2f3a91fb4cc0e560ca9057
-SIZE (bash/bash52-036) = 5941
-SHA256 (bash/bash52-037) = 8a2c1c3b5125d9ae5b47882f7d2ddf9648805f8c67c13aa5ea7efeac475cda94
-SIZE (bash/bash52-037) = 2835
+TIMESTAMP = 1751628977
+SHA256 (bash/bash-5.3.tar.gz) = 62dd49c44c399ed1b3f7f731e87a782334d834f08e098a35f2c87547d5dbb269
+SIZE (bash/bash-5.3.tar.gz) = 11354270
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));
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
index 7db654ced8af..62cf3f7e51cd 100644
--- a/shells/bash/pkg-plist
+++ b/shells/bash/pkg-plist
@@ -34,6 +34,7 @@ bin/bashbug
 %%NO_STATIC%%include/bash/include/ocache.h
 %%NO_STATIC%%include/bash/include/posixdir.h
 %%NO_STATIC%%include/bash/include/posixjmp.h
+%%NO_STATIC%%include/bash/include/posixselect.h
 %%NO_STATIC%%include/bash/include/posixstat.h
 %%NO_STATIC%%include/bash/include/posixtime.h
 %%NO_STATIC%%include/bash/include/posixwait.h
@@ -43,8 +44,10 @@ bin/bashbug
 %%NO_STATIC%%include/bash/include/stat-time.h
 %%NO_STATIC%%include/bash/include/stdc.h
 %%NO_STATIC%%include/bash/include/systimes.h
+%%NO_STATIC%%include/bash/include/timer.h
 %%NO_STATIC%%include/bash/include/typemax.h
 %%NO_STATIC%%include/bash/include/unionwait.h
+%%NO_STATIC%%include/bash/include/unlocked-io.h
 %%NO_STATIC%%include/bash/jobs.h
 %%NO_STATIC%%include/bash/make_cmd.h
 %%NO_STATIC%%include/bash/pathnames.h
@@ -64,15 +67,18 @@ bin/bashbug
 %%NO_STATIC%%lib/bash/Makefile.sample
 %%NO_STATIC%%lib/bash/accept
 %%NO_STATIC%%lib/bash/basename
+%%NO_STATIC%%lib/bash/chmod
 %%NO_STATIC%%lib/bash/csv
 %%NO_STATIC%%lib/bash/cut
 %%NO_STATIC%%lib/bash/dirname
 %%NO_STATIC%%lib/bash/dsv
 %%NO_STATIC%%lib/bash/fdflags
 %%NO_STATIC%%lib/bash/finfo
+%%NO_STATIC%%lib/bash/fltexpr
 %%NO_STATIC%%lib/bash/getconf
 %%NO_STATIC%%lib/bash/head
 %%NO_STATIC%%lib/bash/id
+%%NO_STATIC%%lib/bash/kv
 %%NO_STATIC%%lib/bash/ln
 %%NO_STATIC%%lib/bash/loadables.h
 %%NO_STATIC%%lib/bash/logname
@@ -92,6 +98,7 @@ bin/bashbug
 %%NO_STATIC%%lib/bash/sleep
 %%NO_STATIC%%lib/bash/stat
 %%NO_STATIC%%lib/bash/strftime
+%%NO_STATIC%%lib/bash/strptime
 %%NO_STATIC%%lib/bash/sync
 %%NO_STATIC%%lib/bash/tee
 %%NO_STATIC%%lib/bash/truefalse
@@ -123,6 +130,7 @@ share/man/man1/bashbug.1.gz
 %%NLS%%share/locale/id/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bash.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/bash.mo
@@ -134,6 +142,7 @@ share/man/man1/bashbug.1.gz
 %%NLS%%share/locale/ru/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/bash.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bash.mo