diff --git a/tcsh-6.18.03.dif b/tcsh-6.18.03.dif index c561bc1..07e8e53 100644 --- a/tcsh-6.18.03.dif +++ b/tcsh-6.18.03.dif @@ -137,49 +137,6 @@ #ifdef LOGINFIRST if (loginsh) (void) srccat(varval(STRhome), STRsldotlogin); ---- sh.h -+++ sh.h 2015-05-05 07:20:23.946019208 +0000 -@@ -580,7 +580,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 */ - EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */ --EXTERN int handle_intr IZERO;/* Are we currently handling an interrupt? */ -+EXTERN int handle_interrupt IZERO;/* Are we currently handling an interrupt? */ - EXTERN int havhash IZERO; /* path hashing is available */ - EXTERN int editing IZERO; /* doing filename expansion and line editing */ - EXTERN int noediting IZERO; /* initial $term defaulted to noedit */ ---- sh.print.c -+++ sh.print.c 2015-05-05 07:21:25.381518880 +0000 -@@ -231,13 +231,13 @@ flush(void) - return; - if (GettingInput && !Tty_raw_mode && linp < &linbuf[sizeof linbuf - 10]) - return; -- if (handle_intr) -+ if (handle_interrupt) - exitset = 1; - - if (interrupted) { - interrupted = 0; - linp = linbuf; /* avoid recursion as stderror calls flush */ -- if (handle_intr) -+ if (handle_interrupt) - fixerror(); - else - stderror(ERR_SILENT); -@@ -298,11 +298,11 @@ flush(void) - case EDQUOT: - #endif - /* Nothing to do, but die */ -- if (handle_intr == 0) -+ if (handle_interrupt == 0) - xexit(1); - /*FALLTHROUGH*/ - default: -- if (handle_intr) -+ if (handle_interrupt) - fixerror(); - else - stderror(ERR_SILENT); --- tc.alloc.c +++ tc.alloc.c 2015-05-04 14:29:30.000000000 +0000 @@ -514,7 +514,7 @@ smalloc(size_t n) diff --git a/tcsh-6.18.04.tar.gz b/tcsh-6.18.04.tar.gz deleted file mode 100644 index 79b2b74..0000000 --- a/tcsh-6.18.04.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d4f8684c4773937f30cd1697f22d0d390c7ca8b1104392b02a9cfc732e3e418 -size 946874 diff --git a/tcsh-6.18.05.tar.gz b/tcsh-6.18.05.tar.gz new file mode 100644 index 0000000..8168c52 --- /dev/null +++ b/tcsh-6.18.05.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a739915946504fe5eacdfc0e4ddc6018e80a1b01b865720878315c02c35859f +size 947135 diff --git a/tcsh.changes b/tcsh.changes index 5b0f496..b1ca898 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 11 14:45:17 UTC 2015 - werner@suse.de + +- Update tcsh to patch level 6.18.05 - 20150510 + * fix reseting when interrupted inside an eval "eval sleep 10^C" + (paulo.cesar.pereira.de.andrade) + * rename handle_intr -> handle_interrupt as originally intended. + fix input tests that need stdin on a tty + ------------------------------------------------------------------- Tue May 5 10:16:14 UTC 2015 - werner@suse.de diff --git a/tcsh.spec b/tcsh.spec index ae53228..e827fdb 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -17,13 +17,13 @@ Name: tcsh -Version: 6.18.04 +Version: 6.18.05 Release: 0 Summary: The C SHell License: BSD-3-Clause Group: System/Shells Url: http://www.tcsh.org/ -Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.04.tar.gz +Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.05.tar.gz Source2: bindkey.tcsh Source3: complete.tcsh Patch0: tcsh-6.18.03.dif