Fix from upstream for bad initial linewrapping #118205 by Derek Dolney.

(Portage version: 2.1_pre3-r1)

2 files changed, 66 insertions, 0 deletions

diff --git a/app-shells/bash/files/digest-bash-3.1_p5-r1 b/app-shells/bash/files/digest-bash-3.1_p5-r1
new file mode 100644
index 000000000000..f894d8d19a53
--- /dev/null
+++ b/app-shells/bash/files/digest-bash-3.1_p5-r1
@@ -0,0 +1,7 @@
+MD5 ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz 2533934
+MD5 c0d33bdfed6e4e6a9ae9200b77cd5c99 bash31-001 2708
+MD5 0c9be3bad344d04b79c4eac9eb39624c bash31-002 7169
+MD5 04750485f335972f7a980a1bfe048dba bash31-003 1324
+MD5 0c2856794ab16a4c224223c1964140c2 bash31-004 1470
+MD5 943233d7227071fa040c8b9eb016fa0c bash31-005 1322
+MD5 63faf622820ca0828131c8b5aeac1e6a readline51-001 2042
diff --git a/app-shells/bash/files/readline-5.1-terminal-autowrap.patch b/app-shells/bash/files/readline-5.1-terminal-autowrap.patch
new file mode 100644
index 000000000000..c25c3bdbff49
--- /dev/null
+++ b/app-shells/bash/files/readline-5.1-terminal-autowrap.patch
@@ -0,0 +1,59 @@
+http://bugs.gentoo.org/118205
+http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html
+
+Date: Fri, 13 Jan 2006 23:44:49 -0500
+From: Chet Ramey <chet.ramey@case.edu>
+To: Mike Frysinger <vapier@gentoo.org>
+Subject: Re: off by one in wrapping long lines in bash-3.1
+
+Mike Frysinger wrote:
+> On Friday 13 January 2006 23:12, Chet Ramey wrote:
+>> You have `checkwinsize' set, don't you.
+> 
+> yes, that is something i enable on all my machines
+
+Well, that's it, then.  Here's a fix.
+
+Chet
+
+-- 
+``The lyf so short, the craft so long to lerne.'' - Chaucer
+( ``Discere est Dolere'' -- chet )
+						Live Strong.
+Chet Ramey, ITS, CWRU    chet@case.edu    http://cnswww.cns.cwru.edu/~chet/
+
+--------------090207020201070609090304
+Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
+ name="terminal.c.patch"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename="terminal.c.patch"
+
+*** ../bash-3.1-patched/lib/readline/terminal.c	Sat Nov 12 20:46:54 2005
+--- lib/readline/terminal.c	Fri Jan 13 23:23:44 2006
+***************
+*** 123,127 ****
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap;
+  
+  /* Non-zero means that this terminal has a meta key. */
+--- 123,127 ----
+  
+  /* Non-zero means the terminal can auto-wrap lines. */
+! int _rl_term_autowrap = -1;
+  
+  /* Non-zero means that this terminal has a meta key. */
+***************
+*** 275,278 ****
+--- 275,281 ----
+       int rows, cols;
+  {
++   if (_rl_term_autowrap == -1)
++     _rl_init_terminal_io (rl_terminal_name);
++ 
+    if (rows > 0)
+      _rl_screenheight = rows;
+
+--------------090207020201070609090304--
+