Skip to contentSkip to conversation

package/bash: add upstream patches up to patch level 23

PATCH New Peter Korsgaard 2 participants 3 messages Mar 13, 2019 – Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bash: add upstream patches up to patch level 23

We unfortunately cannot easily download these because of the file names (not ending in patch) and patch format (p0), so convert to p1 format and include in package/bash with the following script:

j=1; for i in 19 20 21 22 23; do
file=$(printf '%04d-patch44-0%d.patch' $j $i) cat > $file << EOF
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i

EOF

    curl https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i | \
        sed -e 's|^\*\*\* \.\./|*** |' -e 's|^--- |--- b/|' >> $file

    j=$(( j + 1 ))

done

---
 package/bash/0001-bash44-019.patch |  54 +++++++++++
 package/bash/0002-bash44-020.patch | 181 +++++++++++++++++++++++++++++++++++++
 package/bash/0003-bash44-021.patch |  61 +++++++++++++
 package/bash/0004-bash44-022.patch |  65 +++++++++++++
 package/bash/0005-bash44-023.patch |  56 ++++++++++++
 5 files changed, 417 insertions(+)
 create mode 100644 package/bash/0001-bash44-019.patch
 create mode 100644 package/bash/0002-bash44-020.patch
 create mode 100644 package/bash/0003-bash44-021.patch
 create mode 100644 package/bash/0004-bash44-022.patch
 create mode 100644 package/bash/0005-bash44-023.patch
package/bash/0001-bash44-019.patch new file +54 -0
new file mode 100644
index 0000000000..b3d2f331b6
@@ -0,0 +1,54 @@
+From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-019
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+
+			     BASH PATCH REPORT
+			     =================
+
+Bash-Release:	4.4
+Patch-ID:	bash44-019
+
+Bug-Reported-by:	Kieran Grant <[email protected]>
+Bug-Reference-ID:	<[email protected]>
+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
+--- b/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 <[email protected]> for prompt string with
+--- b/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 <[email protected]> for prompt string with
+*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
+--- b/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_ */
+--- b/26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 19
+  
+  #endif /* _PATCHLEVEL_H_ */
package/bash/0002-bash44-020.patch new file +181 -0

181 lines not on this page · raw message

package/bash/0003-bash44-021.patch new file +61 -0

61 lines not on this page · raw message

package/bash/0004-bash44-022.patch new file +65 -0

65 lines not on this page · raw message

package/bash/0005-bash44-023.patch new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/bash: add upstream patches up to patch level 23

Quoted 19 lines · On Wed, 13 Mar 2019 10:39:55 +0100 Peter Korsgaard <[email protected]> wrote:

We unfortunately cannot easily download these because of the file names (not ending in patch) and patch format (p0), so convert to p1 format and include in package/bash with the following script:

j=1; for i in 19 20 21 22 23; do
file=$(printf '%04d-patch44-0%d.patch' $j $i) cat > $file << EOF
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i

EOF

    curl https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i | \
        sed -e 's|^\*\*\* \.\./|*** |' -e 's|^--- |--- b/|' >> $file

    j=$(( j + 1 ))

done

Quoted 12 lines
---
 package/bash/0001-bash44-019.patch |  54 +++++++++++
 package/bash/0002-bash44-020.patch | 181 +++++++++++++++++++++++++++++++++++++
 package/bash/0003-bash44-021.patch |  61 +++++++++++++
 package/bash/0004-bash44-022.patch |  65 +++++++++++++
 package/bash/0005-bash44-023.patch |  56 ++++++++++++
 5 files changed, 417 insertions(+)
 create mode 100644 package/bash/0001-bash44-019.patch
 create mode 100644 package/bash/0002-bash44-020.patch
 create mode 100644 package/bash/0003-bash44-021.patch
 create mode 100644 package/bash/0004-bash44-022.patch
 create mode 100644 package/bash/0005-bash44-023.patch

Applied to master, thanks. The bash project really has some creative way of sharing those bug fixes :-/

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/bash: add upstream patches up to patch level 23

In reply to Peter Korsgaard
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

We unfortunately cannot easily download these because of the file names (not ending in patch) and patch format (p0), so convert to p1 format and include in package/bash with the following script:

j=1; for i in 19 20 21 22 23; do
file=$(printf '%04d-patch44-0%d.patch' $j $i) cat > $file << EOF
From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i

Quoted 8 lines

EOF

    curl https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i | \
        sed -e 's|^\*\*\* \.\./|*** |' -e 's|^--- |--- b/|' >> $file

    j=$(( j + 1 ))

done

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard