Hello community,
here is the log from the commit of package tcsh for openSUSE:Factory checked in
at 2012-01-17 11:35:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-21
12:51:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh.changes 2012-01-17
16:16:15.000000000 +0100
@@ -1,0 +2,33 @@
+Mon Jan 16 10:30:08 UTC 2012 - wer...@suse.de
+
+- Update to tcsh ifinal version V6.18.00
+ * remove unused variables.
+ * Make gethost use definitions for x __x__ and __x automatically.
+ * More utmp fixes
+
+-------------------------------------------------------------------
+Tue Jan 10 17:35:26 UTC 2012 - wer...@suse.de
+
+- Update to tcsh minor version V6.17.10
+ * Add more FreeBSD/NetBSD machines
+ * Add portability wrapper for gencat
+ * Fix warning for write in SYSMALLOC systems.
+ * revert gencat handling to pre-cygwin fixes (without the env settings)
+ * remove stray endutent()
+ * Remove - from gencat
+ * Provide support for malloc_usable_size() so that linux works again
+ without SYSMALLOC
+ * Add support for FreeBSD's utmpx.
+ * Fix debian bug #645238: tcsh segfaults when prompt includes %j and
+ there are more than 10 jobs.
+ * PR/155: Default $anyerror to set for backward compatibility
+ * PR/149: Don't print -1 in %j (Vojtech Vitek)
+ * handle -- on chdir commands as the end of options processing so that
+ they can process a directory like -x without resorting to ./-x
+ (Andrew Stevenson)
+ * Handle write(2) returning ENOENT from SoFS, thanks ++HAL (Robert Byrnes)
+ * PR/38: Null check for jobs (Kurt Miller)
+ * Fix spelling correction correcting ./foo -> ../foo2 (jean-luc leger)
+ * PR/120: string0 in filetest does not have enough space.
+
+-------------------------------------------------------------------
Old:
----
tcsh-6.17.06-catalogs.dif
tcsh-6.17.06.dif
tcsh-6.17.06.tar.bz2
New:
----
tcsh-6.17.10-catalogs.dif
tcsh-6.18.00.dif
tcsh-6.18.00.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcsh.spec ++++++
--- /var/tmp/diff_new_pack.oqhOHm/_old 2012-01-17 16:16:18.000000000 +0100
+++ /var/tmp/diff_new_pack.oqhOHm/_new 2012-01-17 16:16:18.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package tcsh (Version 6.17.06)
+# spec file for package tcsh (Version 6.18.00)
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,22 +25,22 @@
Group: System/Shells
Requires: gawk textutils
%if %suse_version > 1020
-Recommends: tcsh-lang = 6.17.06
+Recommends: tcsh-lang = 6.18.00
%endif
AutoReqProv: on
-Version: 6.17.06
+Version: 6.18.00
Release: 1
Summary: The C SHell
-Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.06.tar.bz2
+Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.00.tar.gz
Source2: bindkey.tcsh
Source3: complete.tcsh
-Patch: tcsh-6.17.06.dif
+Patch: tcsh-6.18.00.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
+Patch6: tcsh-6.17.10-catalogs.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -128,7 +128,7 @@
--libexecdir=/usr/%{_lib}/tcsh \
--disable-rpath \
--with-gnu-ld
- make GENCAT='/usr/bin/gencat --new'
+ make
#
# requires a working terminal on stdin
# make check
++++++ tcsh-6.17.06-catalogs.dif -> tcsh-6.17.10-catalogs.dif ++++++
--- /work/SRC/openSUSE:Factory/tcsh/tcsh-6.17.06-catalogs.dif 2011-11-21
12:51:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh-6.17.10-catalogs.dif
2012-01-17 16:16:15.000000000 +0100
@@ -21,11 +21,11 @@
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:
++++ nls/Makefile.in 2012-01-10 16:53:02.899145576 +0000
+@@ -16,96 +16,96 @@ CATGEN= ${srcdir}/catgen
+
+ all: ${CATALOGS}
- CATALOGS+=C.cat
-INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
-${localedir}/C/LC_MESSAGES/tcsh.cat: C.cat
+INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh
@@ -33,10 +33,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -24,8 +24,8 @@ C.cat: ${srcdir}/C/charset ${srcdir}/C/*
- cat $^ $> | $(GENCAT) $@
+ C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
+ @${CATGEN} $(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
@@ -44,10 +43,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -33,8 +33,8 @@ et.cat: ${srcdir}/et/charset ${srcdir}/e
- cat $^ $> | $(GENCAT) $@
+ et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
+ @${CATGEN} $(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
@@ -55,10 +53,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -42,8 +42,8 @@ finnish.cat: ${srcdir}/finnish/charset $
- cat $^ $> | $(GENCAT) $@
+ finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
+ @${CATGEN} $(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
@@ -66,10 +63,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -51,8 +51,8 @@ french.cat: ${srcdir}/french/charset ${s
- cat $^ $> | $(GENCAT) $@
+ french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
+ @${CATGEN} $(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
@@ -77,10 +73,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -60,8 +60,8 @@ german.cat: ${srcdir}/german/charset ${s
- cat $^ $> | $(GENCAT) $@
+ german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
+ @${CATGEN} $(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
@@ -88,10 +83,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -69,8 +69,8 @@ greek.cat: ${srcdir}/greek/charset ${src
- cat $^ $> | $(GENCAT) $@
+ greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
+ @${CATGEN} $(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
@@ -99,10 +93,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -78,8 +78,8 @@ italian.cat: ${srcdir}/italian/charset $
- cat $^ $> | $(GENCAT) $@
+ italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
+ @${CATGEN} $(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
@@ -110,10 +103,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -87,8 +87,8 @@ ja.cat: ${srcdir}/ja/charset ${srcdir}/j
- cat $^ $> | $(GENCAT) $@
+ ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
+ @${CATGEN} $(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
@@ -121,10 +113,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -96,8 +96,8 @@ pl.cat: ${srcdir}/pl/charset ${srcdir}/p
- cat $^ $> | $(GENCAT) $@
+ pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
+ @${CATGEN} $(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
@@ -132,10 +123,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -105,8 +105,8 @@ russian.cat: ${srcdir}/russian/charset $
- cat $^ $> | $(GENCAT) $@
+ russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
+ @${CATGEN} $(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
@@ -143,10 +133,9 @@
mkdir -p $(@D)
$(INSTALL) $< $@
-@@ -114,8 +114,8 @@ spanish.cat: ${srcdir}/spanish/charset $
- cat $^ $> | $(GENCAT) $@
+ spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
+ @${CATGEN} $(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
++++++ tcsh-6.17.06-catalogs.dif -> tcsh-6.18.00.dif ++++++
--- /work/SRC/openSUSE:Factory/tcsh/tcsh-6.17.06-catalogs.dif 2011-11-21
12:51:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tcsh.new/tcsh-6.18.00.dif 2012-01-17
16:16:15.000000000 +0100
@@ -1,156 +1,245 @@
+--- 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
++
+ #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
++
++/*
++ * 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 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)
++++ 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)
{
-- 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) $< $@
+ 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 2012-01-16 09:55:14.275144702 +0000
+@@ -277,6 +277,9 @@ watch_login(int force)
+ }
+ stlast = sta.st_mtime;
+ #if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
++# 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
++
+ #define TW_PATH 0x1000
+ #define TW_ZERO 0x0fff
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
