Dr. Werner Fink 2012-01-16 13:43:34 +00:00 committed by Git OBS Bridge
parent 631a12b3e5
commit 7eefd1666f
5 changed files with 18 additions and 62 deletions

View File

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

View File

@ -208,60 +208,8 @@
return (n);
}
--- tc.who.c
+++ 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)
+++ 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)

3
tcsh-6.18.00.tar.gz Normal file
View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jan 16 10:30:08 UTC 2012 - werner@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 - werner@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package tcsh (Version 6.17.10)
# spec file for package tcsh (Version 6.18.00)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -25,16 +25,16 @@ License: BSD-3-Clause
Group: System/Shells
Requires: gawk textutils
%if %suse_version > 1020
Recommends: tcsh-lang = 6.17.10
Recommends: tcsh-lang = 6.18.00
%endif
AutoReqProv: on
Version: 6.17.10
Version: 6.18.00
Release: 1
Summary: The C SHell
Source: ftp.astron.com:/pub/tcsh/tcsh-6.17.10.tar.bz2
Source: ftp.astron.com:/pub/tcsh/tcsh-6.18.00.tar.gz
Source2: bindkey.tcsh
Source3: complete.tcsh
Patch: tcsh-6.17.10.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