Hello community,
here is the log from the commit of package tcsh for openSUSE:Factory
checked in at Mon Dec 20 14:04:14 CET 2010.
--------
--- tcsh/tcsh.changes 2010-06-11 16:42:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/tcsh/tcsh.changes 2010-12-14 18:25:39.000000000 +0100
@@ -1,0 +2,41 @@
+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<tab> 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)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
tcsh-6.15.00-spelling.dif
tcsh-6.17.00-colorls.dif
tcsh-6.17.00.dif
tcsh-6.17.00.tar.bz2
New:
----
tcsh-6.17.02-catalogs.patch
tcsh-6.17.02-colorls.dif
tcsh-6.17.02.dif
tcsh-6.17.02-kanji.dif
tcsh-6.17.02-multibyte.patch
tcsh-6.17.02-spelling.dif
tcsh-6.17.02.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcsh.spec ++++++
--- /var/tmp/diff_new_pack.DeqBap/_old 2010-12-20 14:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.DeqBap/_new 2010-12-20 14:03:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package tcsh (Version 6.17.00)
+# spec file for package tcsh (Version 6.17.02)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,15 +25,15 @@
Group: System/Shells
Requires: gawk textutils
AutoReqProv: on
-Version: 6.17.00
-Release: 4
+Version: 6.17.02
+Release: 1
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 @@
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 @@
### 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 @@
#
# 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
++++++ nls-iconv ++++++
--- /var/tmp/diff_new_pack.DeqBap/_old 2010-12-20 14:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.DeqBap/_new 2010-12-20 14:03:02.000000000 +0100
@@ -23,3 +23,8 @@
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
++++++ tcsh-6.17.02-catalogs.patch ++++++
Author: christos <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)
++++++ tcsh-6.17.00-colorls.dif -> tcsh-6.17.02-colorls.dif ++++++
--- tcsh/tcsh-6.17.00-colorls.dif 2010-02-15 14:03:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/tcsh/tcsh-6.17.02-colorls.dif 2010-12-14 18:25:36.000000000 +0100
@@ -1,12 +1,27 @@
--- 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 */
++++ 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, "ca", ""), /* Capability */
-+ VAR(NOS, "hl", ""), /* Hardlink */
-+ VAR(NOS, "cl", ""), /* CLRTOEOL */
+ 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;
+ }
++++++ tcsh-6.15.00-spelling.dif -> tcsh-6.17.02.dif ++++++
++++ 846 lines (skipped)
++++ between tcsh/tcsh-6.15.00-spelling.dif
++++ and /mounts/work_src_done/STABLE/tcsh/tcsh-6.17.02.dif
++++++ tcsh-6.17.02-kanji.dif ++++++
--- 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);
++++++ tcsh-6.17.02-multibyte.patch ++++++
Author: Jean-Luc Leger