From 4b638e54a567da6b27cd7720047cc0fe753a2c59 Mon Sep 17 00:00:00 2001
From: Ondrej Oprala <ooprala@redhat.com>
Date: Jul 30 2014 14:36:00 +0000
Subject: #1102815 - fix double echo in vi visual mode


---

diff --git a/bash-4.3-noecho.patch b/bash-4.3-noecho.patch
new file mode 100644
index 0000000..8a2842a
--- /dev/null
+++ b/bash-4.3-noecho.patch
@@ -0,0 +1,39 @@
+--- bash-4.3/parse.y	2014-05-29 14:46:09.545543384 +0200
++++ bash-4.3/parse.y	2014-05-29 14:48:40.758626213 +0200
+@@ -3858,6 +3858,8 @@ xparse_dolparen (base, string, indp, fla
+   save_parser_state (&ps);
+   save_input_line_state (&ls);
+   orig_eof_token = shell_eof_token;
++  /* avoid echoing every substitution again */
++  echo_input_at_read = 0;
+ 
+   /*(*/
+   parser_state |= PST_CMDSUBST|PST_EOFTOKEN;	/* allow instant ')' */ /*(*/
+--- bash-4.3/subst.c	2014-05-29 16:04:35.802784549 +0200
++++ bash-4.3/subst.c	2014-05-29 16:08:25.021942676 +0200
+@@ -7103,6 +7103,7 @@ param_expand (string, sindex, quoted, ex
+   WORD_LIST *list;
+   WORD_DESC *tdesc, *ret;
+   int tflag;
++  int old_echo_input;
+ 
+   zindex = *sindex;
+   c = string[++zindex];
+@@ -7401,6 +7402,9 @@ arithsub:
+ 	}
+ 
+ comsub:
++      old_echo_input = echo_input_at_read;
++      /* avoid echoing every substitution again */
++      echo_input_at_read = 0;
+       if (pflags & PF_NOCOMSUB)
+ 	/* we need zindex+1 because string[zindex] == RPAREN */
+ 	temp1 = substring (string, *sindex, zindex+1);
+@@ -7413,6 +7417,7 @@ comsub:
+ 	}
+       FREE (temp);
+       temp = temp1;
++      echo_input_at_read = old_echo_input;
+       break;
+ 
+     /* Do POSIX.2d9-style arithmetic substitution.  This will probably go
diff --git a/bash.spec b/bash.spec
index 4d6dae4..ce41bfe 100644
--- a/bash.spec
+++ b/bash.spec
@@ -7,7 +7,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -97,6 +97,9 @@ Patch132: bash-4.3-lastpipe-nested-pipe-segfault.patch
 Patch133: bash-4.3-readline-revert-lines.patch
 Patch134: bash-4.3-pathexp-globignore-delim.patch
 
+# 1102815 - fix double echoes in vi visual mode
+Patch135: bash-4.3-noecho.patch
+
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
@@ -174,6 +177,7 @@ This package contains documentation files for %{name}.
 %patch132 -p0 -b .segfault
 %patch133 -p0 -b .lines
 %patch134 -p0 -b .delim
+%patch135 -p1 -b .noecho
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -369,6 +373,9 @@ end
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jul 30 2014 Ondrej Oprala <ooprala@redhat.com> -4.3.18-7
+- #1102815 - fix double echo in vi visual mode
+
 * Thu Jul 24 2014 Ondrej Oprala <ooprala@redhat.com> - 4.3.18-6
 - Apply all upstream patches since 4.3-18-1 up to this date