bash: update to 5.0.009.
This commit is contained in:
parent
5887922adb
commit
d04b4ae7e5
3 changed files with 112 additions and 2 deletions
68
srcpkgs/bash/files/bash50-008
Normal file
68
srcpkgs/bash/files/bash50-008
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 5.0
|
||||||
|
Patch-ID: bash50-008
|
||||||
|
|
||||||
|
Bug-Reported-by: Michael Albinus <michael.albinus@gmx.de>
|
||||||
|
Bug-Reference-ID: <87bm36k3kz.fsf@gmx.de>
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
When HISTSIZE is set to 0, history expansion can leave the history length
|
||||||
|
set to an incorrect value, leading to subsequent attempts to access invalid
|
||||||
|
memory.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-5.0-patched/bashhist.c 2018-07-05 22:41:14.000000000 -0400
|
||||||
|
--- bashhist.c 2019-02-20 16:20:04.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 561,573 ****
|
||||||
|
if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
|
||||||
|
{
|
||||||
|
/* If we are expanding the second or later line of a multi-line
|
||||||
|
command, decrease history_length so references to history expansions
|
||||||
|
in these lines refer to the previous history entry and not the
|
||||||
|
current command. */
|
||||||
|
if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||||||
|
history_length--;
|
||||||
|
expanded = history_expand (line, &history_value);
|
||||||
|
if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||||||
|
! history_length++;
|
||||||
|
|
||||||
|
if (expanded)
|
||||||
|
--- 561,576 ----
|
||||||
|
if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
|
||||||
|
{
|
||||||
|
+ int old_len;
|
||||||
|
+
|
||||||
|
/* If we are expanding the second or later line of a multi-line
|
||||||
|
command, decrease history_length so references to history expansions
|
||||||
|
in these lines refer to the previous history entry and not the
|
||||||
|
current command. */
|
||||||
|
+ old_len = history_length;
|
||||||
|
if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||||||
|
history_length--;
|
||||||
|
expanded = history_expand (line, &history_value);
|
||||||
|
if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
|
||||||
|
! history_length = old_len;
|
||||||
|
|
||||||
|
if (expanded)
|
||||||
|
|
||||||
|
*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 7
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 8
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
42
srcpkgs/bash/files/bash50-009
Normal file
42
srcpkgs/bash/files/bash50-009
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 5.0
|
||||||
|
Patch-ID: bash50-009
|
||||||
|
|
||||||
|
Bug-Reported-by: chet.ramey@case.edu
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL:
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
The history file reading code doesn't close the file descriptor open to
|
||||||
|
the history file when it encounters a zero-length file.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-5.0-patched/lib/readline/histfile.c 2018-06-11 09:14:52.000000000 -0400
|
||||||
|
--- lib/readline/histfile.c 2019-05-16 15:55:57.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 306,309 ****
|
||||||
|
--- 312,316 ----
|
||||||
|
{
|
||||||
|
free (input);
|
||||||
|
+ close (file);
|
||||||
|
return 0; /* don't waste time if we don't have to */
|
||||||
|
}
|
||||||
|
*** ../bash-5.0/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 8
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 9
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
|
@ -1,9 +1,9 @@
|
||||||
# Template file for 'bash'
|
# Template file for 'bash'
|
||||||
pkgname=bash
|
pkgname=bash
|
||||||
_bash_distver=5.0
|
_bash_distver=5.0
|
||||||
_bash_patchlevel=007
|
_bash_patchlevel=009
|
||||||
version="${_bash_distver}.${_bash_patchlevel}"
|
version="${_bash_distver}.${_bash_patchlevel}"
|
||||||
revision=2
|
revision=1
|
||||||
wrksrc="${pkgname}-${_bash_distver}"
|
wrksrc="${pkgname}-${_bash_distver}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--without-bash-malloc --with-curses --without-installed-readline"
|
configure_args="--without-bash-malloc --with-curses --without-installed-readline"
|
||||||
|
|
Loading…
Reference in a new issue