[tcsh/f14/master] - Modify verbose patch to match with upstream (don't print on history -S) Resolves: #672810

[Vojtěch Vítek]

commit d0f35b27e69ae2514fc731d56846eeb10d5f9643
Author: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
Date:   Fri Jan 28 13:15:00 2011 +0100

    - Modify verbose patch to match with upstream (don't print on history -S)
      Resolves: #672810

 tcsh-6.14.00-dont-print-history-on-verbose.patch |   26 ----------------------
 tcsh-6.17.00-dont-print-history-on-verbose.patch |   23 +++++++++++++++++++
 tcsh.spec                                        |   12 ++++++---
 3 files changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/tcsh-6.17.00-dont-print-history-on-verbose.patch b/tcsh-6.17.00-dont-print-history-on-verbose.patch
new file mode 100644
index 0000000..8e9b42a
--- /dev/null
+++ b/tcsh-6.17.00-dont-print-history-on-verbose.patch
@@ -0,0 +1,23 @@
+diff -u -p -r3.40 -r3.41
+--- tcsh-6.17.00/sh.hist.c	1 Mar 2007 17:14:51 -0000	3.40
++++ tcsh-6.17.00/sh.hist.c	6 May 2010 14:16:24 -0000	3.41
+@@ -422,8 +422,18 @@ rechist(Char *fname, int ref)
+     oldidfds = didfds;
+     didfds = 0;
+     if ((shist = adrof(STRsavehist)) != NULL && shist->vec != NULL)
+-	if (shist->vec[1] && eq(shist->vec[1], STRmerge))
++	if (shist->vec[1] && eq(shist->vec[1], STRmerge)) {
++	    /*
++	     * Unset verbose while we read the history file. From:
++	     * jbastian at redhat.com (Jeffrey Bastian)
++	     */
++	    Char *verb = varval(STRverbose);
++	    if (verb != STRNULL)
++		unsetv(STRverbose);
+ 	    loadhist(fname, 1);
++	    if (verb != STRNULL)
++		setv(STRverbose, verb, VAR_READWRITE);
++	}
+     fp = xcreat(short2str(fname), 0600);
+     if (fp == -1) {
+ 	didfds = oldidfds;
diff --git a/tcsh.spec b/tcsh.spec
index 5c15f36..e99252a 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.17
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@@ -28,12 +28,12 @@ Patch16: tcsh-6.17.00-printexitvalue.patch
 Patch17: tcsh-6.17.00-testsuite.patch
 # Accepted by upstream:
 Patch18: tcsh-6.17.00-extrafork.patch
-# Proposed to upstream (http://bugs.gw.com/view.php?id=109):
+# Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=109):
 Patch19: tcsh-6.17.00-wait-intr.patch
 # Accepted by upstream (tcsh-6.17.03b 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
+# Patch by upstream (tcsh-6.17.01b http://mx.gw.com/pipermail/tcsh-bugs/2010-May/000673.html):
+Patch22: tcsh-6.17.00-dont-print-history-on-verbose.patch
 # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113):
 Patch23: tcsh-6.17.00-variable-names.patch
 Provides: csh = %{version}
@@ -146,6 +146,10 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Jan 28 2011 Vojtech Vitek (V-Teq) <vvitek at redhat.com> - 6.17-11
+- Modify verbose patch to match with upstream (don't print on history -S)
+  Resolves: #672810
+
 * Wed Jan 26 2011 Vojtech Vitek (V-Teq) <vvitek at redhat.com> - 6.17-10
 - Fix error message on exit
   Resolves: #672810