checked in (request 32629)

OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=12
2010-02-18 15:59:50 +00:00 · 2010-02-18 15:59:50 +00:00 · c34c2e2063
commit c34c2e2063
parent 7f6628ed2b
15 changed files with 166 additions and 99 deletions
--- a/tcsh-6.15.00-fullpath.dif
+++ b/tcsh-6.15.00-fullpath.dif
@ -1,5 +1,5 @@
 --- tw.parse.c
-+++ tw.parse.c	2008-11-26 17:52:07.190195106 +0000
+++ tw.parse.c	2008-11-26 18:52:07.190195106 +0100
@@ -347,9 +347,19 @@ tenematch(Char *inputline, int num_read,
 		goto end;
 	    }
--- a/tcsh-6.15.00-longjmp.dif
+++ b/tcsh-6.15.00-longjmp.dif
@ -1,5 +1,5 @@
 --- sh.h
-+++ sh.h	2007-07-23 10:01:10.230408643 +0000
+++ sh.h	2007-07-23 12:01:10.230408643 +0200
@@ -640,7 +640,7 @@ EXTERN int   SHDIAG IZERO;	/* Diagnostic
 EXTERN int   OLDSTD IZERO;	/* Old standard input (def for cmds) */
 
@ -19,7 +19,7 @@
 #else
    typedef struct { jmp_buf j; } jmp_buf_t;
 --- sh.c
-+++ sh.c	2007-07-23 10:02:41.640206073 +0000
+++ sh.c	2007-07-23 12:02:41.640206073 +0200
@@ -78,7 +78,7 @@ extern int NLSMapsAreInited;
  * ported to Apple Unix (TM) (OREO)  26 -- 29 Jun 1987
  */
@ -38,7 +38,7 @@
 #ifdef WINNT_NATIVE
     nt_init();
 #endif /* WINNT_NATIVE */
-@@ -2013,7 +2015,10 @@ process(int catch)
+@@ -2026,7 +2028,10 @@ process(int catch)
 #endif /* SIG_WINDOW */
 	setcopy(STR_, InputBuf, VAR_READWRITE | VAR_NOGLOB);
     cmd_done:
@ -51,7 +51,7 @@
     cleanup_pop_mark(omark);
     resexit(osetexit);
 --- sh.decls.h
-+++ sh.decls.h	2007-07-23 13:37:27.493023737 +0000
+++ sh.decls.h	2007-07-23 15:37:27.493023737 +0200
@@ -90,6 +90,7 @@ extern	void		  cleanup_push_internal(voi
 #define cleanup_push(v, f) cleanup_push_internal(v, f)
 #endif
@ -61,7 +61,7 @@
 extern	void		  cleanup_until	(void *);
 extern	void		  cleanup_until_mark(void);
 --- sh.err.c
-+++ sh.err.c	2007-07-23 13:39:48.944172212 +0000
+++ sh.err.c	2007-07-23 15:39:48.944172212 +0200
@@ -448,6 +448,12 @@ cleanup_until(void *last_var)
     abort();
 }
--- a/tcsh-6.15.00-pipe.dif
+++ b/tcsh-6.15.00-pipe.dif
@ -1,5 +1,5 @@
 --- sh.dol.c
-+++ sh.dol.c	2007-07-13 10:39:27.390018042 +0000
+++ sh.dol.c	2007-07-13 12:39:27.390018042 +0200
@@ -421,6 +421,8 @@ Dgetdol(void)
 	    size_t cbp = 0;
 	    int old_pintr_disabled;
--- a/tcsh-6.15.00-spelling.dif
+++ b/tcsh-6.15.00-spelling.dif
@ -1,5 +1,5 @@
 --- nls/Makefile
-+++ nls/Makefile	2007-07-13 10:31:53.537806617 +0000
+++ nls/Makefile	2007-07-13 12:31:53.537806617 +0200
@@ -2,9 +2,8 @@
 
 SUBDIRS=	C et finnish french german greek italian ja pl russian \
@ -12,7 +12,7 @@
 catalogs:
 	@for i in ${SUBDIRS} ; \
 --- nls/german/set6
-+++ nls/german/set6	2005-08-17 12:12:36.000000000 +0000
+++ nls/german/set6	2005-08-17 14:12:36.000000000 +0200
@@ -3,8 +3,8 @@ $ ed.inputl.c
 $set 6
 1 FEHLER: Illegaler Befehl von Taste 0%o\r\n
--- a/tcsh-6.15.00-utf8.dif
+++ b/tcsh-6.15.00-utf8.dif
@ -1,5 +1,5 @@
 --- sh.func.c
-+++ sh.func.c	2007-07-13 10:36:10.233075909 +0000
+++ sh.func.c	2007-07-13 12:36:10.233075909 +0200
@@ -2416,9 +2416,7 @@ nlsinit(void)
     if (catalog != default_catalog)
 	xfree(catalog);
--- a/tcsh-6.16.00-colorls.dif
+++ b/tcsh-6.16.00-colorls.dif
@ -1,9 +1,11 @@
 --- tw.color.c
-+++ tw.color.c	2009-06-23 08:59:29.609901731 +0000
-@@ -86,6 +86,9 @@ static Variable variables[] = {
+++ tw.color.c	2009-06-23 10:59:29.609901731 +0200
+@@ -85,6 +85,11 @@ static Variable variables[] = {
+     VAR(NOS, "tw", ""),		/* Sticky and other writable dir (+t,o+w) */
     VAR(NOS, "ow", ""),		/* Other writable dir (o+w) but not sticky */
     VAR(NOS, "st", ""),		/* Sticky dir (+t) but not other writable */
-     VAR(NOS, "rs", "0"),	/* Reset to normal color */
+
+    VAR(NOS, "rs", ""),		/* Reset */
 +    VAR(NOS, "ca", ""),		/* Capability */
 +    VAR(NOS, "hl", ""),		/* Hardlink */
 +    VAR(NOS, "cl", ""),		/* CLRTOEOL */
--- a/tcsh-6.16.00-grabpgrp.dif
+++ b/tcsh-6.16.00-grabpgrp.dif
@ -0,0 +1,94 @@
+--- sh.c
+++ sh.c	25 Feb 2009 22:53:47 -0000
+@@ -1103,17 +1103,7 @@
+ 	    }
+ #endif /* NeXT */
+ #ifdef BSDJOBS			/* if we have tty job control */
+-    retry:
+-	    if ((tpgrp = tcgetpgrp(f)) != -1) {
+-		if (tpgrp != shpgrp) {
+-		    struct sigaction old;
+-
+-		    sigaction(SIGTTIN, NULL, &old);
+-		    signal(SIGTTIN, SIG_DFL);
+-		    (void) kill(0, SIGTTIN);
+-		    sigaction(SIGTTIN, &old, NULL);
+-		    goto retry;
+-		}
+	    if (grabpgrp(f, shpgrp) != -1) {
+ 		/*
+ 		 * Thanks to Matt Day for the POSIX references, and to
+ 		 * Paul Close for the SGI clarification.
+@@ -2356,3 +2346,28 @@
+ 	rechist(NULL, adrof(STRsavehist) != NULL);
+     }
+ }
+
+/*
+ * Grab the tty repeatedly, and give up if we are not in the correct
+ * tty process group.
+ */
+int
+grabpgrp(int fd, pid_t desired)
+{
+    struct sigaction old;
+    pid_t pgrp;
+    size_t i;
+
+    for (i = 0; i < 100; i++) {
+	if ((pgrp = tcgetpgrp(fd)) == -1)
+	    return -1;
+	if (pgrp == desired)
+	    return 0;
+	(void)sigaction(SIGTTIN, NULL, &old);
+	(void)signal(SIGTTIN, SIG_DFL);
+	(void)kill(0, SIGTTIN);
+	(void)sigaction(SIGTTIN, &old, NULL);
+    }
+    errno = EPERM;
+    return -1;
+}
+--- sh.decls.h
+++ sh.decls.h	25 Feb 2009 22:53:47 -0000
+@@ -52,6 +52,7 @@
+ #else
+ extern	void		  xexit		(int);
+ #endif
+extern	int		  grabpgrp	(int, pid_t);
+ 
+ /*
+  * sh.dir.c
+--- sh.func.c
+++ sh.func.c	25 Feb 2009 22:53:47 -0000
+@@ -2272,10 +2272,9 @@
+ dosuspend(Char **v, struct command *c)
+ {
+ #ifdef BSDJOBS
+-    int     ctpgrp;
+     struct sigaction old;
+ #endif /* BSDJOBS */
+-    
+
+     USE(c);
+     USE(v);
+ 
+@@ -2295,17 +2294,8 @@
+ 
+ #ifdef BSDJOBS
+     if (tpgrp != -1) {
+-retry:
+-	ctpgrp = tcgetpgrp(FSHTTY);
+-	if (ctpgrp == -1)
+	if (grabpgrp(FSHTTY, opgrp) == -1)
+ 	    stderror(ERR_SYSTEM, "tcgetpgrp", strerror(errno));
+-	if (ctpgrp != opgrp) {
+-	    sigaction(SIGTTIN, NULL, &old);
+-	    signal(SIGTTIN, SIG_DFL);
+-	    (void) kill(0, SIGTTIN);
+-	    sigaction(SIGTTIN, &old, NULL);
+-	    goto retry;
+-	}
+ 	(void) setpgid(0, shpgrp);
+ 	(void) tcsetpgrp(FSHTTY, shpgrp);
+     }
+
--- a/tcsh-6.16.00-history.dif
+++ b/tcsh-6.16.00-history.dif
@ -1,5 +1,5 @@
 --- sh.c
-+++ sh.c	2007-10-15 10:03:11.216084278 +0000
+++ sh.c	2007-10-15 12:03:11.216084278 +0200
@@ -1770,7 +1770,7 @@ static Char   *jobargv[2] = {STRjobs, 0}
  * and finally go through the normal error mechanism, which
  * gets a chance to make the shell go away.
@ -10,7 +10,7 @@
 void
 pintr(void)
 --- sh.err.c
-+++ sh.err.c	2009-03-25 10:35:16.552001834 +0000
+++ sh.err.c	2009-03-25 11:35:16.552001834 +0100
@@ -51,6 +51,7 @@ char   *seterr = NULL;	/* Holds last err
 #define ERR_NAME	0x10000000
 #define ERR_SILENT	0x20000000
@ -38,7 +38,7 @@
 +	reset();		/* Unwind */
 }
 --- sh.h
-+++ sh.h	2007-10-11 22:00:00.000000000 +0000
+++ sh.h	2007-10-12 00:00:00.000000000 +0200
@@ -548,6 +548,7 @@ EXTERN int    neednote IZERO;	/* Need to
 EXTERN int    noexec IZERO;	/* Don't execute, just syntax check */
 EXTERN int    pjobs IZERO;	/* want to print jobs if interrupted */
@ -48,7 +48,7 @@
 EXTERN int    editing IZERO;	/* doing filename expansion and line editing */
 EXTERN int    noediting IZERO;	/* initial $term defaulted to noedit */
 --- sh.hist.c
-+++ sh.h	2007-10-11 22:00:00.000000000 +0000
+++ sh.hist.c	2007-10-12 00:00:00.000000000 +0200
@@ -425,9 +425,9 @@ rechist(Char *fname, int ref)
 	if (shist->vec[1] && eq(shist->vec[1], STRmerge))
 	    loadhist(fname, 1);
@ -69,7 +69,7 @@
 
 
 --- sh.print.c
-+++ sh.print.c	2007-10-15 10:09:15.994329114 +0000
+++ sh.print.c	2007-10-15 12:09:15.994329114 +0200
@@ -222,7 +222,8 @@ drainoline(void)
 void
 flush(void)
@ -115,7 +115,7 @@
     interrupted = 0;
 }
 --- tc.sig.c
-+++ tc.sig.c	2007-10-11 22:00:00.000000000 +0000
+++ tc.sig.c	2007-10-12 00:00:00.000000000 +0200
@@ -60,25 +60,34 @@ int alrmcatch_disabled; /* = 0; */
 int phup_disabled; /* = 0; */
 int pchild_disabled; /* = 0; */
--- a/tcsh-6.16.00-mailbox.dif
+++ b/tcsh-6.16.00-mailbox.dif
@ -1,5 +1,5 @@
 --- sh.c
-+++ sh.c	2009-08-14 08:27:58.129901841 +0000
+++ sh.c	2009-08-14 10:27:58.129901841 +0200
@@ -2153,6 +2153,7 @@ mailchk(void)
 
 	    while (readdir(mailbox))
--- a/tcsh-6.16.00-norm-cmd.dif
+++ b/tcsh-6.16.00-norm-cmd.dif
@ -1,5 +1,5 @@
 --- ed.defns.c
-+++ ed.defns.c	2007-08-28 10:02:42.862588122 +0000
+++ ed.defns.c	2007-08-28 12:02:42.862588122 +0200
@@ -1412,16 +1412,6 @@ editinit(void)
     f->desc = CSAVS(3, 52, "Execute command");
 
--- a/tcsh-6.16.00.dif
+++ b/tcsh-6.16.00.dif
@ -1,5 +1,5 @@
 --- .pkgextract
-+++ .pkgextract	2006-04-25 12:58:31.000000000 +0000
+++ .pkgextract	2006-04-25 14:58:31.000000000 +0200
@@ -0,0 +1,6 @@
 +patch -p0 -s --suffix=.spell     < ../tcsh-6.15.00-spelling.dif
 +patch -p0 -s --suffix=.utf8      < ../tcsh-6.15.00-utf8.dif
@ -8,7 +8,7 @@
 +patch -p0 -s --suffix=.normcmd   < ../tcsh-6.15.00-norm-cmd.dif
 +patch -p0 -s --suffix=.history   < ../tcsh-6.15.00-history.dif
 --- Makefile.in
-+++ Makefile.in	2006-04-25 12:58:31.000000000 +0000
+++ Makefile.in	2006-04-25 14:58:31.000000000 +0200
@@ -510,12 +510,12 @@ vgrind:
 	@vgrind -t -x -h Index index >/crp/bill/csh/index.t
 
@ -24,7 +24,7 @@
 
 install.man: tcsh.man
 --- config_f.h
-+++ config_f.h	2007-07-13 10:47:29.673240000 +0000
+++ config_f.h	2007-07-13 12:47:29.673240000 +0200
@@ -63,12 +63,19 @@
  */
 #if defined (NLS) && defined (HAVE_CATGETS)
@ -65,7 +65,7 @@
 #  define RCSID(id) static char *rcsid = (id);
 # else
 --- glob.h
-+++ glob.h	2006-04-25 12:58:31.000000000 +0000
+++ glob.h	2006-04-25 14:58:31.000000000 +0200
@@ -72,6 +72,7 @@ typedef struct {
 #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
 
@ -84,7 +84,7 @@
 int	glob (const char *, int, int (*)(const char *, int), glob_t *);
 void	globfree (glob_t *);
 --- host.defs
-+++ host.defs	2007-07-13 12:05:57.545518678 +0000
+++ host.defs	2007-07-13 14:05:57.545518678 +0200
@@ -110,7 +110,7 @@ newcode	:
 /*  
  * On convex, find the current machine type via the getsysinfo() syscall
@ -170,7 +170,7 @@
 
 
 --- pathnames.h
-+++ pathnames.h	2006-04-25 12:58:31.000000000 +0000
+++ pathnames.h	2006-04-25 14:58:31.000000000 +0200
@@ -33,7 +33,7 @@
 #ifndef _h_pathnames
 #define _h_pathnames
@ -190,14 +190,14 @@
 #endif /* _CRAYCOM && !_PATH_TCSHELL */
 
 --- sh.c
-+++ sh.c	2009-03-25 10:45:13.676501240 +0000
+++ sh.c	2009-03-25 11:45:13.676501240 +0100
@@ -454,7 +454,8 @@ main(int argc, char **argv)
     if (loginsh || (uid == 0)) {
 	if (*cp) {
 	    /* only for login shells or root and we must have a tty */
 -	    if ((cp2 = Strrchr(cp, (Char) '/')) != NULL) {
 +	    if (((cp2 = Strrchr(cp, (Char) '/')) != NULL) &&
-+		(Strncmp(cp, STRptssl, 3) != 0)) {
+		(Strncmp(cp, &STRslptssl[1], 3) != 0)) {
 		cp2 = cp2 + 1;
 	    }
 	    else
@ -241,7 +241,7 @@
 	if (loginsh)
 	    (void) srccat(varval(STRhome), STRsldotlogin);
 --- sh.dol.c
-+++ sh.dol.c	2007-07-13 11:51:57.812291316 +0000
+++ sh.dol.c	2007-07-13 13:51:57.812291316 +0200
@@ -30,6 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
@ -249,7 +249,7 @@
 +#include <features.h>
 #include "sh.h"
 
- RCSID("$tcsh: sh.dol.c,v 3.77 2009/06/19 16:25:00 christos Exp $")
+ RCSID("$tcsh: sh.dol.c,v 3.74 2008/05/14 20:10:30 christos Exp $")
@@ -922,6 +923,31 @@ heredoc(Char *term)
     Char *lbp, *obp, *mbp;
     Char  **vp;
@ -291,7 +291,7 @@
     Dv[0] = term;
     Dv[1] = NULL;
 --- sh.func.c
-+++ sh.func.c	2006-04-25 12:58:31.000000000 +0000
+++ sh.func.c	2006-04-25 14:58:31.000000000 +0200
@@ -1267,14 +1267,6 @@ dosetenv(Char **v, struct command *c)
     }
 #endif /* apollo */
@ -322,7 +322,7 @@
 	dont_free = 0;
 # endif /* SETLOCALEBUG */
 --- sh.h
-+++ sh.h	2007-07-13 11:07:44.198395000 +0000
+++ sh.h	2007-07-13 13:07:44.198395000 +0200
@@ -267,7 +267,7 @@ typedef int eChar;
 #  else
 #   include <termio.h>
@ -357,7 +357,7 @@
 #  endif
 #  ifdef SUNOS4
 --- sh.sem.c
-+++ sh.sem.c	2006-04-25 12:58:31.000000000 +0000
+++ sh.sem.c	2006-04-25 14:58:31.000000000 +0200
@@ -622,10 +622,19 @@ execute(struct command *t, volatile int 
 	 * possible stopping
 	 */
@ -382,7 +382,7 @@
 		    int rv = getn(varval(STRstatus));
 		    if (rv != 0)
 --- sh.set.c
-+++ sh.set.c	2007-07-13 11:09:17.172297000 +0000
+++ sh.set.c	2007-07-13 13:09:17.172297000 +0200
@@ -1091,11 +1091,11 @@ update_dspmbyte_vars(void)
 	dstr1 = vp->vec[0];
 	if(eq (dstr1, STRsjis))
@ -443,7 +443,7 @@
     if (*codeset != '\0') {
 	for (i = 0; dspmc[i].n; i++) {
 --- tc.alloc.c
-+++ tc.alloc.c	2006-04-25 12:58:31.000000000 +0000
+++ tc.alloc.c	2006-04-25 14:58:31.000000000 +0200
@@ -486,7 +486,7 @@ smalloc(size_t n)
 {
     ptr_t   ptr;
@ -484,7 +484,7 @@
 
 #endif /* SYSMALLOC */
 --- tc.const.c
-+++ tc.const.c	2006-04-25 12:58:31.000000000 +0000
+++ tc.const.c	2006-04-25 14:58:31.000000000 +0200
@@ -127,10 +127,12 @@ Char STRmmliteral[]	= { '-', 'G', '\0' }
 Char STRmmliteral[]	= { '-', '-', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\0' };
 # endif
@ -508,7 +508,7 @@
 Char STRLC_NUMERIC[]	= { 'L', 'C', '_', 'N', 'U', 'M', 'E', 'R', 'I',
 			    'C', '\0' };
 --- tc.func.c
-+++ tc.func.c	2007-07-13 11:15:03.477171000 +0000
+++ tc.func.c	2007-07-13 13:15:03.477171000 +0200
@@ -689,9 +689,13 @@ auto_lock(void)
 	    handle_pending_signals();
 	    errno = 0;
@ -534,7 +534,7 @@
 	    else {
 		if (sptr != name) {
 --- tc.str.c
-+++ tc.str.c	2006-04-25 12:58:31.000000000 +0000
+++ tc.str.c	2006-04-25 14:58:31.000000000 +0200
@@ -271,7 +271,7 @@ s_strlen(const Char *str)
 {
     size_t n;
@ -545,7 +545,7 @@
     return (n);
 }
 --- tc.who.c
-+++ tc.who.c	2006-04-25 12:58:31.000000000 +0000
+++ tc.who.c	2006-04-25 14:58:31.000000000 +0200
@@ -260,6 +260,9 @@ watch_login(int force)
     }
     stlast = sta.st_mtime;
@ -557,7 +557,7 @@
 #else
     if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
 --- tcsh.man
-+++ tcsh.man	2006-04-25 12:58:31.000000000 +0000
+++ tcsh.man	2006-04-25 14:58:31.000000000 +0200
@@ -567,7 +567,7 @@ Repeating \fIdabbrev-expand\fR without a
 changes to the next previous word etc., skipping identical matches
 much like \fIhistory-search-backward\fR does.
@ -568,7 +568,7 @@
 See also \fIdelete-char-or-list-or-eof\fR.
 .TP 8
 --- tw.color.c
-+++ tw.color.c	2007-07-13 11:18:16.453713000 +0000
+++ tw.color.c	2007-07-13 13:18:16.453713000 +0200
@@ -173,7 +173,7 @@ parseLS_COLORS(const Char *value)
     size_t  i, len;
     const Char	 *v;		/* pointer in value */
@ -599,7 +599,7 @@
 	    }
 	}
 --- tw.h
-+++ tw.h	2006-04-25 12:58:31.000000000 +0000
+++ tw.h	2006-04-25 14:58:31.000000000 +0200
@@ -33,6 +33,10 @@
 #ifndef _h_tw
 #define _h_tw
@ -612,7 +612,7 @@
 #define TW_ZERO		0x0fff
 
 --- config/linux
-+++ config/linux	2007-07-13 11:22:07.326273000 +0000
+++ config/linux	2007-07-13 13:22:07.326273000 +0200
@@ -70,7 +70,7 @@
  *
  *		Note: Linux should work with any SYSVREL < 3.
@ -690,7 +690,7 @@
 +
 #endif /* _h_config */
 --- nls/C/set1
-+++ nls/C/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/C/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.6 2006/03/02 18:46:45 christos Exp $
 $ Error messages
@ -699,7 +699,7 @@
 1 Syntax Error
 2 %s is not allowed
 --- nls/et/set1
-+++ nls/et/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/et/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ Error messages
@ -708,7 +708,7 @@
 1 Süntaksi viga
 2 %s ei ole lubatud
 --- nls/finnish/set1
-+++ nls/finnish/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/finnish/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.3 2006/03/02 18:46:46 christos Exp $
 $ Error messages
@ -717,7 +717,7 @@
 1 Kielioppivirhe
 2 %s ei ole sallittu
 --- nls/french/set1
-+++ nls/french/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/french/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
 $ Messages d 'erreur
@ -726,7 +726,7 @@
 1 Erreur de syntaxe
 2 %s n'est pas autorisé
 --- nls/german/set1
-+++ nls/german/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/german/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.6 2006/03/02 18:46:46 christos Exp $
 $ Error messages
@ -735,7 +735,7 @@
 1 Syntaxfehler
 2 %s nicht erlaubt
 --- nls/greek/set1
-+++ nls/greek/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/greek/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
 $ Error messages
@ -744,7 +744,7 @@
 1 ËÜèïò óýíôáîç
 2 Tï %s äåí åðéôñÝðåôáé
 --- nls/italian/set1
-+++ nls/italian/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/italian/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ Error messages
@ -753,7 +753,7 @@
 1 Errore di Sintassi
 2 %s non è permesso
 --- nls/ja/set1
-+++ nls/ja/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/ja/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.5 2006/03/02 18:46:47 christos Exp $
 $ Error messages
@ -762,7 +762,7 @@
 1 Ê¸Ë¡¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹
 2 %s ¤Ï³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤»¤ó
 --- nls/pl/set1
-+++ nls/pl/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/pl/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
 $ Error messages
@ -771,7 +771,7 @@
 1 B³±d sk³adni
 2 %s jest niedozwolone
 --- nls/russian/set1
-+++ nls/russian/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/russian/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.4 2006/03/02 18:46:47 christos Exp $
 $ Error messages
@ -780,7 +780,7 @@
 1 óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ
 2 %s ÎÅÄÏÐÕÓÔÉÍÏ
 --- nls/spanish/set1
-+++ nls/spanish/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/spanish/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
 $ Mensajes de Error
@ -789,7 +789,7 @@
 1 Error de sintaxis
 2 %s no está permitido
 --- nls/ukrainian/set1
-+++ nls/ukrainian/set1	2006-04-25 12:58:31.000000000 +0000
+++ nls/ukrainian/set1	2006-04-25 14:58:31.000000000 +0200
@@ -1,5 +1,6 @@
 $ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
 $ Error messages
--- a/tcsh-6.16.00.tar.bz2
+++ b/tcsh-6.16.00.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79f7f2bb036fadaf0636c254c501f316425cfbaaafce54ddae5c8fd9d2e8392a
+size 738912
--- a/tcsh-6.17.00.tar.bz2
+++ b/tcsh-6.17.00.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17af7fa7376b24a962646cb9a036bfac0b8deddbac3caf8f77dd6469440d1172
-size 740481
--- a/tcsh.changes
+++ b/tcsh.changes
@ -1,34 +1,3 @@
-------------------------------------------------------------------
-Mon Feb 15 16:42:56 CET 2010 - werner@suse.de
-
- Increase BUFSIZE to 8kB resulting in INBUFSIZE of 16kB (fate#308882)
-
-------------------------------------------------------------------
-Mon Feb 15 13:58:45 CET 2010 - werner@suse.de
-
- Update to tcsh version V6.17.00
- * Fix dataroot autoconf issue.
- * Fix directory stuff for unit tests.
- * Fix small bug in history in loops.
- * Provide newer config.{guess,sub}
- * Fix gcc 4 warnings.
- * Fix memory trashing bug introduced in 10.
- * add missing sigemptyset in goodbye()
- * restore behavior where a[n-] never prints an error.
- * always save the whole command, not just the first 80 chars of it.
- * fix short2str/short2qstr length adjustment in wide chars
-   (Vitezslav Crhonek)
- * set histfile=/tmp/history.temp; set savehist=(100 merge);
-   alias precmd history -S. After that justpr is not restored
-   and commands don't execute. (Andriy Gapon)
- * Fix "as" $ modifier from corrupting memory.
-   set t=demfonsftraftionf; echo $t:as/f//
- * Make $% work with environment variable (Ron Johnston)
- * Add autoexpand=onlyhistory (Don Estabrook, m66)
- * Add history in loops (Laurence Darby, m48)
- * Add missing colorls "rs" variable (Shlomi Fish, m70)
- * Fix pts detection issue (Ruslan Ermilov)
-
 -------------------------------------------------------------------
 Mon Dec  7 11:23:30 CET 2009 - meissner@suse.de

--- a/tcsh.spec
+++ b/tcsh.spec
@ -1,7 +1,7 @@
 #
-# spec file for package tcsh (Version 6.17.00)
+# spec file for package tcsh (Version 6.16.00)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -25,23 +25,24 @@ License:        BSD3c(or similar)
 Group:          System/Shells
 Requires:       gawk textutils
 AutoReqProv:    on
-Version:        6.17.00
-Release:        1
+Version:        6.16.00
+Release:        6
 Summary:        The C SHell
-Source:         ftp.astron.com:/pub/tcsh/tcsh-6.17.00.tar.bz2
+Source:         ftp.astron.com:/pub/tcsh/tcsh-6.16.00.tar.bz2
 Source1:        nls-iconv
 Source2:        bindkey.tcsh
 Source3:        complete.tcsh
-Patch:          tcsh-6.17.00.dif
+Patch:          tcsh-6.16.00.dif
 Patch1:         tcsh-6.15.00-spelling.dif
 Patch2:         tcsh-6.15.00-utf8.dif
 Patch3:         tcsh-6.15.00-pipe.dif
-Patch4:         tcsh-6.17.00-longjmp.dif
+Patch4:         tcsh-6.15.00-longjmp.dif
 Patch5:         tcsh-6.16.00-norm-cmd.dif
 Patch6:         tcsh-6.16.00-history.dif
 Patch7:         tcsh-6.15.00-blanks.dif
 Patch8:         tcsh-6.15.00-fullpath.dif
-Patch10:        tcsh-6.17.00-colorls.dif
+Patch9:         tcsh-6.16.00-grabpgrp.dif
+Patch10:        tcsh-6.16.00-colorls.dif
 Patch11:        tcsh-6.16.00-mailbox.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@ -70,6 +71,7 @@ Authors:
 ### disabled for know, should work on os11.1 without
 ### %patch7 -p0 -b .blanks
 %patch8 -p0 -b .fullpath
+%patch9 -p0 -b .pgrp
 %patch10 -p0 -b .colorls
 %patch11 -p0 -b .mailbox
 %patch
@ -77,7 +79,7 @@ Authors:

 %build
    CC=gcc
-    CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DBUFSIZE=8192 -pipe"
+    CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -pipe"
    export CC CFLAGS
 %ifarch %ix86
    CPU=i586