rpms/tcsh/devel tcsh-6.15.00-hist-sub.patch, NONE, 1.1 tcsh-6.15.00-var-sub.patch, NONE, 1.1 tcsh.spec, 1.54, 1.55

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/tcsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24702

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.15.00-hist-sub.patch tcsh-6.15.00-var-sub.patch 
Log Message:
Fix '\' can not be used to quote all delimiters, Fix name[selector] should fail when any number of 'selector' is out of range

tcsh-6.15.00-hist-sub.patch:

--- NEW FILE tcsh-6.15.00-hist-sub.patch ---
diff --git a/tcsh.man b/tcsh.man
index 0c9c3b6..3e389f4 100644
--- a/tcsh.man
+++ b/tcsh.man
@@ -1035,7 +1035,7 @@ Substitute \fIl\fR for \fIr\fR.
 \fIl\fR is simply a string like \fIr\fR, not a regular expression as in
 the eponymous \fIed\fR(1) command.
 Any character may be used as the delimiter in place of `/';
-a `\\' can be used to quote the delimiter inside \fIl\fR and \fIr\fR.
+a `\\' can be used to quote the delimiter expect `(', `)', `|' and `>' inside \fIl\fR and \fIr\fR.
 The character `&' in the \fIr\fR is replaced by \fIl\fR; `\\' also quotes `&'.
 If \fIl\fR is empty (``''), the \fIl\fR from a previous substitution or the
 \fIs\fR from a previous search or event number in event specification is used.

tcsh-6.15.00-var-sub.patch:

--- NEW FILE tcsh-6.15.00-var-sub.patch ---
diff --git a/sh.dol.c b/sh.dol.c
index 73ac3b2..0e7c87d 100755
--- a/sh.dol.c
+++ b/sh.dol.c
@@ -613,7 +613,7 @@ Dgetdol(void)
 
 	    for (i = 0; Isdigit(*np); i = i * 10 + *np++ - '0')
 		continue;
-	    if ((i < 0 || i > upb) && !any("-*", *np)) {
+	    if (i < 0 || i > upb) {
 		cleanup_until(&name);
 		dolerror(vp->v_name);
 		return;


Index: tcsh.spec
===================================================================
RCS file: /cvs/extras/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- tcsh.spec	11 Feb 2008 14:58:08 -0000	1.54
+++ tcsh.spec	29 Feb 2008 12:32:23 -0000	1.55
@@ -3,13 +3,15 @@
 Summary: An enhanced version of csh, the C shell
 Name: tcsh
 Version: 6.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD with advertising
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
 Patch1: tcsh-6.15.00-closem.patch
 Patch2: tcsh-6.14.00-tinfo.patch
 Patch3: tcsh-6.14.00-unprintable.patch
+Patch4: tcsh-6.15.00-hist-sub.patch
+Patch5: tcsh-6.15.00-var-sub.patch
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
@@ -30,6 +32,8 @@
 %patch1 -p1 -b .closem
 %patch2 -p1 -b .tinfo
 %patch3 -p1 -b .unprintable
+%patch4 -p1 -b .hist-sub
+%patch5 -p1 -b .var-sub
 
 %build
 # For tcsh-6.14.00-tinfo.patch
@@ -97,6 +101,12 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 29 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-4
+- Fix '\' can not be used to quote all delimiters
+  Related: #435421
+- Fix $name[selector] should fail when any number of 'selector' is out of range
+  Related: #435398
+
 * Mon Feb 11 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 6.15-3
 - Fix Buildroot