modified status-pipeline-backquote-list-of-cmds.patch to be backwards compatible

Resolves: #916386
2013-04-05 10:21:18 +02:00
2 changed files with 55 additions and 36 deletions
--- a/tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch
+++ b/tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch
@ -1,7 +1,19 @@
-diff -u -r3.164 -r3.165
--- tcsh-6.17.00/sh.h	5 Feb 2011 16:14:20 -0000	3.164
-+++ tcsh-6.17.00/sh.h	14 Apr 2011 18:25:25 -0000	3.165
-@@ -578,6 +578,7 @@
+diff -upr tcsh-6.17.00_orig/sh.c tcsh-6.17.00_work/sh.c
+--- tcsh-6.17.00_orig/sh.c	2013-04-04 09:52:20.180008940 +0200
+++ tcsh-6.17.00_work/sh.c	2013-04-04 09:52:54.015137195 +0200
+@@ -273,6 +273,8 @@ main(int argc, char **argv)
+     PRCHROOT = '#';
+     word_chars = STR_WORD_CHARS;
+     bslash_quote = 0;		/* PWP: do tcsh-style backslash quoting? */
+    anyerror = 1;    /* for compatibility */
+    setcopy(STRanyerror, STRNULL, VAR_READWRITE);
+ 
+     /* Default history size to 100 */
+     setcopy(STRhistory, str2short("100"), VAR_READWRITE);
+diff -upr tcsh-6.17.00_orig/sh.h tcsh-6.17.00_work/sh.h
+--- tcsh-6.17.00_orig/sh.h	2013-04-04 09:52:20.260009235 +0200
+++ tcsh-6.17.00_work/sh.h	2013-04-04 09:50:52.104708055 +0200
+@@ -558,6 +558,7 @@ EXTERN int    havhash IZERO;	/* path has
 EXTERN int    editing IZERO;	/* doing filename expansion and line editing */
 EXTERN int    noediting IZERO;	/* initial $term defaulted to noedit */
 EXTERN int    bslash_quote IZERO;/* PWP: tcsh-style quoting?  (in sh.c) */
@ -9,10 +21,10 @@ diff -u -r3.164 -r3.165
 EXTERN int    compat_expr IZERO;/* csh-style expressions? */
 EXTERN int    isoutatty IZERO;	/* is SHOUT a tty */
 EXTERN int    isdiagatty IZERO;/* is SHDIAG a tty */
-diff -u -r3.118 -r3.119
--- tcsh-6.17.00/sh.proc.c	24 Mar 2011 14:06:59 -0000	3.118
-+++ tcsh-6.17.00/sh.proc.c	14 Apr 2011 18:25:25 -0000	3.119
-@@ -557,6 +557,11 @@
+diff -upr tcsh-6.17.00_orig/sh.proc.c tcsh-6.17.00_work/sh.proc.c
+--- tcsh-6.17.00_orig/sh.proc.c	2013-04-04 09:52:20.262009242 +0200
+++ tcsh-6.17.00_work/sh.proc.c	2013-04-04 09:50:52.105708059 +0200
+@@ -551,6 +551,11 @@ pjwait(struct process *pp)
     reason = 0;
     fp = pp;
     do {
@ -24,7 +36,7 @@ diff -u -r3.118 -r3.119
 	if (fp->p_reason)
 	    reason = fp->p_flags & (PSIGNALED | PINTERRUPTED) ?
 		fp->p_reason | META : fp->p_reason;
-@@ -734,6 +739,8 @@
+@@ -730,6 +735,8 @@ palloc(pid_t pid, struct command *t)
 	pp->p_flags |= PBACKQ;
     if (t->t_dflg & F_HUP)
 	pp->p_flags |= PHUP;
@ -33,10 +45,10 @@ diff -u -r3.118 -r3.119
     if (cmdmax == 0)
 	morecommand(CMD_INIT);
     cmdp = cmdstr;
-diff -u -r3.14 -r3.15
--- tcsh-6.17.00/sh.proc.h	7 May 2010 18:16:07 -0000	3.14
-+++ tcsh-6.17.00/sh.proc.h	14 Apr 2011 18:25:25 -0000	3.15
-@@ -103,6 +103,7 @@
+diff -upr tcsh-6.17.00_orig/sh.proc.h tcsh-6.17.00_work/sh.proc.h
+--- tcsh-6.17.00_orig/sh.proc.h	2013-04-04 09:52:20.185008957 +0200
+++ tcsh-6.17.00_work/sh.proc.h	2013-04-04 09:50:52.081708001 +0200
+@@ -102,6 +102,7 @@ struct process {
 #define	PNEEDNOTE	(1<<15)	/* notify as soon as practical */
 #define PBACKQ		(1<<16)	/* Process is `` evaluation */
 #define PHUP		(1<<17)	/* Process is marked for SIGHUP on exit */
@ -44,10 +56,10 @@ diff -u -r3.14 -r3.15
 
 /* defines for arguments to pprint */
 #define	NUMBER		01
-diff -u -r3.81 -r3.82
--- tcsh-6.17.00/sh.set.c	4 Feb 2011 18:00:26 -0000	3.81
-+++ tcsh-6.17.00/sh.set.c	14 Apr 2011 18:25:25 -0000	3.82
-@@ -106,6 +106,9 @@
+diff -upr tcsh-6.17.00_orig/sh.set.c tcsh-6.17.00_work/sh.set.c
+--- tcsh-6.17.00_orig/sh.set.c	2013-04-04 09:52:20.178008937 +0200
+++ tcsh-6.17.00_work/sh.set.c	2013-04-04 09:50:52.073707890 +0200
+@@ -100,6 +100,9 @@ update_vars(Char *vp)
     else if (eq(vp, STRloginsh)) {
 	loginsh = 1;
     }
@ -57,7 +69,7 @@ diff -u -r3.81 -r3.82
     else if (eq(vp, STRsymlinks)) {
 	Char *pn = varval(vp);
 
-@@ -763,6 +766,8 @@
+@@ -757,6 +760,8 @@ unset(Char **v, struct command *c)
 	HistLit = 0;
     if (adrof(STRloginsh) == 0)
 	loginsh = 0;
@ -66,10 +78,10 @@ diff -u -r3.81 -r3.82
     if (adrof(STRwordchars) == 0)
 	word_chars = STR_WORD_CHARS;
     if (adrof(STRedit) == 0)
-diff -u -r3.97 -r3.98
--- tcsh-6.17.00/tc.const.c	27 Feb 2011 00:14:38 -0000	3.97
-+++ tcsh-6.17.00/tc.const.c	14 Apr 2011 18:25:26 -0000	3.98
-@@ -43,6 +43,7 @@
+diff -upr tcsh-6.17.00_orig/tc.const.c tcsh-6.17.00_work/tc.const.c
+--- tcsh-6.17.00_orig/tc.const.c	2013-04-04 09:52:20.183008948 +0200
+++ tcsh-6.17.00_work/tc.const.c	2013-04-04 09:50:52.079707993 +0200
+@@ -43,6 +43,7 @@ Char STRrootdefautologout[] = { '1', '5'
 #endif
 Char STRautomatic[]	= { 'a', 'u', 't', 'o', 'm', 'a', 't', 'i', 'c',
 			    '\0' };
@ -94,10 +106,10 @@ diff -u -r3.226 -r3.227
 abnormally, then 0200 is added to the status.  Builtin commands
 which fail return exit status `1', all other builtin commands
 return status `0'.
-diff -u -r1.6 -r1.7
--- tcsh-6.17.00/tests/lexical.at	6 May 2010 14:36:10 -0000	1.6
-+++ tcsh-6.17.00/tests/lexical.at	14 Apr 2011 18:25:26 -0000	1.7
-@@ -57,7 +57,7 @@
+diff -upr tcsh-6.17.00_orig/tests/lexical.at tcsh-6.17.00_work/tests/lexical.at
+--- tcsh-6.17.00_orig/tests/lexical.at	2013-04-04 09:52:20.178008937 +0200
+++ tcsh-6.17.00_work/tests/lexical.at	2013-04-04 09:50:52.074707910 +0200
+@@ -57,7 +57,7 @@ echo "&|;<>()&||<<>>space tab	end"
 set verbose
 echo `&|;<>()&||<<>>space tab	end`
 ]])
@ -106,7 +118,7 @@ diff -u -r1.6 -r1.7
 [&|;<>()&||<<>>space tab	end
 &|;<>()&||<<>>space tab	end
 &|;<>()&||<<>>space tab	end
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ AT_CHECK([tcsh -f -c "echo !OK"], 1, ,
 AT_CHECK([tcsh -f -c 'echo "$OK"'], 1, , [OK: Undefined variable.
 ])
 
@ -115,10 +127,10 @@ diff -u -r1.6 -r1.7
 ],
 [OK: Command not found.
 ])
-diff -u -r1.2 -r1.3
--- tcsh-6.17.00/tests/subst.at	16 Feb 2006 03:12:00 -0000	1.2
-+++ tcsh-6.17.00/tests/subst.at	14 Apr 2011 18:25:26 -0000	1.3
-@@ -14,7 +14,7 @@
+diff -upr tcsh-6.17.00_orig/tests/subst.at tcsh-6.17.00_work/tests/subst.at
+--- tcsh-6.17.00_orig/tests/subst.at	2013-04-04 09:52:20.179008939 +0200
+++ tcsh-6.17.00_work/tests/subst.at	2013-04-04 09:50:52.074707910 +0200
+@@ -14,7 +14,7 @@ set csubstnonl
 echo `echo 1; \\
   echo 2`
 ]])
@ -127,10 +139,10 @@ diff -u -r1.2 -r1.3
 [4
 2
 1 2
-diff -u -r1.2 -r1.3
--- tcsh-6.17.00/tests/syntax.at	16 Feb 2006 03:12:00 -0000	1.2
-+++ tcsh-6.17.00/tests/syntax.at	14 Apr 2011 18:25:26 -0000	1.3
-@@ -156,7 +156,7 @@
+diff -upr tcsh-6.17.00_orig/tests/syntax.at tcsh-6.17.00_work/tests/syntax.at
+--- tcsh-6.17.00_orig/tests/syntax.at	2013-04-04 09:52:20.179008939 +0200
+++ tcsh-6.17.00_work/tests/syntax.at	2013-04-04 09:50:52.074707910 +0200
+@@ -156,7 +156,7 @@ AT_CHECK([cat output], ,
 [OK
 ])
 
--- 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: 18%{?dist}
+Release: 19%{?dist}
 License: BSD
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
@ -40,6 +40,8 @@ Patch25: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch
 # Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113):
 Patch26: tcsh-6.17.00-variable-names.patch
 # Accepted by upstream (tcsh-6.17.06b http://bugs.gw.com/view.php?id=110)
+# modified to be backwards compatible
+# https://github.com/tcsh-org/tcsh/commit/3864ec84b3ecb575082459d55b766185d4de2363
 Patch27: tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch
 # Proposed to upstream (http://bugs.gw.com/view.php?id=121)
 Patch28: tcsh-6.17.00-manpage-spelling.patch
@ -158,6 +160,11 @@ fi
 %{_mandir}/man1/*.1*

 %changelog
+* Fri Apr 05 2013 Fridolin Pokorny <fpokorny@redhat.com> - 6.17-19
+- modified tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch to be
+  backwards compatible
+  Resolves: #916386
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.17-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild