Hello community,
here is the log from the commit of package tcsh for openSUSE:Factory checked in
at 2011-11-21 12:51:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcsh (Old)
and /work/SRC/openSUSE:Factory/.tcsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcsh", Maintainer is "wer...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcsh/tcsh.changes 2011-11-16
17:22:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh.changes 2011-11-21
12:51:58.000000000 +0100
@@ -1,0 +2,66 @@
+Fri Nov 18 13:26:08 UTC 2011 - wer...@suse.de
+
+- Increase size of hash table for runtime linker a lot
+
+-------------------------------------------------------------------
+Thu Nov 17 08:44:05 UTC 2011 - wer...@suse.de
+
+- Split off tcsh-lang as its own package
+- Make language catalogs work that is use tcsh instead of tcsh.cat
+ as this is the system default
+
+-------------------------------------------------------------------
+Wed Nov 16 14:21:12 UTC 2011 - wer...@suse.de
+
+- Update to tcsh minor version V6.17.06
+ * PR/110: Add $anyerror to select behavior. Default to the new one.
+ * Don't try to spell commands that are correct (Rouben Rostamian)
+ [./tcsh -f; set path=($path 2); mkdir foo2; cd foo2; touch foo;
+ chmod +x foo; set correct=cmd; ./foo -> ../foo]
+ * Don't push the syntax struct on the cleanup stack, because on foo;bar
+ if foo fails, we will free bar prematurely (Ben Miller)
+ * Avoid infinite loop while trying to print the pid of a dying process
+ to a closed file (Bob Arendt)
+ * Handle completion of ${ variables (Anthony Mallet)
+ * Add --disable-nls-catalogs (Corinna Vinschen)
+ * convert message catalogs to UTF-8 (Werner Fink)
+ * check that the NLS path works before setting $NLSPATH.
+ * use SYSMALLOC for GLIBC (Werner Fink)
+ * use mallinfo for SYSMALLOC (Corinna Vinschen)
+ * Use mkstemp() if there for here docs (Werner Fink)
+ * Fix handling of errors and exit values in builtins (Werner Fink)
+ * Better pty name detection (Werner Fink)
+ * Enable NLS catalogs on Cygwin (Corinna Vinschen)
+ * NLSPATH handling fixes (Corinna Vinschen)
+ * Avoid infrequent exit when tcsh cd's into a non-existent directory
+ https://bugzilla.novell.com/show_bug.cgi?id=293395 (Werner Fink)
+ * Don't try to spell check full path binaries that are correct because
+ they can cause hangs when other nfs partitions are hung. (Werner Fink)
+ * Avoid nested interrupts when exiting causing history writing to fail
+ https://bugzilla.novell.com/show_bug.cgi?id=331627 (Werner Fink)
+ * Instead of giving an error or ignoring lines with missing eol at eof,
+ process them.
+ * Avoid leaking fd's in mail check (Werner Fink)
+ * Recognize i686 (Corinna Vinschen)
+ * Avoid double slashes in cdpath (Corinna Vinschen)
+ * PR/102: Complain on input files with missing trailing \n
+ * PR/104: If atime == mtime we don't have new mail.
+ * PR/113: Don't allow illegal variable names to be set.
+ * PR/112: don't set $REMOTEHOST on the local machine.
+ * Add AUTOSET_KANJI which works around the Shift-JIS encoding that
+ translates unshifted 7 bit ASCII (Werner Fink)
+ * Handle mb{r,}towc() returning 0 by setting the return value to NUL
+ (Jean-Luc Leger)
+ * PR/109: make wait interruptible (Vojtech Vitek)
+ * resource limit fixes: signed vs. unsigned, megabyte issue, doc issues
+ (Robert Byrnes)
+ * Don't echo history while history -L or history -M
+ * Check for EOS before ** from Greg Dionne
+ * Don't fork in backeval from Bryan Mason
+ * Better globstar support from Greg Dionne
+ * Error out when processing the last incomplete line instead of silently
+ ignoring it (Anders Kaseorg)
+ * Fix SEGV from echo ``
+ * Better fixes for histchars and promptchars (nargs)
+
+-------------------------------------------------------------------
Old:
----
nls-iconv
tcsh-6.15.00-fullpath.dif
tcsh-6.15.00-utf8.dif
tcsh-6.16.00-mailbox.dif
tcsh-6.17.00-longjmp.dif
tcsh-6.17.02-catalogs.patch
tcsh-6.17.02-colorls.dif
tcsh-6.17.02-history.dif
tcsh-6.17.02-kanji.dif
tcsh-6.17.02-multibyte.patch
tcsh-6.17.02-spelling.dif
tcsh-6.17.02.dif
tcsh-6.17.02.tar.bz2
New:
----
tcsh-6.17.03-colorls.dif
tcsh-6.17.06-catalogs.dif
tcsh-6.17.06-dspmbyte.dif
tcsh-6.17.06.dif
tcsh-6.17.06.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcsh.spec ++++++
--- /var/tmp/diff_new_pack.VlbzkO/_old 2011-11-21 12:52:01.000000000 +0100
+++ /var/tmp/diff_new_pack.VlbzkO/_new 2011-11-21 12:52:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package tcsh
+# spec file for package tcsh (Version 6.17.06)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,28 +24,23 @@
License: BSD3c(or similar)
Group: System/Shells
Requires: gawk textutils
+%if %suse_version > 1020
+Recommends: tcsh-lang = 6.17.06
+%endif
AutoReqProv: on
-Version: 6.17.02
-Release: 11
+Version: 6.17.06
+Release: 1
Summary: The C SHell
-Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.02.tar.bz2
-Source1: nls-iconv
+Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.06.tar.bz2
Source2: bindkey.tcsh
Source3: complete.tcsh
-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
-Patch5: tcsh-6.16.00-norm-cmd.dif
-Patch6: tcsh-6.17.02-history.dif
-Patch7: tcsh-6.15.00-blanks.dif
-Patch8: tcsh-6.15.00-fullpath.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
+Patch: tcsh-6.17.06.dif
+Patch1: tcsh-6.15.00-pipe.dif
+Patch2: tcsh-6.16.00-norm-cmd.dif
+Patch3: tcsh-6.15.00-blanks.dif
+Patch4: tcsh-6.17.03-colorls.dif
+Patch5: tcsh-6.17.06-dspmbyte.dif
+Patch6: tcsh-6.17.06-catalogs.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -62,29 +57,61 @@
Christos Zoulas <chris...@deshaw.com>
Scott Krotz <kr...@mot.com>
+%package -n tcsh-lang
+License: BSD3c(or similar)
+Summary: Languages for package tcsh
+Group: System/Localization
+Provides: tcsh-lang = %{version}
+Requires: tcsh = %{version}
+
+%description -n tcsh-lang
+Provides translations to the package tcsh
+
%prep
%setup
-%patch1 -p0 -b .spell
-%patch2 -p0 -b .utf8
-%patch3 -p0 -b .pipe
-%patch4 -p0 -b .longjmp
-%patch5 -p0 -b .normcmd
-%patch6 -p0 -b .history
+%patch1 -p0 -b .pipe
+%patch2 -p0 -b .normcmd
### 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
+### %patch3 -p0 -b .blanks
+%patch4 -p0 -b .colorls
+%patch5 -p0 -b .dspmbyte
+%patch6 -p0 -b .catalogs
%patch -b .0
- sh $RPM_SOURCE_DIR/nls-iconv
%build
+ cflags ()
+ {
+ local flag=$1; shift
+ local var=$1; shift
+ test -n "${flag}" -a -n "${var}" || return
+ case "${!var}" in
+ *${flag}*) return
+ esac
+ set -o noclobber
+ case "$flag" in
+ -Wl,*)
+ if echo 'int main () { return 0; }' | \
+ ${CC:-gcc} -Werror $flag -o /dev/null -xc - > /dev/null 2>&1 ;
then
+ eval $var=\${$var:+\$$var\ }$flag
+ fi
+ ;;
+ *)
+ if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null >
/dev/null 2>&1 ; then
+ eval $var=\${$var:+\$$var\ }$flag
+ fi
+ if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null >
/dev/null 2>&1 ; then
+ eval $var=\${$var:+\$$var\ }$flag
+ fi
+ esac
+ set +o noclobber
+ }
CC=gcc
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DBUFSIZE=8192 -pipe"
- export CC CFLAGS
+ cflags -ftree-loop-linear CFLAGS
+ cflags -Wl,-O2 LDFLAGS
+ cflags -Wl,--as-needed LDFLAGS
+ cflags -Wl,--hash-size=16699 LDFLAGS
+ export CC CFLAGS LDFLAGS
%ifarch %ix86
CPU=i586
%else
@@ -101,12 +128,10 @@
--libexecdir=/usr/%{_lib}/tcsh \
--disable-rpath \
--with-gnu-ld
- make
+ make GENCAT='/usr/bin/gencat --new'
#
# requires a working terminal on stdin
# make check
- rm -vf nls/*/set[0-9]*.*
- make catalogs
%install
rm -rf $RPM_BUILD_ROOT
@@ -120,17 +145,18 @@
ge*) nls=de ;;
gr*) nls=el ;;
it*) nls=it ;;
- ru*) nls=ru ;;
+ ru*) nls=ru_RU ;;
sp*) nls=es ;;
uk*) nls=uk_UA ;;
C) continue ;;
esac
dir=$RPM_BUILD_ROOT/usr/share/locale/${nls}/LC_MESSAGES
+ test ! -e ${dir}/tcsh || continue
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
+ make DESTDIR=$RPM_BUILD_ROOT GENCAT='/usr/bin/gencat --new' install
+ make DESTDIR=$RPM_BUILD_ROOT GENCAT='/usr/bin/gencat --new' install.man
mkdir -p $RPM_BUILD_ROOT%{_docdir}/tcsh
install -m 0444 FAQ $RPM_BUILD_ROOT%{_docdir}/tcsh/FAQ.tcsh
mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
@@ -141,6 +167,7 @@
rm -f $RPM_BUILD_ROOT/usr/bin/csh
rm -f $RPM_BUILD_ROOT/usr/bin/tcsh
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/csh.*
+ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/C
ln -sf tcsh $RPM_BUILD_ROOT/bin/csh
ln -sf tcsh.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/csh.1.gz
ln -sf ../../bin/tcsh $RPM_BUILD_ROOT/usr/bin/csh
@@ -161,6 +188,9 @@
%doc %{_docdir}/tcsh/FAQ.tcsh
%doc %{_mandir}/man1/csh.1.gz
%doc %{_mandir}/man1/tcsh.1.gz
-%{_datadir}/locale/*/LC_MESSAGES/tcsh
+
+%files -n tcsh-lang
+%defattr(-,root,root)
+%{_datadir}/locale/*/LC_MESSAGES/tcsh*
%changelog
++++++ tcsh-6.17.02-colorls.dif -> tcsh-6.17.03-colorls.dif ++++++
--- /work/SRC/openSUSE:Factory/tcsh/tcsh-6.17.02-colorls.dif 2011-09-23
12:47:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh-6.17.03-colorls.dif
2011-11-21 12:51:58.000000000 +0100
@@ -1,14 +1,23 @@
--- 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 */
++++ tw.color.c 2010-12-10 16:07:59.000000000 +0000
+@@ -89,6 +89,7 @@ static Variable variables[] = {
+ VAR(NOS, "hl", "44;37"), /* Reg file extra hard links, obsolete? */
+ VAR(NOS, "mh", "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)
+@@ -177,7 +178,7 @@ parseLS_COLORS(const Char *value)
+ size_t i, len;
+ const Char *v; /* pointer in value */
+ char *c; /* pointer in colors */
+- Extension *volatile e; /* pointer in extensions */
++ static Extension *volatile e; /* pointer in extensions */
+ jmp_buf_t osetexit;
+ size_t omark;
+
+@@ -240,13 +241,10 @@ parseLS_COLORS(const Char *value)
if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
(Char)variables[i].variable[1] == (v[1] & CHAR))
break;
@@ -25,3 +34,23 @@
}
break;
}
+@@ -301,12 +303,13 @@ print_color(const Char *fname, size_t le
+ break;
+ }
+ if (i == nvariables) {
+- for (i = 0; i < nextensions; i++)
+- if (len >= extensions[i].extension.len
+- && strncmp(last - extensions[i].extension.len,
+- extensions[i].extension.s,
+- extensions[i].extension.len) == 0) {
+- color = &extensions[i].color;
++ int j;
++ for (j = 0; j < nextensions; j++)
++ if (len >= extensions[j].extension.len
++ && strncmp(last - extensions[j].extension.len,
++ extensions[j].extension.s,
++ extensions[j].extension.len) == 0) {
++ color = &extensions[j].color;
+ break;
+ }
+ }
++++++ tcsh-6.17.06-catalogs.dif ++++++
--- sh.c
+++ sh.c 2011-11-17 08:28:47.027646998 +0000
@@ -168,8 +168,8 @@ static void st_restore (void *);
static void
add_localedir_to_nlspath(const char *path)
{
- static const char msgs_LOC[] = "/%L/LC_MESSAGES/%N.cat";
- static const char msgs_lang[] = "/%l/LC_MESSAGES/%N.cat";
+ static const char msgs_LOC[] = "/%L/LC_MESSAGES/%N";
+ static const char msgs_lang[] = "/%l/LC_MESSAGES/%N";
char *old;
char *new, *new_p;
size_t len;
@@ -181,7 +181,7 @@ add_localedir_to_nlspath(const char *pat
if (path == NULL)
return;
- (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh.cat",
+ (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh",
path);
if (stat(trypath, &st) == -1)
return;
--- nls/Makefile.in
+++ nls/Makefile.in 2011-11-17 08:27:22.856205243 +0000
@@ -15,8 +15,8 @@ localedir=${DESTDIR}@localedir@
all:
CATALOGS+=C.cat
-INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
-${localedir}/C/LC_MESSAGES/tcsh.cat: C.cat
+INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh
+${localedir}/C/LC_MESSAGES/tcsh: C.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -24,8 +24,8 @@ C.cat: ${srcdir}/C/charset ${srcdir}/C/*
cat $^ $> | $(GENCAT) $@
CATALOGS+=et.cat
-INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
-${localedir}/et/LC_MESSAGES/tcsh.cat: et.cat
+INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh
+${localedir}/et/LC_MESSAGES/tcsh: et.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -33,8 +33,8 @@ et.cat: ${srcdir}/et/charset ${srcdir}/e
cat $^ $> | $(GENCAT) $@
CATALOGS+=finnish.cat
-INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
-${localedir}/fi/LC_MESSAGES/tcsh.cat: finnish.cat
+INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh
+${localedir}/fi/LC_MESSAGES/tcsh: finnish.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -42,8 +42,8 @@ finnish.cat: ${srcdir}/finnish/charset $
cat $^ $> | $(GENCAT) $@
CATALOGS+=french.cat
-INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
-${localedir}/fr/LC_MESSAGES/tcsh.cat: french.cat
+INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh
+${localedir}/fr/LC_MESSAGES/tcsh: french.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -51,8 +51,8 @@ french.cat: ${srcdir}/french/charset ${s
cat $^ $> | $(GENCAT) $@
CATALOGS+=german.cat
-INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
-${localedir}/de/LC_MESSAGES/tcsh.cat: german.cat
+INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh
+${localedir}/de/LC_MESSAGES/tcsh: german.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -60,8 +60,8 @@ german.cat: ${srcdir}/german/charset ${s
cat $^ $> | $(GENCAT) $@
CATALOGS+=greek.cat
-INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
-${localedir}/gr/LC_MESSAGES/tcsh.cat: greek.cat
+INSTALLED+=${localedir}/el/LC_MESSAGES/tcsh
+${localedir}/el/LC_MESSAGES/tcsh: greek.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -69,8 +69,8 @@ greek.cat: ${srcdir}/greek/charset ${src
cat $^ $> | $(GENCAT) $@
CATALOGS+=italian.cat
-INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
-${localedir}/it/LC_MESSAGES/tcsh.cat: italian.cat
+INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh
+${localedir}/it/LC_MESSAGES/tcsh: italian.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -78,8 +78,8 @@ italian.cat: ${srcdir}/italian/charset $
cat $^ $> | $(GENCAT) $@
CATALOGS+=ja.cat
-INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
-${localedir}/ja/LC_MESSAGES/tcsh.cat: ja.cat
+INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh
+${localedir}/ja/LC_MESSAGES/tcsh: ja.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -87,8 +87,8 @@ ja.cat: ${srcdir}/ja/charset ${srcdir}/j
cat $^ $> | $(GENCAT) $@
CATALOGS+=pl.cat
-INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
-${localedir}/pl/LC_MESSAGES/tcsh.cat: pl.cat
+INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh
+${localedir}/pl/LC_MESSAGES/tcsh: pl.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -96,8 +96,8 @@ pl.cat: ${srcdir}/pl/charset ${srcdir}/p
cat $^ $> | $(GENCAT) $@
CATALOGS+=russian.cat
-INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
-${localedir}/ru/LC_MESSAGES/tcsh.cat: russian.cat
+INSTALLED+=${localedir}/ru_RU/LC_MESSAGES/tcsh
+${localedir}/ru_RU/LC_MESSAGES/tcsh: russian.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -105,8 +105,8 @@ russian.cat: ${srcdir}/russian/charset $
cat $^ $> | $(GENCAT) $@
CATALOGS+=spanish.cat
-INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
-${localedir}/es/LC_MESSAGES/tcsh.cat: spanish.cat
+INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh
+${localedir}/es/LC_MESSAGES/tcsh: spanish.cat
mkdir -p $(@D)
$(INSTALL) $< $@
@@ -114,8 +114,8 @@ spanish.cat: ${srcdir}/spanish/charset $
cat $^ $> | $(GENCAT) $@
CATALOGS+=ukrainian.cat
-INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
-${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat: ukrainian.cat
+INSTALLED+=${localedir}/uk_UA/LC_MESSAGES/tcsh
+${localedir}/uk_UA/LC_MESSAGES/tcsh: ukrainian.cat
mkdir -p $(@D)
$(INSTALL) $< $@
++++++ tcsh-6.17.06-dspmbyte.dif ++++++
--- sh.c
+++ sh.c 2010-12-10 16:10:45.000000000 +0000
@@ -847,9 +847,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))
#else
- if ((tcp = getenv("LANG")) != NULL && !adrof(CHECK_MBYTEVAR))
+ if ((tcp = getenv("LANG")) != NULL)
#endif
{
autoset_dspmbyte(str2short(tcp));
--- sh.func.c
+++ sh.func.c 2010-12-09 09:15:06.000000000 +0000
@@ -1406,14 +1406,6 @@ dosetenv(Char **v, struct command *c)
}
#endif /* apollo */
- /* dspkanji/dspmbyte autosetting */
- /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */
-#if defined(DSPMBYTE)
- if(eq(vp, STRLANG) && !adrof(CHECK_MBYTEVAR)) {
- autoset_dspmbyte(lp);
- }
-#endif
-
if (islocale_var(vp)) {
#ifdef NLS
int k;
@@ -1438,6 +1430,13 @@ dosetenv(Char **v, struct command *c)
nlsclose();
nlsinit();
# endif /* NLS_CATALOGS */
+# if defined(DSPMBYTE)
+ /* dspkanji/dspmbyte autosetting */
+ /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */
+ if (eq(vp, STRLANG)) {
+ autoset_dspmbyte(lp);
+ }
+# endif
# ifdef SETLOCALEBUG
dont_free = 0;
# endif /* SETLOCALEBUG */
--- sh.set.c
+++ sh.set.c 2010-12-09 11:07:56.000000000 +0000
@@ -1119,11 +1119,11 @@ update_dspmbyte_vars(void)
dstr1 = vp->vec[0];
if(eq (dstr1, STRsjis))
iskcode = 1;
- else if (eq(dstr1, STReuc))
+ else if (eq(dstr1, STReuc) || eq(dstr1, STReucjp) || eq(dstr1,
STRGB2312))
iskcode = 2;
else if (eq(dstr1, STRbig5))
iskcode = 3;
- else if (eq(dstr1, STRutf8))
+ else if (eq(dstr1, STRutf8) || eq(dstr1, STRutfx8))
iskcode = 4;
else if ((dstr1[0] - '0') >= 0 && (dstr1[0] - '0') <= 3) {
iskcode = 0;
@@ -1207,7 +1207,7 @@ update_dspmbyte_vars(void)
_enable_mbdisp = 0;
dspmbyte_ls = 0;
}
-#ifdef MBYTEDEBUG /* Sorry, use for beta testing */
+# ifdef MBYTEDEBUG /* Sorry, use for beta testing */
{
Char mbmapstr[300];
for (lp = 0; lp < 256; lp++)
@@ -1215,7 +1215,7 @@ update_dspmbyte_vars(void)
mbmapstr[lp] = 0;
setcopy(STRmbytemap, mbmapstr, VAR_READWRITE);
}
-#endif /* MBYTEMAP */
+# endif /* MBYTEMAP */
}
/* dspkanji/dspmbyte autosetting */
@@ -1224,6 +1224,7 @@ void
autoset_dspmbyte(const Char *pcp)
{
int i;
+ struct varent *vp;
static const struct dspm_autoset_Table {
Char *n;
Char *v;
@@ -1246,13 +1247,18 @@ autoset_dspmbyte(const Char *pcp)
#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
static const struct dspm_autoset_Table dspmc[] = {
{ STRstarutfstar8, STRutf8 },
+ { STRutfx8, STRutf8 },
{ STReuc, STReuc },
+ { STReucjp, STReuc },
{ STRGB2312, STReuc },
{ STRLANGBIG5, STRbig5 },
{ NULL, NULL }
};
Char *codeset;
+ if ((vp = adrof(CHECK_MBYTEVAR)))
+ unsetv1(vp);
+
codeset = str2short(nl_langinfo(CODESET));
if (*codeset != '\0') {
for (i = 0; dspmc[i].n; i++) {
--- tc.const.c
+++ tc.const.c 2006-04-25 12:58:31.000000000 +0000
@@ -130,10 +130,12 @@ Char STRmmliteral[] = { '-', 'G', '\0' }
Char STRmmliteral[] = { '-', '-', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\0' };
# endif
Char STReuc[] = { 'e', 'u', 'c', '\0' };
+Char STReucjp[] = { 'e', 'u', 'c', '-', 'j', 'p', '\0' };
Char STRsjis[] = { 's', 'j', 'i', 's', '\0' };
Char STRbig5[] = { 'b', 'i', 'g', '5', '\0' };
Char STRutf8[] = { 'u', 't', 'f', '8', '\0' };
Char STRstarutfstar8[] = { '*', 'u', 't', 'f', '*', '8', '\0' };
+Char STRutfx8[] = { 'u', 't', 'f', '-', '8', '\0' };
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' };
@@ -437,7 +439,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' };
-Char STRLC_ALL[] = { 'L', 'C', '_', 'A', 'L', 'L', '\0' };
+Char STRLC_ALL[] = { 'L', 'C', '_', 'A', 'L', 'L', '\0' };
Char STRLC_CTYPE[] = { 'L', 'C', '_', 'C', 'T', 'Y', 'P', 'E' ,'\0' };
Char STRLC_NUMERIC[] = { 'L', 'C', '_', 'N', 'U', 'M', 'E', 'R', 'I',
'C', '\0' };
++++++ tcsh-6.15.00-fullpath.dif -> tcsh-6.17.06.dif ++++++
--- /work/SRC/openSUSE:Factory/tcsh/tcsh-6.15.00-fullpath.dif 2011-09-23
12:47:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh-6.17.06.dif 2011-11-21
12:51:58.000000000 +0100
@@ -1,22 +1,245 @@
---- tw.parse.c
-+++ tw.parse.c 2008-11-26 17:52:07.190195106 +0000
-@@ -347,9 +347,19 @@ tenematch(Char *inputline, int num_read,
- goto end;
- }
- }
+--- Makefile.in
++++ Makefile.in 2011-11-16 12:12:02.000000000 +0000
+@@ -599,7 +599,6 @@ install: tcsh$(EXEEXT) install.catalogs
+ -mkdir -p ${DESTBIN}
+ -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old
+ cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
+- -strip ${DESTBIN}/tcsh$(EXEEXT)
+ chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
+
+ install.catalogs:
+--- config/linux
++++ config/linux 2011-11-16 12:15:09.000000000 +0000
+@@ -132,4 +132,11 @@
+ # define POSIX
+ #endif
+
++#if !defined(PW_SHADOW)
++# define PW_SHADOW
++#endif
++#if !defined(SuSE)
++# define SuSE
++#endif
+
- Strbuf_append(&wordbuf, qline.s + wordp);
- Strbuf_terminate(&wordbuf);
- cleanup_push(&wordbuf, Strbuf_cleanup);
+ #endif /* _h_config */
+--- config_f.h
++++ config_f.h 2011-11-16 12:17:18.000000000 +0000
+@@ -37,7 +37,7 @@
+ */
+ #ifndef _h_config_f
+ #define _h_config_f
+-
++#include <features.h>
+ /*
+ * SHORT_STRINGS Use at least 16 bit characters instead of 8 bit chars
+ * This fixes up quoting problems and eases implementation
+@@ -60,7 +60,12 @@
+ /*
+ * LOGINFIRST Source ~/.login before ~/.cshrc
+ */
+-#undef LOGINFIRST
++#define LOGINFIRST
+
-+ if ((looking == TW_COMMAND) && (*wordbuf.s == '/')) {
-+ if (executable((Char*)0, wordbuf.s, 0)) {
-+ cleanup_until(&wordbuf);
-+ search_ret = 0;
-+ goto end;
-+ }
-+ }
++/*
++ * USERLOGINFIRST Source ~/.login before ~/.cshrc
++ */
++#undef USERLOGINFIRST
+
+ /*
+ * VIDEFAULT Make the VI mode editor the default
+@@ -154,7 +159,7 @@
+ * successful, set $REMOTEHOST to the name or address of the
+ * host
+ */
+-#define REMOTEHOST
++#undef REMOTEHOST
+
+ /*
+ * COLOR_LS_F Do you want to use builtin color ls-F ?
+@@ -177,7 +182,7 @@
+ * RCSID This defines if we want rcs strings in the binary or not
+ *
+ */
+-#if !defined(lint) && !defined(SABER) && !defined(__CLCC__)
++#if !defined(lint) && !defined(SABER) && !defined(__CLCC__) &&
!defined(__linux__)
+ # ifndef __GNUC__
+ # define RCSID(id) static char *rcsid = (id);
+ # else
+--- configure
++++ configure 2011-11-16 10:49:20.000000000 +0000
+@@ -3794,7 +3794,7 @@ return tgetent ();
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' termlib termcap curses ncurses; do
++for ac_lib in '' termlib termcap tinfo curses ncurses; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+--- configure.in
++++ configure.in 2011-11-16 10:49:09.000000000 +0000
+@@ -298,7 +298,7 @@ fi
+ dnl Checks for libraries
+ AC_SEARCH_LIBS(crypt, crypt)
+ AC_SEARCH_LIBS(getspnam, sec)
+-AC_SEARCH_LIBS(tgetent, termlib termcap curses ncurses)
++AC_SEARCH_LIBS(tgetent, termlib termcap tinfo curses ncurses)
+ AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_SEARCH_LIBS(connect, socket)
+ AC_SEARCH_LIBS(catgets, catgets)
+--- glob.h
++++ glob.h 2006-04-25 12:58:31.000000000 +0000
+@@ -72,6 +72,7 @@ typedef struct {
+ #define GLOB_NOSYS (-4) /* Implementation does not support
function. */
+
+ /* #if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE) */
++#if (!defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _BSD_SOURCE
|| defined _GNU_SOURCE)
+ #define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory
funcs. */
+ #define GLOB_BRACE 0x0080 /* Expand braces ala csh. */
+ #define GLOB_MAGCHAR 0x0100 /* Pattern had globbing characters. */
+@@ -84,7 +85,7 @@ typedef struct {
+ #define GLOB_DOT 0x8000 /* don't skip dotfiles (except . and
..) */
+
+ #define GLOB_ABEND GLOB_ABORTED /* source compatibility */
+-/* #endif */
++#endif
+
+ int glob (const char *, int, int (*)(const char *, int), glob_t *);
+ void globfree (glob_t *);
+--- pathnames.h
++++ pathnames.h 2006-04-25 12:58:31.000000000 +0000
+@@ -84,7 +84,7 @@
+ # endif /* !_PATH_DOTLOGIN */
+ #endif /* sgi || OREO || cray || AMIX || CDC */
+
+-#if (defined(_CRAYCOM) || defined(Lynx)) && !defined(_PATH_TCSHELL)
++#if (defined(_CRAYCOM) || defined(Lynx) || defined(linux)) &&
!defined(_PATH_TCSHELL)
+ # define _PATH_TCSHELL "/bin/tcsh" /* 1st class
shell */
+ #endif /* _CRAYCOM && !_PATH_TCSHELL */
+
+--- sh.c
++++ sh.c 2010-12-10 16:10:45.000000000 +0000
+@@ -1353,6 +1353,9 @@ main(int argc, char **argv)
+ setintr = osetintr;
+ parintr = oparintr;
+ }
++#ifndef USERLOGINFIRST
++# undef LOGINFIRST
++#endif
+ #ifdef LOGINFIRST
+ if (loginsh)
+ (void) srccat(varval(STRhome), STRsldotlogin);
+--- tc.alloc.c
++++ tc.alloc.c 2006-04-25 12:58:31.000000000 +0000
+@@ -489,7 +489,7 @@ smalloc(size_t n)
+ {
+ ptr_t ptr;
+
+- n = n ? n : 1;
++ n = n ? n+1 : 1;
+
+ #ifdef HAVE_SBRK
+ if (membot == NULL)
+@@ -512,7 +512,7 @@ srealloc(ptr_t p, size_t n)
+ {
+ ptr_t ptr;
+
+- n = n ? n : 1;
++ n = n ? n+1 : 1;
+
+ #ifdef HAVE_SBRK
+ if (membot == NULL)
+@@ -536,7 +536,7 @@ scalloc(size_t s, size_t n)
+ ptr_t ptr;
+
+ n *= s;
+- n = n ? n : 1;
++ n = n ? n+1 : 1;
+
+ #ifdef HAVE_SBRK
+ if (membot == NULL)
+@@ -561,8 +561,10 @@ scalloc(size_t s, size_t n)
+ void
+ sfree(ptr_t p)
+ {
+- if (p && !dont_free)
++ if (p && !dont_free) {
+ free(p);
++ p = (ptr_t)NULL;
++ }
+ }
+
+ #endif /* SYSMALLOC */
+--- tc.func.c
++++ tc.func.c 2007-07-13 11:15:03.000000000 +0000
+@@ -689,9 +689,13 @@ auto_lock(void)
+ handle_pending_signals();
+ errno = 0;
+ }
+- if (spw != NULL) /* shadowed passwd */
++ if (spw != NULL) /* shadowed passwd */
+ srpp = spw->sp_pwdp;
++ else
++ srpp = pw->pw_passwd; /* nis extended passwd? */
+ }
++ endspent();
++ endpwent();
+
+ #else
+
+@@ -1905,7 +1909,7 @@ getremotehost(int dest_fd)
+ * have not caught up yet.
+ */
+ addr.s_addr = inet_addr(name);
+- if (addr.s_addr != (unsigned int)~0)
++ if (addr.s_addr != ~0U)
+ host = name;
+ else {
+ if (sptr != name) {
+--- tc.str.c
++++ tc.str.c 2006-04-25 12:58:31.000000000 +0000
+@@ -336,7 +336,7 @@ s_strlen(const Char *str)
+ {
+ size_t n;
+
+- for (n = 0; *str++; n++)
++ for (n = 0; str && *str; n++, str++)
+ continue;
+ return (n);
+ }
+--- tc.who.c
++++ tc.who.c 2006-04-25 12:58:31.000000000 +0000
+@@ -260,6 +260,9 @@ watch_login(int force)
+ }
+ stlast = sta.st_mtime;
+ #ifdef HAVE_GETUTENT
++# ifndef HAVE_UTMPX_H
++ utmpname( _PATH_UTMP );
++# endif
+ setutent();
+ #else
+ if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
+--- tcsh.man
++++ tcsh.man 2006-04-25 12:58:31.000000000 +0000
+@@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a
+ changes to the next previous word etc., skipping identical matches
+ much like \fIhistory-search-backward\fR does.
+ .TP 8
+-.B delete-char \fR(not bound)
++.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR)
+ Deletes the character under the cursor.
+ See also \fIdelete-char-or-list-or-eof\fR.
+ .TP 8
+--- tw.h
++++ tw.h 2006-04-25 12:58:31.000000000 +0000
+@@ -33,6 +33,10 @@
+ #ifndef _h_tw
+ #define _h_tw
+
++#ifndef _h_sh
++# include "sh.h"
++#endif
+
- search_ret = spell_me(&wordbuf, looking, pat, suf);
- qline.len = wordp;
- Strbuf_append(&qline, wordbuf.s);
+ #define TW_PATH 0x1000
+ #define TW_ZERO 0x0fff
+
++++++ tcsh-6.17.02.tar.bz2 -> tcsh-6.17.06.tar.bz2 ++++++
++++ 17661 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
