Dr. Werner Fink 2012-01-10 17:37:30 +00:00 committed by Git OBS Bridge
parent dfe87a99d0
commit 631a12b3e5
6 changed files with 117 additions and 51 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3b07178731ebd262a8e38165795eb997b24c39008e15227fee34e999f17e406
size 764795

View File

@ -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

View File

@ -208,11 +208,63 @@
return (n);
}
--- tc.who.c
+++ tc.who.c 2006-04-25 12:58:31.000000000 +0000
@@ -260,6 +260,9 @@ watch_login(int force)
+++ tc.who.c 2012-01-10 16:58:02.683145222 +0000
@@ -68,30 +68,34 @@ RCSID("$tcsh: tc.who.c,v 3.53 2011/12/30
# endif /* __UTMPX_FILE && !UTMPX_FILE */
# if defined(TCSH_PATH_UTMP) || !defined(HAVE_UTMP_H)
# define utmp utmpx
+# define TCSH_USE_UTMPX
# if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
# define getutent getutxent
# define setutent setutxent
# define endutent endutxent
# endif /* HAVE_GETUTENT || HAVE_GETUTXENT */
-# else
-# ifdef HAVE_UTMP_H
-# include <utmp.h>
-# endif /* WINNT_NATIVE */
-# endif /* TCSH_PATH_UTMP */
-#else /* !HAVE_UTMPX_H */
-# ifdef HAVE_UTMP_H
-# include <utmp.h>
-# endif /* WINNT_NATIVE */
+# if defined(HAVE_STRUCT_UTMPX_UT_TV)
+# define ut_time ut_tv.tv_sec
+# elif defined(HAVE_STRUCT_UTMPX_UT_XTIME)
+# define ut_time ut_xtime
+# endif
+# if defined(HAVE_STRUCT_UTMPX_UT_USER)
+# define ut_name ut_user
+# endif
+# endif /* TCSH_PATH_UTMP || !HAVE_UTMP_H */
#endif /* HAVE_UTMPX_H */
-#if defined(HAVE_STRUCT_UTMP_UT_TV) || defined(HAVE_STRUCT_UTMPX_UT_TV)
-# define ut_time ut_tv.tv_sec
-#elif defined(HAVE_STRUCT_UTMP_UT_XTIME) || defined(HAVE_STRUCT_UTMPX_UT_XTIME)
-# define ut_time ut_xtime
-#endif
-#if defined(HAVE_STRUCT_UTMP_UT_USER) || defined(HAVE_STRUCT_UTMPX_UT_USER)
-# define ut_name ut_user
-#endif
+#if !defined(TCSH_USE_UTMPX) && defined(HAVE_UTMP_X)
+# include <utmp.h>
+# if defined(HAVE_STRUCT_UTMP_UT_TV)
+# define ut_time ut_tv.tv_sec
+# elif defined(HAVE_STRUCT_UTMP_UT_XTIME)
+# define ut_time ut_xtime
+# endif
+# if defined(HAVE_STRUCT_UTMP_UT_USER)
+# define ut_name ut_user
+# endif
+#endif /* !TCSH_USE_UTMPX && HAVE_UTMP_H */
#if defined(HAVE_UTMP_H) && !defined(HAVE_UTMPX_H)
# ifndef BROKEN_CC
@@ -273,6 +277,9 @@ watch_login(int force)
}
stlast = sta.st_mtime;
#ifdef HAVE_GETUTENT
#if defined(HAVE_GETUTENT) || defined(HAVE_GETUTXENT)
+# ifndef HAVE_UTMPX_H
+ utmpname( _PATH_UTMP );
+# endif

3
tcsh-6.17.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9808197200e2cd281b8229ac6555c4c17e0743c055643cb51f91bc0826881c3a
size 769244

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Jan 10 17:35:26 UTC 2012 - werner@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.
-------------------------------------------------------------------
Fri Nov 18 13:26:08 UTC 2011 - werner@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package tcsh (Version 6.17.06)
# spec file for package tcsh (Version 6.17.10)
#
# 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 @@ License: BSD-3-Clause
Group: System/Shells
Requires: gawk textutils
%if %suse_version > 1020
Recommends: tcsh-lang = 6.17.06
Recommends: tcsh-lang = 6.17.10
%endif
AutoReqProv: on
Version: 6.17.06
Version: 6.17.10
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.17.10.tar.bz2
Source2: bindkey.tcsh
Source3: complete.tcsh
Patch: tcsh-6.17.06.dif
Patch: tcsh-6.17.10.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 @@ Provides translations to the package tcsh
--libexecdir=/usr/%{_lib}/tcsh \
--disable-rpath \
--with-gnu-ld
make GENCAT='/usr/bin/gencat --new'
make
#
# requires a working terminal on stdin
# make check