Hello community, here is the log from the commit of package tcsh for openSUSE:Factory checked in at 2015-05-15 09:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tcsh (Old) and /work/SRC/openSUSE:Factory/.tcsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh" Changes: -------- --- /work/SRC/openSUSE:Factory/tcsh/tcsh.changes 2015-05-07 09:21:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh.changes 2015-05-15 09:54:55.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 11 14:45:17 UTC 2015 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- tcsh-6.18.04.tar.gz New: ---- tcsh-6.18.05.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcsh.spec ++++++ --- /var/tmp/diff_new_pack.pFEFST/_old 2015-05-15 09:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.pFEFST/_new 2015-05-15 09:54:56.000000000 +0200 @@ -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 ++++++ tcsh-6.18.03.dif ++++++ --- /var/tmp/diff_new_pack.pFEFST/_old 2015-05-15 09:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.pFEFST/_new 2015-05-15 09:54:56.000000000 +0200 @@ -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) ++++++ tcsh-6.18.04.tar.gz -> tcsh-6.18.05.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/Fixes new/tcsh-6.18.05/Fixes --- old/tcsh-6.18.04/Fixes 2015-05-04 17:34:50.000000000 +0200 +++ new/tcsh-6.18.05/Fixes 2015-05-10 15:31:33.000000000 +0200 @@ -1,3 +1,8 @@ + 40. V6.18.05 - 20150510 + 39. fix reseting when interrupted inside an eval "eval sleep 10^C" + (paulo.cesar.pereira.de.andrade) + 38. rename handle_intr -> handle_interrupt as originally intended. + 37. fix input tests that need stdin on a tty 36. V6.18.04 - 20150504 35. revert fix echo "\1", it is incorrect. 34. revert fix to PR/437, breaks short strings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/README new/tcsh-6.18.05/README --- old/tcsh-6.18.04/README 2015-05-04 17:34:50.000000000 +0200 +++ new/tcsh-6.18.05/README 2015-05-10 15:32:44.000000000 +0200 @@ -1,4 +1,4 @@ -This is tcsh version 6.18.04. Tcsh is a version of the Berkeley +This is tcsh version 6.18.05. Tcsh is a version of the Berkeley C-Shell, with the addition of: a command line editor, command and file name completion, listing, etc. and a bunch of small additions to the shell itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/configure new/tcsh-6.18.05/configure --- old/tcsh-6.18.04/configure 2015-05-04 17:35:17.000000000 +0200 +++ new/tcsh-6.18.05/configure 2015-05-10 15:32:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tcsh 6.18.04. +# Generated by GNU Autoconf 2.69 for tcsh 6.18.05. # # Report bugs to <http://bugs.gw.com/>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='tcsh' PACKAGE_TARNAME='tcsh' -PACKAGE_VERSION='6.18.04' -PACKAGE_STRING='tcsh 6.18.04' +PACKAGE_VERSION='6.18.05' +PACKAGE_STRING='tcsh 6.18.05' PACKAGE_BUGREPORT='http://bugs.gw.com/' PACKAGE_URL='' @@ -1250,7 +1250,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tcsh 6.18.04 to adapt to many kinds of systems. +\`configure' configures tcsh 6.18.05 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tcsh 6.18.04:";; + short | recursive ) echo "Configuration of tcsh 6.18.05:";; esac cat <<\_ACEOF @@ -1411,7 +1411,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tcsh configure 6.18.04 +tcsh configure 6.18.05 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2174,7 +2174,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tcsh $as_me 6.18.04, which was +It was created by tcsh $as_me 6.18.05, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7339,7 +7339,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tcsh $as_me 6.18.04, which was +This file was extended by tcsh $as_me 6.18.05, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7405,7 +7405,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -tcsh config.status 6.18.04 +tcsh config.status 6.18.05 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/configure.ac new/tcsh-6.18.05/configure.ac --- old/tcsh-6.18.04/configure.ac 2015-05-04 17:34:50.000000000 +0200 +++ new/tcsh-6.18.05/configure.ac 2015-05-10 15:32:44.000000000 +0200 @@ -7,10 +7,10 @@ dnl dnl Written by Kaveh Ghazi ([email protected]) 5/11/96. dnl -dnl $tcsh: configure.ac,v 3.4 2015/05/04 15:34:50 christos Exp $ +dnl $tcsh: configure.ac,v 3.5 2015/05/10 13:32:44 christos Exp $ AC_PREREQ([2.59])dnl Minimum Autoconf version required. -AC_INIT([tcsh], [6.18.04], [http://bugs.gw.com/]) +AC_INIT([tcsh], [6.18.05], [http://bugs.gw.com/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([tc.vers.c]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/patchlevel.h new/tcsh-6.18.05/patchlevel.h --- old/tcsh-6.18.04/patchlevel.h 2015-05-04 17:34:50.000000000 +0200 +++ new/tcsh-6.18.05/patchlevel.h 2015-05-10 15:32:44.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.183 2015/05/04 15:34:50 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.184 2015/05/10 13:32:44 christos Exp $ */ /* * patchlevel.h: Our life story. */ @@ -8,7 +8,7 @@ #define ORIGIN "Astron" #define REV 6 #define VERS 18 -#define PATCHLEVEL 4 -#define DATE "2015-05-04" +#define PATCHLEVEL 5 +#define DATE "2015-05-10" #endif /* _h_patchlevel */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/sh.c new/tcsh-6.18.05/sh.c --- old/tcsh-6.18.04/sh.c 2014-10-28 19:40:46.000000000 +0100 +++ new/tcsh-6.18.05/sh.c 2015-05-10 15:28:54.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.182 2014/10/28 18:40:46 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.185 2015/05/10 13:28:54 christos Exp $ */ /* * sh.c: Main shell routines */ @@ -39,7 +39,7 @@ All rights reserved.\n"; #endif /* not lint */ -RCSID("$tcsh: sh.c,v 3.182 2014/10/28 18:40:46 christos Exp $") +RCSID("$tcsh: sh.c,v 3.185 2015/05/10 13:28:54 christos Exp $") #include "tc.h" #include "ed.h" @@ -1913,6 +1913,8 @@ { (void) Cookedmode(); GettingInput = 0; + if (evalvec) + doneinp = 1; } drainoline(); #ifdef HAVE_GETPWENT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/sh.func.c new/tcsh-6.18.05/sh.func.c --- old/tcsh-6.18.04/sh.func.c 2015-05-04 17:28:12.000000000 +0200 +++ new/tcsh-6.18.05/sh.func.c 2015-05-04 19:10:45.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.func.c,v 3.172 2015/05/04 15:28:12 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.func.c,v 3.173 2015/05/04 17:10:45 christos Exp $ */ /* * sh.func.c: csh builtin functions */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: sh.func.c,v 3.172 2015/05/04 15:28:12 christos Exp $") +RCSID("$tcsh: sh.func.c,v 3.173 2015/05/04 17:10:45 christos Exp $") #include "ed.h" #include "tw.h" @@ -1274,9 +1274,6 @@ c = '\\'; break; case '0': - case '1': - case '2': - case '3': c = 0; if (*cp >= '0' && *cp < '8') c = c * 8 + *cp++ - '0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/sh.glob.c new/tcsh-6.18.05/sh.glob.c --- old/tcsh-6.18.04/sh.glob.c 2015-05-04 17:31:13.000000000 +0200 +++ new/tcsh-6.18.05/sh.glob.c 2015-05-05 16:27:20.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.88 2015/05/04 15:31:13 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.89 2015/05/05 14:27:20 christos Exp $ */ /* * sh.glob.c: Regular expression expansion */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: sh.glob.c,v 3.88 2015/05/04 15:31:13 christos Exp $") +RCSID("$tcsh: sh.glob.c,v 3.89 2015/05/05 14:27:20 christos Exp $") #include "tc.h" #include "tw.h" @@ -785,7 +785,8 @@ /* The F_BACKQ flag must set so the job output is correct if * printexitvalue is set. If it's not set, the job output * will have "Exit N" appended where N is the exit status. */ - t->t_dflg = F_BACKQ|F_NOFORK; + if (t) + t->t_dflg = F_BACKQ|F_NOFORK; if (seterr) stderror(ERR_OLD); #ifdef SIGTSTP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/sh.h new/tcsh-6.18.05/sh.h --- old/tcsh-6.18.04/sh.h 2015-05-04 17:31:13.000000000 +0200 +++ new/tcsh-6.18.05/sh.h 2015-05-10 15:29:28.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.h,v 3.173 2015/05/04 15:31:13 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.h,v 3.174 2015/05/10 13:29:28 christos Exp $ */ /* * sh.h: Catch it all globals and includes file! */ @@ -562,7 +562,7 @@ 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 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/sh.print.c new/tcsh-6.18.05/sh.print.c --- old/tcsh-6.18.04/sh.print.c 2011-05-25 22:17:20.000000000 +0200 +++ new/tcsh-6.18.05/sh.print.c 2015-05-10 15:29:28.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.print.c,v 3.36 2011/05/25 20:17:20 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.print.c,v 3.37 2015/05/10 13:29:28 christos Exp $ */ /* * sh.print.c: Primitive Output routines. */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: sh.print.c,v 3.36 2011/05/25 20:17:20 christos Exp $") +RCSID("$tcsh: sh.print.c,v 3.37 2015/05/10 13:29:28 christos Exp $") #include "ed.h" @@ -231,13 +231,13 @@ return; if (GettingInput && !Tty_raw_mode && linp < &linbuf[sizeof linbuf - 10]) return; - if (handle_intr) - exitset = 1; + 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 @@ 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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/tcsh.man new/tcsh-6.18.05/tcsh.man --- old/tcsh-6.18.04/tcsh.man 2015-05-04 17:34:50.000000000 +0200 +++ new/tcsh-6.18.05/tcsh.man 2015-05-10 15:32:44.000000000 +0200 @@ -77,7 +77,7 @@ .\" used here if you can. In particular, please don't use nroff commands .\" which aren't already used herein. .\" -.TH TCSH 1 "4 May 2015" "Astron 6.18.04" +.TH TCSH 1 "10 May 2015" "Astron 6.18.05" .SH NAME tcsh \- C shell with file name completion and command line editing .SH SYNOPSIS @@ -5243,7 +5243,7 @@ malloc(3), setlocale(3), tty(4), a.out(5), termcap(5), environ(7), termio(7), Introduction to the C Shell .SH VERSION -This manual documents tcsh 6.18.04 (Astron) 2015-05-04. +This manual documents tcsh 6.18.05 (Astron) 2015-05-10. .SH AUTHORS .PD 0 .TP 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/tests/commands.at new/tcsh-6.18.05/tests/commands.at --- old/tcsh-6.18.04/tests/commands.at 2015-05-03 15:53:32.000000000 +0200 +++ new/tcsh-6.18.05/tests/commands.at 2015-05-05 16:10:58.000000000 +0200 @@ -1205,7 +1205,7 @@ AT_DATA([script.csh], [[set var=$1 ]]) -AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ +AT_CHECK([[tcsh -i -f -c 'source -h script.csh foo; history' \ | sed 's/ [^ ]* / TIME /']], , [ 1 TIME source -h script.csh foo ; history 2 TIME set var=$1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/tests/lexical.at new/tcsh-6.18.05/tests/lexical.at --- old/tcsh-6.18.04/tests/lexical.at 2011-12-27 22:50:52.000000000 +0100 +++ new/tcsh-6.18.05/tests/lexical.at 2015-05-05 16:10:58.000000000 +0200 @@ -30,6 +30,8 @@ AT_SETUP([Comments]) +AT_CHECK([if [ ! -t 0 ]; then exit 77; fi],, [Skipping comment tests]) + AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tcsh-6.18.04/tests/variables.at new/tcsh-6.18.05/tests/variables.at --- old/tcsh-6.18.04/tests/variables.at 2015-05-03 15:53:32.000000000 +0200 +++ new/tcsh-6.18.05/tests/variables.at 2015-05-05 16:10:58.000000000 +0200 @@ -341,6 +341,8 @@ AT_SETUP([$ edit]) +AT_CHECK([if [ ! -t 0 ]; then exit 77; fi],, [Skipping $edit tests]) + AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , [1 ])
