[tcsh] - Don't print history in verbose mode Resolves: #583075, #658171

[Vojtěch Vítek]

commit 03e29573eead22c60b944ac7b7999b2c2c000f37
Author: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
Date:   Mon Jan 24 16:57:58 2011 +0100

    - Don't print history in verbose mode
      Resolves: #583075, #658171

 tcsh-6.14.00-dont-print-history-on-verbose.patch |   19 +++++++++++++++++++
 tcsh.spec                                        |    5 +++++
 2 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/tcsh-6.14.00-dont-print-history-on-verbose.patch b/tcsh-6.14.00-dont-print-history-on-verbose.patch
new file mode 100644
index 0000000..d70cdae
--- /dev/null
+++ b/tcsh-6.14.00-dont-print-history-on-verbose.patch
@@ -0,0 +1,19 @@
+commit 888f217aba727063885356099ae4a726c60934d0
+Author: Jeffrey Bastian <jbastian at redhat.com>
+Date:   Wed May 5 17:55:17 2010 -0500
+
+    Don't print the history if in verbose mode
+
+diff --git a/sh.c b/sh.c
+index 178b972..0caa51b 100644
+--- a/sh.c
++++ b/sh.c
+@@ -1378,6 +1378,8 @@ main(argc, argv)
+ 	    xprintf("exit\n");
+ 	}
+     }
++    /* Don't print the history file to the terminal */
++    unsetv(STRverbose);
+     record();
+     exitstat();
+     return (0);
diff --git a/tcsh.spec b/tcsh.spec
index 786ae66..ef940ce 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -32,6 +32,8 @@ Patch18: tcsh-6.17.00-extrafork.patch
 Patch19: tcsh-6.17.00-wait-intr.patch
 # Accepted by upstream (tcsh-6.17.02b http://bugs.gw.com/view.php?id=112):
 Patch21: tcsh-6.17.00-dont-set-empty-remotehost.patch
+# Proposed to upstream (http://mx.gw.com/pipermail/tcsh-bugs/2010-May/000673.html):
+Patch22: tcsh-6.14.00-dont-print-history-on-verbose.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -67,6 +69,7 @@ like syntax.
 %patch18 -p1 -b .extrafork
 %patch19 -p1 -b .wait-intr
 %patch21 -p1 -b .dont-set-empty-remotehost
+%patch22 -p1 -b .dont-print-history-on-verbose
 
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
@@ -144,6 +147,8 @@ fi
   Resolves: #440465
 - Don't set $REMOTEHOST on the local machine
   Resolves: #669176
+- Don't print history in verbose mode
+  Resolves: #583075, #658171
 
 * Wed Oct  6 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.17-9
 - Remove fork when tcsh processes backquotes