From 073ae84e48be30be3f53ff77f51d7290d09f33fd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 7 Feb 2018 05:03:03 -0200 Subject: [PATCH] bash: update to 4.4.019. --- srcpkgs/bash/files/bash44-019 | 51 +++++++++++++++++++++++++++++++++++ srcpkgs/bash/template | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bash/files/bash44-019 diff --git a/srcpkgs/bash/files/bash44-019 b/srcpkgs/bash/files/bash44-019 new file mode 100644 index 00000000000..15bfca95e69 --- /dev/null +++ b/srcpkgs/bash/files/bash44-019 @@ -0,0 +1,51 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-019 + +Bug-Reported-by: Kieran Grant +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html + +Bug-Description: + +With certain values for PS1, especially those that wrap onto three or more +lines, readline will miscalculate the number of invisible characters, +leading to crashes and core dumps. + +Patch (apply with `patch -p0'): + +*** ../bash-4.4.18/lib/readline/display.c 2016-07-28 14:49:33.000000000 -0400 +--- lib/readline/display.c 2018-02-03 19:19:35.000000000 -0500 +*************** +*** 772,776 **** + wadjust = (newlines == 0) + ? prompt_invis_chars_first_line +! : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); + + /* fix from Darin Johnson for prompt string with +--- 788,794 ---- + wadjust = (newlines == 0) + ? prompt_invis_chars_first_line +! : ((newlines == prompt_lines_estimate) +! ? (wrap_offset - prompt_invis_chars_first_line) +! : 0); + + /* fix from Darin Johnson for prompt string with +*** ../bash-4.4/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 18 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ + diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index 0c14422f4a9..c46913ec96a 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -1,7 +1,7 @@ # Template build file for 'bash'. pkgname=bash _bash_distver=4.4 -_bash_patchlevel=018 +_bash_patchlevel=019 version=${_bash_distver}.${_bash_patchlevel} revision=2 wrksrc=${pkgname}-${_bash_distver}