From bd72981a503253d024b43e650d33925d2b3c2aab238ce9a020f8bdbdde2975a9 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 17 Mar 2010 12:08:19 +0000 Subject: [PATCH 1/6] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=16 --- complete.tcsh | 4 +++- tcsh.changes | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/complete.tcsh b/complete.tcsh index 7159a2e..f6d8535 100644 --- a/complete.tcsh +++ b/complete.tcsh @@ -439,7 +439,9 @@ skip_mh: # from George Cox - complete acroread 'p/*/f:*.{pdf,PDF}/' + complete acroread 'p/*/f:*.{pdf,fdf,PDF,FDF}/' + complete xpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' + complete kpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' complete apachectl 'c/*/(start stop restart fullstatus status graceful \ configtest help)/' complete appletviewer 'p/*/f:*.class/' diff --git a/tcsh.changes b/tcsh.changes index 316064b..7c33638 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 17 12:58:44 CET 2010 - werner@suse.de + +- Add Forms Data Format (.fdf) for acroread and co (bnc#573202) + ------------------------------------------------------------------- Mon Mar 8 01:42:26 CET 2010 - ro@suse.de From aedda7748b75aa8f97e5de7a27f078c8fc02ab69cb85918253bb51e2d8c24c84 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 17 Mar 2010 16:20:33 +0000 Subject: [PATCH 2/6] Accepting request 35044 from shells checked in (request 35044) OBS-URL: https://build.opensuse.org/request/show/35044 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=17 --- complete.tcsh | 4 +--- tcsh.changes | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/complete.tcsh b/complete.tcsh index f6d8535..7159a2e 100644 --- a/complete.tcsh +++ b/complete.tcsh @@ -439,9 +439,7 @@ skip_mh: # from George Cox - complete acroread 'p/*/f:*.{pdf,fdf,PDF,FDF}/' - complete xpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' - complete kpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' + complete acroread 'p/*/f:*.{pdf,PDF}/' complete apachectl 'c/*/(start stop restart fullstatus status graceful \ configtest help)/' complete appletviewer 'p/*/f:*.class/' diff --git a/tcsh.changes b/tcsh.changes index 7c33638..316064b 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 17 12:58:44 CET 2010 - werner@suse.de - -- Add Forms Data Format (.fdf) for acroread and co (bnc#573202) - ------------------------------------------------------------------- Mon Mar 8 01:42:26 CET 2010 - ro@suse.de From d8fa5bd65bd862c07f8ee3364d42a24337f902cae2165b4ecd661d3340b75e11 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 11 Jun 2010 14:42:53 +0000 Subject: [PATCH 3/6] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=18 --- complete.tcsh | 4 +++- ready | 0 tcsh-6.17.00.dif | 18 ++++++++++++++++++ tcsh.changes | 10 ++++++++++ tcsh.spec | 2 +- 5 files changed, 32 insertions(+), 2 deletions(-) delete mode 100644 ready diff --git a/complete.tcsh b/complete.tcsh index 7159a2e..f6d8535 100644 --- a/complete.tcsh +++ b/complete.tcsh @@ -439,7 +439,9 @@ skip_mh: # from George Cox - complete acroread 'p/*/f:*.{pdf,PDF}/' + complete acroread 'p/*/f:*.{pdf,fdf,PDF,FDF}/' + complete xpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' + complete kpdf 'p/*/f:*.{pdf,fdf,PDF,FDF}/' complete apachectl 'c/*/(start stop restart fullstatus status graceful \ configtest help)/' complete appletviewer 'p/*/f:*.class/' diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/tcsh-6.17.00.dif b/tcsh-6.17.00.dif index daf276f..62da9bc 100644 --- a/tcsh-6.17.00.dif +++ b/tcsh-6.17.00.dif @@ -25,6 +25,15 @@ install.man: tcsh.man --- config_f.h +++ config_f.h 2007-07-13 10:47:29.673240000 +0000 +@@ -37,7 +37,7 @@ + */ + #ifndef _h_config_f + #define _h_config_f +- ++#include + /* + * SHORT_STRINGS Use at least 16 bit characters instead of 8 bit chars + * This fixes up quoting problems and eases implementation @@ -63,12 +63,19 @@ */ #if defined (NLS) && defined (HAVE_CATGETS) @@ -46,6 +55,15 @@ /* * VIDEFAULT Make the VI mode editor the default +@@ -150,7 +150,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__GLIBC__) + # define SYSMALLOC + #else + # undef SYSMALLOC @@ -162,7 +169,7 @@ * successful, set $REMOTEHOST to the name or address of the * host diff --git a/tcsh.changes b/tcsh.changes index 316064b..19bda79 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jun 11 16:41:34 CEST 2010 - werner@suse.de + +- Avoid crash due own malloc due buggy nss implementation of glibc + +------------------------------------------------------------------- +Wed Mar 17 12:58:44 CET 2010 - werner@suse.de + +- Add Forms Data Format (.fdf) for acroread and co (bnc#573202) + ------------------------------------------------------------------- Mon Mar 8 01:42:26 CET 2010 - ro@suse.de diff --git a/tcsh.spec b/tcsh.spec index d2b5324..645b613 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -26,7 +26,7 @@ Group: System/Shells Requires: gawk textutils AutoReqProv: on Version: 6.17.00 -Release: 2 +Release: 3 Summary: The C SHell Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.00.tar.bz2 Source1: nls-iconv From c066575cda6b5f4f784196df74cb397265fb42e3b5b6acd73b6a817f525a7bd0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 13 Jun 2010 22:27:31 +0000 Subject: [PATCH 4/6] Accepting request 41363 from shells checked in (request 41363) OBS-URL: https://build.opensuse.org/request/show/41363 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=19 --- tcsh-6.17.00.dif | 18 ------------------ tcsh.changes | 5 ----- 2 files changed, 23 deletions(-) diff --git a/tcsh-6.17.00.dif b/tcsh-6.17.00.dif index 62da9bc..daf276f 100644 --- a/tcsh-6.17.00.dif +++ b/tcsh-6.17.00.dif @@ -25,15 +25,6 @@ install.man: tcsh.man --- config_f.h +++ config_f.h 2007-07-13 10:47:29.673240000 +0000 -@@ -37,7 +37,7 @@ - */ - #ifndef _h_config_f - #define _h_config_f -- -+#include - /* - * SHORT_STRINGS Use at least 16 bit characters instead of 8 bit chars - * This fixes up quoting problems and eases implementation @@ -63,12 +63,19 @@ */ #if defined (NLS) && defined (HAVE_CATGETS) @@ -55,15 +46,6 @@ /* * VIDEFAULT Make the VI mode editor the default -@@ -150,7 +150,7 @@ - * This can be much slower and no memory statistics will be - * provided. - */ --#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) -+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__GLIBC__) - # define SYSMALLOC - #else - # undef SYSMALLOC @@ -162,7 +169,7 @@ * successful, set $REMOTEHOST to the name or address of the * host diff --git a/tcsh.changes b/tcsh.changes index 19bda79..7c33638 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 11 16:41:34 CEST 2010 - werner@suse.de - -- Avoid crash due own malloc due buggy nss implementation of glibc - ------------------------------------------------------------------- Wed Mar 17 12:58:44 CET 2010 - werner@suse.de From cad20f7be46c4478ad08c8c2de753c382ae9945c9d3b85979bdb68ce3b275982 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 14 Dec 2010 17:25:40 +0000 Subject: [PATCH 5/6] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=20 --- 12_unknown_lscolors.patch | 24 ++++ nls-iconv | 5 + tcsh-6.17.00-colorls.dif | 12 -- tcsh-6.17.00.tar.bz2 | 3 - tcsh-6.17.02-catalogs.patch | 27 ++++ tcsh-6.17.02-colorls.dif | 27 ++++ tcsh-6.17.02-kanji.dif | 132 ++++++++++++++++++ tcsh-6.17.02-multibyte.patch | 16 +++ ...-spelling.dif => tcsh-6.17.02-spelling.dif | 16 +-- tcsh-6.17.00.dif => tcsh-6.17.02.dif | 90 +++++++----- tcsh-6.17.02.tar.bz2 | 3 + tcsh.changes | 46 ++++++ tcsh.spec | 48 ++++--- 13 files changed, 370 insertions(+), 79 deletions(-) create mode 100644 12_unknown_lscolors.patch delete mode 100644 tcsh-6.17.00-colorls.dif delete mode 100644 tcsh-6.17.00.tar.bz2 create mode 100644 tcsh-6.17.02-catalogs.patch create mode 100644 tcsh-6.17.02-colorls.dif create mode 100644 tcsh-6.17.02-kanji.dif create mode 100644 tcsh-6.17.02-multibyte.patch rename tcsh-6.15.00-spelling.dif => tcsh-6.17.02-spelling.dif (61%) rename tcsh-6.17.00.dif => tcsh-6.17.02.dif (89%) create mode 100644 tcsh-6.17.02.tar.bz2 diff --git a/12_unknown_lscolors.patch b/12_unknown_lscolors.patch new file mode 100644 index 0000000..5253a1c --- /dev/null +++ b/12_unknown_lscolors.patch @@ -0,0 +1,24 @@ +Author: Franz Pletz +Description: Don't die on unknown LS_COLORS values +Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. +Debian-Bug: #592089 + +--- a/tw.color.c ++++ b/tw.color.c +@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) + if ((Char)variables[i].variable[0] == (v[0] & CHAR) && + (Char)variables[i].variable[1] == (v[1] & CHAR)) + break; +- if (i < nvariables) { +- v += 3; ++ v += 3; ++ if (i < nvariables) + getstring(&c, &v, &variables[i].color, ':'); +- continue; +- } +- else +- stderror(ERR_BADCOLORVAR, v[0], v[1]); ++ continue; + } + break; + } diff --git a/nls-iconv b/nls-iconv index fb4dbd4..03401f6 100644 --- a/nls-iconv +++ b/nls-iconv @@ -23,3 +23,8 @@ iconv_files ISO-8859-2 nls/pl/set* iconv_files KOI8-R nls/russian/set* iconv_files ISO-8859-1 nls/spanish/set* iconv_files KOI8-U nls/ukrainian/set* + +for i in nls/*/charset ; do + perl -pi -e 's/codeset *= *[^[:space:]]*/codeset=UTF-8/' $i + perl -pi -e 's/1 *[^[:space:]]*/1 UTF-8/' $i +done diff --git a/tcsh-6.17.00-colorls.dif b/tcsh-6.17.00-colorls.dif deleted file mode 100644 index 8baeec1..0000000 --- a/tcsh-6.17.00-colorls.dif +++ /dev/null @@ -1,12 +0,0 @@ ---- tw.color.c -+++ tw.color.c 2009-06-23 08:59:29.609901731 +0000 -@@ -86,6 +86,9 @@ static Variable variables[] = { - 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, "ca", ""), /* Capability */ -+ VAR(NOS, "hl", ""), /* Hardlink */ -+ VAR(NOS, "cl", ""), /* CLRTOEOL */ - }; - - enum FileType { diff --git a/tcsh-6.17.00.tar.bz2 b/tcsh-6.17.00.tar.bz2 deleted file mode 100644 index 4ca3eda..0000000 --- a/tcsh-6.17.00.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17af7fa7376b24a962646cb9a036bfac0b8deddbac3caf8f77dd6469440d1172 -size 740481 diff --git a/tcsh-6.17.02-catalogs.patch b/tcsh-6.17.02-catalogs.patch new file mode 100644 index 0000000..c20bfcb --- /dev/null +++ b/tcsh-6.17.02-catalogs.patch @@ -0,0 +1,27 @@ +Author: christos +Date: Thu May 13 18:39:02 2010 +0000 + + add a rule to make catalogs and propagate ${MAKE} instead of hard-coding make. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -687,7 +687,7 @@ shar: + rm -rf tcsh-${VERSION} + + catalogs: +- @(cd nls; make catalogs) ++ @(cd nls; ${MAKE}) + + tcsh-${VERSION}.tar.Z: + rm -rf tcsh-${VERSION} +--- a/nls/Makefile.in ++++ b/nls/Makefile.in +@@ -18,7 +18,7 @@ install: $(INSTALLED) + $(INSTALL) $< $@ + + %.cat: +- $(GENCAT) $@ $(@:%.cat=%)/*set* ++ cat $(@:%.cat=%)/charset $(@:%.cat=%)/set* | $(GENCAT) $@ + + clean: + $(RM) $(CATALOGS) diff --git a/tcsh-6.17.02-colorls.dif b/tcsh-6.17.02-colorls.dif new file mode 100644 index 0000000..6e66102 --- /dev/null +++ b/tcsh-6.17.02-colorls.dif @@ -0,0 +1,27 @@ +--- tw.color.c ++++ tw.color.c 2010-12-10 16:07:59.151926218 +0000 +@@ -88,6 +88,7 @@ static Variable variables[] = { + VAR(NOS, "rs", "0"), /* Reset to normal color */ + VAR(NOS, "hl", "44;37"), /* Reg file extra hard links */ + VAR(NOS, "ca", "30;41"), /* File with capability */ ++ VAR(NOS, "cl", ""), /* CLRTOEOL */ + }; + + enum FileType { +@@ -239,13 +240,10 @@ parseLS_COLORS(const Char *value) + if ((Char)variables[i].variable[0] == (v[0] & CHAR) && + (Char)variables[i].variable[1] == (v[1] & CHAR)) + break; +- if (i < nvariables) { +- v += 3; ++ v += 3; ++ if (i < nvariables) + getstring(&c, &v, &variables[i].color, ':'); +- continue; +- } +- else +- stderror(ERR_BADCOLORVAR, v[0], v[1]); ++ continue; + } + break; + } diff --git a/tcsh-6.17.02-kanji.dif b/tcsh-6.17.02-kanji.dif new file mode 100644 index 0000000..8b639d0 --- /dev/null +++ b/tcsh-6.17.02-kanji.dif @@ -0,0 +1,132 @@ +--- ed.inputl.c ++++ ed.inputl.c 2010-12-09 10:01:31.000000000 +0000 +@@ -683,7 +683,7 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch) + #ifdef DSPMBYTE + _enable_mbdisp && + #else +- MB_LEN_MAX == 1 && ++ MB_CUR_MAX == 1 && + #endif + !adrof(STRnokanji) && (*ch & META)) { + MetaNext = 0; +--- sh.c ++++ sh.c 2010-12-10 16:10:45.000000000 +0000 +@@ -804,6 +804,18 @@ main(int argc, char **argv) + nt_autoset_dspmbyte(); + #endif /* WINNT_NATIVE */ + #endif ++#if defined(KANJI) ++#if defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++#if defined(NLS) && defined(LC_CTYPE) ++ if (setlocale(LC_CTYPE, NULL) != NULL || getenv("LANG") != NULL) ++#else ++ if (getenv("LANG") != NULL) ++#endif ++ { ++ autoset_kanji(); ++ } ++#endif ++#endif + + fix_version(); /* publish the shell version */ + +--- sh.decls.h ++++ sh.decls.h 2010-12-07 10:09:50.000000000 +0000 +@@ -392,6 +392,11 @@ extern Char *unparse (struct command * + extern void update_dspmbyte_vars (void); + extern void autoset_dspmbyte (const Char *); + #endif ++#if defined(KANJI) ++#if defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++extern void autoset_kanji (void); ++#endif ++#endif + + /* + * sh.time.c +--- sh.func.c ++++ sh.func.c 2010-12-09 09:15:06.000000000 +0000 +@@ -1422,6 +1422,10 @@ dosetenv(Char **v, struct command *c) + # endif + # ifdef LC_CTYPE + (void) setlocale(LC_CTYPE, ""); /* for iscntrl */ ++# if defined(KANJI) && defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++ autoset_kanji(); ++# endif ++ + # endif /* LC_CTYPE */ + # ifdef NLS_CATALOGS + # ifdef LC_MESSAGES +--- sh.set.c ++++ sh.set.c 2010-12-09 11:07:56.000000000 +0000 +@@ -1098,7 +1098,8 @@ x: + } + } + +-#if defined(KANJI) && defined(SHORT_STRINGS) && defined(DSPMBYTE) ++#if defined(KANJI) ++#if defined(SHORT_STRINGS) && defined(DSPMBYTE) + extern int dspmbyte_ls; + + void +@@ -1273,4 +1274,26 @@ autoset_dspmbyte(const Char *pcp) + } + } + } ++#elif defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++void ++autoset_kanji(void) ++{ ++ char *codeset = nl_langinfo(CODESET); ++ ++ if (*codeset == '\0') { ++ if (adrof(STRnokanji) == NULL) ++ setNS(STRnokanji); ++ return; ++ } ++ ++ if (strcasestr(codeset, "SHIFT_JIS") == (char*)0) { ++ if (adrof(STRnokanji) == NULL) ++ setNS(STRnokanji); ++ return; ++ } ++ ++ if (adrof(STRnokanji) != NULL) ++ unsetv(STRnokanji); ++} ++#endif + #endif +--- tc.str.c ++++ tc.str.c 2010-12-14 16:47:24.383925459 +0000 +@@ -94,13 +94,31 @@ one_wctomb(char *s, Char wchar) + return len; + } + ++#if defined(KANJI) && defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++static mbstate_t mb_zero; ++#endif ++ + int + rt_mbtowc(Char *pwc, const char *s, size_t n) + { + int ret; + char back[MB_LEN_MAX]; + wchar_t tmp; ++#if defined(KANJI) && defined(WIDE_STRINGS) && defined(HAVE_NL_LANGINFO) && defined(CODESET) ++ static mbstate_t mb; ++ ++ /* ++ * Workaround the Shift-JIS endcoding that translates unshifted 7 bit ASCII! ++ */ ++ if (!adrof(STRnokanji) && n && pwc && s && (*s == '\\' || *s == '~') && ++ !memcmp(&mb, &mb_zero, sizeof(mb))) ++ { ++ *pwc = *s; ++ return 1; ++ } ++#else + mbstate_t mb; ++#endif + + memset (&mb, 0, sizeof mb); + ret = mbrtowc(&tmp, s, n, &mb); diff --git a/tcsh-6.17.02-multibyte.patch b/tcsh-6.17.02-multibyte.patch new file mode 100644 index 0000000..8970c05 --- /dev/null +++ b/tcsh-6.17.02-multibyte.patch @@ -0,0 +1,16 @@ +Author: Jean-Luc Leger +Description: fix broken globbing expansion +Debian-Bug: #603545 +--- a/tc.str.c ++++ b/tc.str.c +@@ -104,8 +104,9 @@ rt_mbtowc(Char *pwc, const char *s, size_t n) + + memset (&mb, 0, sizeof mb); + ret = mbrtowc(&tmp, s, n, &mb); +- if (ret > 0) { ++ if (ret >= 0) + *pwc = tmp; ++ if (ret > 0) { + #ifdef UTF16_STRINGS + if (tmp >= 0xd800 && tmp <= 0xdbff) { + /* UTF-16 surrogate pair. Fetch second half and compute diff --git a/tcsh-6.15.00-spelling.dif b/tcsh-6.17.02-spelling.dif similarity index 61% rename from tcsh-6.15.00-spelling.dif rename to tcsh-6.17.02-spelling.dif index 8e248f6..aa88587 100644 --- a/tcsh-6.15.00-spelling.dif +++ b/tcsh-6.17.02-spelling.dif @@ -1,16 +1,14 @@ ---- nls/Makefile -+++ nls/Makefile 2007-07-13 10:31:53.537806617 +0000 -@@ -2,9 +2,8 @@ +--- nls/Makefile.in ++++ nls/Makefile.in 2010-12-10 16:05:57.967928042 +0000 +@@ -2,7 +2,7 @@ - SUBDIRS= C et finnish french german greek italian ja pl russian \ + LOCALES= C et finnish french german greek italian ja pl russian \ spanish ukrainian --#GENCAT= gencat --new -+GENCAT= gencat --new - CHARSET= charset -GENCAT= gencat ++GENCAT= gencat --new + INSTALL= ginstall - catalogs: - @for i in ${SUBDIRS} ; \ + datarootdir=@datarootdir@ --- nls/german/set6 +++ nls/german/set6 2005-08-17 12:12:36.000000000 +0000 @@ -3,8 +3,8 @@ $ ed.inputl.c diff --git a/tcsh-6.17.00.dif b/tcsh-6.17.02.dif similarity index 89% rename from tcsh-6.17.00.dif rename to tcsh-6.17.02.dif index daf276f..68cbe95 100644 --- a/tcsh-6.17.00.dif +++ b/tcsh-6.17.02.dif @@ -24,7 +24,16 @@ install.man: tcsh.man --- config_f.h -+++ config_f.h 2007-07-13 10:47:29.673240000 +0000 ++++ config_f.h 2007-07-13 10:47:30.000000000 +0000 +@@ -37,7 +37,7 @@ + */ + #ifndef _h_config_f + #define _h_config_f +- ++#include + /* + * SHORT_STRINGS Use at least 16 bit characters instead of 8 bit chars + * This fixes up quoting problems and eases implementation @@ -63,12 +63,19 @@ */ #if defined (NLS) && defined (HAVE_CATGETS) @@ -46,6 +55,15 @@ /* * VIDEFAULT Make the VI mode editor the default +@@ -143,7 +150,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined(__GLIBC__) + # define SYSMALLOC + #else + # undef SYSMALLOC @@ -162,7 +169,7 @@ * successful, set $REMOTEHOST to the name or address of the * host @@ -84,7 +102,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 12:05:58.000000000 +0000 @@ -110,7 +110,7 @@ newcode : /* * On convex, find the current machine type via the getsysinfo() syscall @@ -190,8 +208,8 @@ #endif /* _CRAYCOM && !_PATH_TCSHELL */ --- sh.c -+++ sh.c 2009-03-25 10:45:13.676501240 +0000 -@@ -454,7 +454,8 @@ main(int argc, char **argv) ++++ sh.c 2010-12-10 16:10:45.187927025 +0000 +@@ -501,7 +501,8 @@ main(int argc, char **argv) if (loginsh || (uid == 0)) { if (*cp) { /* only for login shells or root and we must have a tty */ @@ -201,7 +219,7 @@ cp2 = cp2 + 1; } else -@@ -715,7 +716,16 @@ main(int argc, char **argv) +@@ -768,7 +769,16 @@ main(int argc, char **argv) xfree(tmp2); } #else /* !WINNT_NATIVE */ @@ -218,19 +236,19 @@ #endif /* WINNT_NATIVE */ /* -@@ -739,9 +749,9 @@ main(int argc, char **argv) +@@ -792,9 +802,9 @@ main(int argc, char **argv) /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */ #if defined(DSPMBYTE) #if defined(NLS) && defined(LC_CTYPE) -- if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL) && !adrof(CHECK_MBYTEVAR)) { -+ if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL)) { +- if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL) && !adrof(CHECK_MBYTEVAR)) ++ if (((tcp = setlocale(LC_CTYPE, NULL)) != NULL || (tcp = getenv("LANG")) != NULL)) #else -- if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR)) { -+ if ((tcp = getenv("LANG")) != NULL) { +- if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR)) ++ if ((tcp = getenv("LANG")) != NULL) #endif + { autoset_dspmbyte(str2short(tcp)); - } -@@ -1247,6 +1257,9 @@ main(int argc, char **argv) +@@ -1291,6 +1313,9 @@ main(int argc, char **argv) setintr = osetintr; parintr = oparintr; } @@ -241,7 +259,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 11:51:58.000000000 +0000 @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. @@ -250,7 +268,7 @@ #include "sh.h" RCSID("$tcsh: sh.dol.c,v 3.77 2009/06/19 16:25:00 christos Exp $") -@@ -922,6 +923,31 @@ heredoc(Char *term) +@@ -938,6 +939,31 @@ heredoc(Char *term) Char *lbp, *obp, *mbp; Char **vp; int quoted; @@ -282,7 +300,7 @@ char *tmp; #ifndef WINNT_NATIVE struct timeval tv; -@@ -961,6 +987,7 @@ again: +@@ -977,6 +1003,7 @@ again: errno = oerrno; stderror(ERR_SYSTEM, tmp, strerror(errno)); } @@ -291,8 +309,8 @@ Dv[0] = term; Dv[1] = NULL; --- sh.func.c -+++ sh.func.c 2006-04-25 12:58:31.000000000 +0000 -@@ -1267,14 +1267,6 @@ dosetenv(Char **v, struct command *c) ++++ sh.func.c 2010-12-09 09:15:06.106883731 +0000 +@@ -1404,14 +1404,6 @@ dosetenv(Char **v, struct command *c) } #endif /* apollo */ @@ -307,7 +325,7 @@ if (islocale_var(vp)) { #ifdef NLS int k; -@@ -1296,6 +1288,13 @@ dosetenv(Char **v, struct command *c) +@@ -1433,6 +1429,13 @@ dosetenv(Char **v, struct command *c) nlsclose(); nlsinit(); # endif /* NLS_CATALOGS */ @@ -322,8 +340,8 @@ dont_free = 0; # endif /* SETLOCALEBUG */ --- sh.h -+++ sh.h 2007-07-13 11:07:44.198395000 +0000 -@@ -267,7 +267,7 @@ typedef int eChar; ++++ sh.h 2007-07-13 11:07:44.000000000 +0000 +@@ -272,7 +272,7 @@ static inline void ignore(intptr_t a) # else # include # endif /* _UWIN */ @@ -332,7 +350,7 @@ # undef TIOCGLTC /* we don't need those, since POSIX has them */ # undef TIOCSLTC # undef CSWTCH -@@ -321,6 +321,12 @@ typedef int eChar; +@@ -326,6 +326,12 @@ static inline void ignore(intptr_t a) #if !((defined(SUNOS4) || defined(_MINIX) /* || defined(DECOSF1) */) && defined(TERMIO)) # if !defined(_VMS_POSIX) && !defined(WINNT_NATIVE) # include @@ -345,7 +363,7 @@ # endif #endif -@@ -1179,9 +1185,7 @@ extern char **environ; +@@ -1190,9 +1196,7 @@ extern char **environ; # ifdef NLS_CATALOGS # if defined(linux) || defined(__GNU__) || defined(__GLIBC__) # include @@ -358,7 +376,7 @@ # ifdef SUNOS4 --- sh.sem.c +++ sh.sem.c 2006-04-25 12:58:31.000000000 +0000 -@@ -622,10 +622,19 @@ execute(struct command *t, volatile int +@@ -629,10 +629,19 @@ execute(struct command *t, volatile int * possible stopping */ if (bifunc) { @@ -382,8 +400,8 @@ int rv = getn(varval(STRstatus)); if (rv != 0) --- sh.set.c -+++ sh.set.c 2007-07-13 11:09:17.172297000 +0000 -@@ -1091,11 +1091,11 @@ update_dspmbyte_vars(void) ++++ sh.set.c 2010-12-09 11:07:56.404647849 +0000 +@@ -1107,11 +1108,11 @@ update_dspmbyte_vars(void) dstr1 = vp->vec[0]; if(eq (dstr1, STRsjis)) iskcode = 1; @@ -397,7 +415,7 @@ iskcode = 4; else if ((dstr1[0] - '0') >= 0 && (dstr1[0] - '0') <= 3) { iskcode = 0; -@@ -1179,7 +1179,7 @@ update_dspmbyte_vars(void) +@@ -1195,7 +1196,7 @@ update_dspmbyte_vars(void) _enable_mbdisp = 0; dspmbyte_ls = 0; } @@ -406,7 +424,7 @@ { Char mbmapstr[300]; for (lp = 0; lp < 256; lp++) -@@ -1187,7 +1187,7 @@ update_dspmbyte_vars(void) +@@ -1203,7 +1204,7 @@ update_dspmbyte_vars(void) mbmapstr[lp] = 0; setcopy(STRmbytemap, mbmapstr, VAR_READWRITE); } @@ -415,7 +433,7 @@ } /* dspkanji/dspmbyte autosetting */ -@@ -1196,6 +1196,7 @@ void +@@ -1212,6 +1213,7 @@ void autoset_dspmbyte(const Char *pcp) { int i; @@ -423,7 +441,7 @@ static const struct dspm_autoset_Table { Char *n; Char *v; -@@ -1218,13 +1219,18 @@ autoset_dspmbyte(const Char *pcp) +@@ -1234,13 +1236,18 @@ autoset_dspmbyte(const Char *pcp) #if defined(HAVE_NL_LANGINFO) && defined(CODESET) static const struct dspm_autoset_Table dspmc[] = { { STRstarutfstar8, STRutf8 }, @@ -498,7 +516,7 @@ Char STRGB2312[] = { 'g', 'b', '2', '3', '1', '2', '\0' }; # ifdef MBYTEDEBUG /* Sorry, use for beta testing */ Char STRmbytemap[] = { 'm', 'b', 'y', 't', 'e', 'm', 'a', 'p', '\0' }; -@@ -429,7 +431,7 @@ Char STRkilldup[] = { 'k', 'i', 'l', 'l +@@ -430,7 +432,7 @@ Char STRkilldup[] = { 'k', 'i', 'l', 'l Char STRshlvl[] = { 's', 'h', 'l', 'v', 'l', '\0' }; Char STRKSHLVL[] = { 'S', 'H', 'L', 'V', 'L', '\0' }; Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' }; @@ -508,7 +526,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 11:15:03.000000000 +0000 @@ -689,9 +689,13 @@ auto_lock(void) handle_pending_signals(); errno = 0; @@ -535,7 +553,7 @@ if (sptr != name) { --- tc.str.c +++ tc.str.c 2006-04-25 12:58:31.000000000 +0000 -@@ -271,7 +271,7 @@ s_strlen(const Char *str) +@@ -278,7 +278,7 @@ s_strlen(const Char *str) { size_t n; @@ -568,8 +586,8 @@ 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 -@@ -173,7 +173,7 @@ parseLS_COLORS(const Char *value) ++++ tw.color.c 2007-07-13 11:18:16.000000000 +0000 +@@ -177,7 +177,7 @@ parseLS_COLORS(const Char *value) size_t i, len; const Char *v; /* pointer in value */ char *c; /* pointer in colors */ @@ -578,7 +596,7 @@ jmp_buf_t osetexit; size_t omark; -@@ -301,12 +301,13 @@ print_color(const Char *fname, size_t le +@@ -305,12 +305,13 @@ print_color(const Char *fname, size_t le break; } if (i == nvariables) { @@ -612,7 +630,7 @@ #define TW_ZERO 0x0fff --- config/linux -+++ config/linux 2007-07-13 11:22:07.326273000 +0000 ++++ config/linux 2007-07-13 11:22:07.000000000 +0000 @@ -70,7 +70,7 @@ * * Note: Linux should work with any SYSVREL < 3. diff --git a/tcsh-6.17.02.tar.bz2 b/tcsh-6.17.02.tar.bz2 new file mode 100644 index 0000000..be222f2 --- /dev/null +++ b/tcsh-6.17.02.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da47874562a72563ac071cabf3e1380b238987c174791c84a1a7357cc611d780 +size 757076 diff --git a/tcsh.changes b/tcsh.changes index 7c33638..04572f6 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Tue Dec 14 18:20:38 CET 2010 - werner@suse.de + +- Update to tcsh minor version V6.17.02 + * PR/79: nargs: Better handling for promptchars. + * PR/97: Add parseoctal to retain compatibility with previous versions (Jim + Zajkowski) + * PR/84: Performance fixes for large history merges (add + hashtable (Ted Anderson) + * Don't kill "hup" background jobs when a child of the shell exits. + From Debian. + * Ignore \r\n in the command line options for OS's that don't strip + these from #!; from Debian + * Callers of rt_mbtowc don't grok -2 as a return. Return -1 for now. + (Corinna Vinschen) + * set autoexpand; set histchars="";\n crash. From Debian + * unset verbose while we are reading the history file to avoid echoing + to the terminal. (Jeffrey Bastian) + * globstar addition, Enhance addition, euid, euser, gid variables + (Greg Dionne) + * Make 'e' in vi mode work like 'b' - use wordchars (Alistair Crooks) + * Make tcsh work on systems where sizeof(wchar_t) == 2 (Corinna Vinschen) + * Change internal expression calculations to long long so that we can + deal with > 32 bit time, inodes, uids, file sizes etc. + * Don't print 'Exit X' when printexitvalue is set in `` expressions + (Jeff Bastian) + * Add more LS_COLORS vars (M.H. Anderson) + * Manual page fixes (Alan R. S. Bueno) + * Remove history in loops bug from the documentation (Holger Weiss) + * Add autorehash (Holger Weiss) + * Add history.at (Ted Anderson) + * Better NLSPATH handling (Norm Jacobs) + * Fix hostname building from utmp (Cyrus Rahman) + * Handle pending signals before flush so that the the history file does + not get truncated. (Ted Anderson) + * Fix AsciiOnly setting that broke 8 bit input. (Juergen Keil) + * remember to closedir in mailchk (from Werner Fink, reported by + David Binderman) +- Add workaround for Shift-JIS endcoding that translates unshifted + 7 bit ASCII (bnc#655306) + +------------------------------------------------------------------- +Fri Jun 11 16:41:34 CEST 2010 - werner@suse.de + +- Avoid crash due own malloc due buggy nss implementation of glibc + ------------------------------------------------------------------- Wed Mar 17 12:58:44 CET 2010 - werner@suse.de diff --git a/tcsh.spec b/tcsh.spec index 645b613..5fb9573 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -25,15 +25,15 @@ License: BSD3c(or similar) Group: System/Shells Requires: gawk textutils AutoReqProv: on -Version: 6.17.00 -Release: 3 +Version: 6.17.02 +Release: 4 Summary: The C SHell -Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.00.tar.bz2 +Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.02.tar.bz2 Source1: nls-iconv Source2: bindkey.tcsh Source3: complete.tcsh -Patch: tcsh-6.17.00.dif -Patch1: tcsh-6.15.00-spelling.dif +Patch: tcsh-6.17.02.dif +Patch1: tcsh-6.17.02-spelling.dif Patch2: tcsh-6.15.00-utf8.dif Patch3: tcsh-6.15.00-pipe.dif Patch4: tcsh-6.17.00-longjmp.dif @@ -41,8 +41,11 @@ 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.17.02-multibyte.patch +Patch10: tcsh-6.17.02-colorls.dif Patch11: tcsh-6.16.00-mailbox.dif +Patch12: tcsh-6.17.02-catalogs.patch +Patch13: tcsh-6.17.02-kanji.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,8 +73,11 @@ Authors: ### disabled for know, should work on os11.1 without ### %patch7 -p0 -b .blanks %patch8 -p0 -b .fullpath +%patch9 -p1 -b .mb %patch10 -p0 -b .colorls %patch11 -p0 -b .mailbox +%patch12 -p1 -b .catalog +%patch13 -p0 -b .kanji %patch sh $RPM_SOURCE_DIR/nls-iconv @@ -99,25 +105,29 @@ Authors: # # requires a working terminal on stdin # make check + rm -vf nls/*/set[0-9]*.* make catalogs %install rm -rf $RPM_BUILD_ROOT - for nls in et fi fr de el it ja pl ru es uk_UA ; do - dir=$RPM_BUILD_ROOT/usr/share/locale/${nls}/LC_MESSAGES + for nls in nls/*.cat ; do msg=$nls - mkdir -p -m 0755 $dir - case "$nls" in - fi) msg=finnish ;; - fr) msg=french ;; - de) msg=german ;; - el) msg=greek ;; - it) msg=italian ;; - ru) msg=russian ;; - es) msg=spanish ;; - uk_UA) msg=ukrainian ;; + nls=${nls##*/} + nls=${nls%%.*} + case "${nls}" in + fi*) nls=fi ;; + fr*) nls=fr ;; + ge*) nls=de ;; + gr*) nls=el ;; + it*) nls=it ;; + ru*) nls=ru ;; + sp*) nls=es ;; + uk*) nls=uk_UA ;; + C) continue ;; esac - install -m 0444 tcsh.${msg}.cat ${dir}/tcsh + dir=$RPM_BUILD_ROOT/usr/share/locale/${nls}/LC_MESSAGES + mkdir -p -m 0755 $dir + install -m 0444 ${msg} ${dir}/tcsh done make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install.man From 30c4822935a31bdc06774e8208abad8a6139baf030520ba963dbdf0f2d10270e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 20 Dec 2010 12:07:13 +0000 Subject: [PATCH 6/6] . OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=21 --- 12_unknown_lscolors.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 12_unknown_lscolors.patch diff --git a/12_unknown_lscolors.patch b/12_unknown_lscolors.patch deleted file mode 100644 index 5253a1c..0000000 --- a/12_unknown_lscolors.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Franz Pletz -Description: Don't die on unknown LS_COLORS values -Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. -Debian-Bug: #592089 - ---- a/tw.color.c -+++ b/tw.color.c -@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) - if ((Char)variables[i].variable[0] == (v[0] & CHAR) && - (Char)variables[i].variable[1] == (v[1] & CHAR)) - break; -- if (i < nvariables) { -- v += 3; -+ v += 3; -+ if (i < nvariables) - getstring(&c, &v, &variables[i].color, ':'); -- continue; -- } -- else -- stderror(ERR_BADCOLORVAR, v[0], v[1]); -+ continue; - } - break; - }