[packages/tcsh] - updated to 6.20.00
hawk
hawk at pld-linux.org
Fri Jan 12 18:52:18 CET 2018
commit 58d3c43384006d9ef0cc217530f9a9db957aab53
Author: Marcin Krol <hawk at tld-linux.org>
Date: Fri Jan 12 17:51:23 2018 +0000
- updated to 6.20.00
tcsh-format-security.patch | 7 +++---
tcsh-misc.patch | 47 ++++++++++++++++++-----------------
tcsh-no-timestamp-history.patch | 11 +++++----
tcsh-no_TERMCAP.patch | 55 +++++++++++++++++++++++------------------
tcsh-rlimit_locks.patch | 32 +++++++++++++-----------
tcsh-termios.patch | 7 +++---
tcsh-time.patch | 7 +++---
tcsh.spec | 9 +++----
8 files changed, 95 insertions(+), 80 deletions(-)
---
diff --git a/tcsh.spec b/tcsh.spec
index 004c327..87d573d 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -16,12 +16,12 @@ Summary(ru.UTF-8): Улучшеная версия csh
Summary(tr.UTF-8): Gelişmiş c-kabuğu (c-shell)
Summary(uk.UTF-8): Покращена верся csh
Name: tcsh
-Version: 6.18.01
-Release: 5
+Version: 6.20.00
+Release: 1
License: distributable
Group: Applications/Shells
Source0: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.tar.gz
-# Source0-md5: 6eed09dbd4223ab5b6955378450d228a
+# Source0-md5: 59d40ef40a68e790d95e182069431834
Source1: csh.cshrc
Source2: csh.login
Source3: %{name}-skel-.login
@@ -124,7 +124,6 @@ W tym pakiecie jest statycznie skonsolidowany tcsh.
%patch6 -p1
%build
-mkdir m4
cp /usr/share/automake/config.sub .
%{__aclocal}
%{__autoconf}
@@ -151,7 +150,7 @@ install -d $RPM_BUILD_ROOT/etc/skel
# fix lang code
%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{gr,el}
# it's Ukrainian in UTF-8, not Russian in KOI8-U
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{ru_UA.koi8u,uk}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{ru_UA,uk}
%if %{with static}
install tcsh.static $RPM_BUILD_ROOT%{_bindir}
diff --git a/tcsh-format-security.patch b/tcsh-format-security.patch
index 0743798..b0d0bbc 100644
--- a/tcsh-format-security.patch
+++ b/tcsh-format-security.patch
@@ -1,6 +1,7 @@
---- tcsh-6.18.01/sh.func.c.formatsec 2013-02-13 22:26:11.659476651 +0100
-+++ tcsh-6.18.01/sh.func.c 2013-02-13 22:28:13.118818644 +0100
-@@ -2317,7 +2317,7 @@ setlim(struct limits *lp, int hard, RLIM
+diff -urNpa tcsh-6.20.00.orig/sh.func.c tcsh-6.20.00/sh.func.c
+--- tcsh-6.20.00.orig/sh.func.c 2018-01-12 17:44:47.000000000 +0000
++++ tcsh-6.20.00/sh.func.c 2018-01-12 17:47:14.904085948 +0000
+@@ -2358,7 +2358,7 @@ setlim(struct limits *lp, int hard, RLIM
if (setrlimit(lp->limconst, &rlim) < 0) {
if ( ( lp->limconst == RLIMIT_LOCKS ) &&
( errno == EINVAL ) ) {
diff --git a/tcsh-misc.patch b/tcsh-misc.patch
index 549b478..2acb4cc 100644
--- a/tcsh-misc.patch
+++ b/tcsh-misc.patch
@@ -1,19 +1,7 @@
---- tcsh-6.13.00/Makefile.in.orig 2003-03-12 20:14:50.000000000 +0100
-+++ tcsh-6.13.00/Makefile.in 2004-09-05 10:55:21.588461016 +0200
-@@ -136,8 +136,8 @@
- #DFLAGS=
- #DFLAGS=-D_PATH_TCSHELL='"${DESTBIN}/tcsh"'
- ## The following is set by autoconf.
--DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
--
-+#DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
-+DFLAGS = @DFLAGS@ @CPPFLAGS@
-
- ################################################################
- ## LDFLAGS. Define something here if you need to
---- tcsh-6.08.01.orig/config_f.h
-+++ tcsh-6.08.01/config_f.h
-@@ -80,7 +80,7 @@
+diff -urNpa tcsh-6.20.00.orig/config_f.h tcsh-6.20.00/config_f.h
+--- tcsh-6.20.00.orig/config_f.h 2016-04-16 15:44:18.000000000 +0000
++++ tcsh-6.20.00/config_f.h 2018-01-12 17:38:56.030115683 +0000
+@@ -74,7 +74,7 @@
/*
* KAI use "bye" command and rename "log" to "watchlog"
*/
@@ -22,7 +10,7 @@
/*
* TESLA drops DTR on logout. Historical note:
-@@ -92,12 +92,12 @@
+@@ -86,12 +86,12 @@
/*
* DOTLAST put "." last in the default path, for security reasons
*/
@@ -37,7 +25,7 @@
/*
* AUTOLOGOUT tries to determine if it should set autologout depending
-@@ -136,7 +136,7 @@
+@@ -132,7 +132,7 @@
/*
* NEWGRP Provide a newgrp builtin.
*/
@@ -46,9 +34,24 @@
/*
* SYSMALLOC Use the system provided version of malloc and friends.
---- tcsh-6.08.01.orig/tcsh.man
-+++ tcsh-6.08.01/tcsh.man
-@@ -560,7 +560,7 @@
+diff -urNpa tcsh-6.20.00.orig/Makefile.in tcsh-6.20.00/Makefile.in
+--- tcsh-6.20.00.orig/Makefile.in 2015-08-24 20:09:04.000000000 +0000
++++ tcsh-6.20.00/Makefile.in 2018-01-12 17:38:56.030115683 +0000
+@@ -144,8 +144,8 @@ CFLAGS = @CFLAGS@
+ #DFLAGS=
+ #DFLAGS=-D_PATH_TCSHELL='"${DESTBIN}/tcsh"'
+ ## The following is set by autoconf.
+-DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
+-
++#DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @DFLAGS@ @CPPFLAGS@
++DFLAGS = @DFLAGS@ @CPPFLAGS@
+
+ ################################################################
+ ## LDFLAGS. Define something here if you need to
+diff -urNpa tcsh-6.20.00.orig/tcsh.man tcsh-6.20.00/tcsh.man
+--- tcsh-6.20.00.orig/tcsh.man 2016-11-24 15:04:52.000000000 +0000
++++ tcsh-6.20.00/tcsh.man 2018-01-12 17:38:56.031115683 +0000
+@@ -603,7 +603,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
@@ -56,4 +59,4 @@
+.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
+ Cursor behavior modified by \fBvimode\fR.
diff --git a/tcsh-no-timestamp-history.patch b/tcsh-no-timestamp-history.patch
index 39b07d1..c650411 100644
--- a/tcsh-no-timestamp-history.patch
+++ b/tcsh-no-timestamp-history.patch
@@ -1,9 +1,10 @@
---- tcsh-6.09.00/sh.hist.c~ Sat Feb 6 16:01:23 1999
-+++ tcsh-6.09.00/sh.hist.c Mon May 29 21:59:45 2000
-@@ -396,7 +396,7 @@
- Char *snum;
- int fp, ftmp, oldidfds;
+diff -urNpa tcsh-6.20.00.orig/sh.hist.c tcsh-6.20.00/sh.hist.c
+--- tcsh-6.20.00.orig/sh.hist.c 2015-06-06 21:19:08.000000000 +0000
++++ tcsh-6.20.00/sh.hist.c 2018-01-12 17:41:58.363104815 +0000
+@@ -1227,7 +1227,7 @@ rechist(Char *fname, int ref)
struct varent *shist;
+ char path[MAXPATHLEN];
+ struct stat st;
- static Char *dumphist[] = {STRhistory, STRmhT, 0, 0};
+ static Char *dumphist[] = {STRhistory, STRmh, 0, 0};
diff --git a/tcsh-no_TERMCAP.patch b/tcsh-no_TERMCAP.patch
index 2de0e39..3e3e9e2 100644
--- a/tcsh-no_TERMCAP.patch
+++ b/tcsh-no_TERMCAP.patch
@@ -1,34 +1,39 @@
---- tcsh-6.12.00/ed.screen.c~ Sun May 18 04:50:03 2003
-+++ tcsh-6.12.00/ed.screen.c Sun May 18 04:50:03 2003
-@@ -1681,25 +1681,6 @@
+diff -urNpa tcsh-6.20.00.orig/ed.screen.c tcsh-6.20.00/ed.screen.c
+--- tcsh-6.20.00.orig/ed.screen.c 2016-11-24 15:04:14.000000000 +0000
++++ tcsh-6.20.00/ed.screen.c 2018-01-12 17:45:57.203090579 +0000
+@@ -1623,28 +1623,6 @@ ChangeSize(int lins, int cols)
+ tsetenv(STRLINES, p);
cleanup_until(p);
}
-
+-
- if ((tptr = getenv("TERMCAP")) != NULL) {
- /* Leave 64 characters slop in case we enlarge the termcap string */
- Char termcap[TC_BUFSIZE+64], backup[TC_BUFSIZE+64], *ptr;
-- Char buf[4];
+- int changed;
-
- ptr = str2short(tptr);
- (void) Strncpy(termcap, ptr, TC_BUFSIZE);
- termcap[TC_BUFSIZE-1] = '\0';
-
-- UpdateVal(STRco, Val(T_co), termcap, backup);
-- UpdateVal(STRli, Val(T_li), termcap, backup);
+- changed = UpdateVal(STRco, Val(T_co), termcap, backup);
+- changed |= UpdateVal(STRli, Val(T_li), termcap, backup);
-
-- /*
-- * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
-- * core-dumps in the termcap routines
-- */
-- termcap[TC_BUFSIZE - 1] = '\0';
-- tsetenv(STRTERMCAP, termcap);
+- if (changed) {
+- /*
+- * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
+- * core-dumps in the termcap routines
+- */
+- termcap[TC_BUFSIZE - 1] = '\0';
+- tsetenv(STRTERMCAP, termcap);
+- }
- }
}
#endif /* KNOWsize */
---- tcsh-6.12.00/sh.func.c~ Sun May 18 04:53:01 2003
-+++ tcsh-6.12.00/sh.func.c Sun May 18 04:53:01 2003
-@@ -1465,8 +1465,7 @@
+diff -urNpa tcsh-6.20.00.orig/sh.func.c tcsh-6.20.00/sh.func.c
+--- tcsh-6.20.00.orig/sh.func.c 2018-01-12 17:43:52.000000000 +0000
++++ tcsh-6.20.00/sh.func.c 2018-01-12 17:44:47.004094763 +0000
+@@ -1572,8 +1572,7 @@ dosetenv(Char **v, struct command *c)
/*
* Load/Update $LINES $COLUMNS
*/
@@ -38,9 +43,10 @@
cleanup_until(lp);
check_window_size(1);
return;
---- tcsh-6.12.00/sh.set.c~ Sun May 18 04:55:02 2003
-+++ tcsh-6.12.00/sh.set.c Sun May 18 04:55:02 2003
-@@ -107,11 +107,6 @@
+diff -urNpa tcsh-6.20.00.orig/sh.set.c tcsh-6.20.00/sh.set.c
+--- tcsh-6.20.00.orig/sh.set.c 2015-09-08 15:49:53.000000000 +0000
++++ tcsh-6.20.00/sh.set.c 2018-01-12 17:44:47.005094763 +0000
+@@ -132,11 +132,6 @@ update_vars(Char *vp)
else if (eq(vp, STRterm)) {
Char *cp = varval(vp);
tsetenv(STRKTERM, cp);
@@ -52,13 +58,14 @@
GotTermCaps = 0;
if (noediting && Strcmp(cp, STRnetwork) != 0 &&
Strcmp(cp, STRunknown) != 0 && Strcmp(cp, STRdumb) != 0) {
---- tcsh-6.12.00/tc.const.c~ Sun May 18 04:57:51 2003
-+++ tcsh-6.12.00/tc.const.c Sun May 18 04:57:51 2003
-@@ -424,7 +424,6 @@
+diff -urNpa tcsh-6.20.00.orig/tc.const.c tcsh-6.20.00/tc.const.c
+--- tcsh-6.20.00.orig/tc.const.c 2015-09-08 15:49:53.000000000 +0000
++++ tcsh-6.20.00/tc.const.c 2018-01-12 17:46:21.904089107 +0000
+@@ -460,7 +460,6 @@ Char STRNOREBIND[] = { 'N', 'O', 'R', '
/* atp - problem with declaration of str{lines,columns} in sh.func.c (1277) */
Char STRLINES[] = { 'L', 'I', 'N', 'E', 'S', '\0'};
Char STRCOLUMNS[] = { 'C', 'O', 'L', 'U', 'M', 'N', 'S', '\0'};
-Char STRTERMCAP[] = { 'T', 'E', 'R', 'M', 'C', 'A', 'P', '\0'};
- #endif /* SIG_WINDOW || _VMS_POSIX */
+ #endif /* SIG_WINDOW || SIGWINCH || SIGWINDOW || _VMS_POSIX */
- #ifdef WARP
+ #if defined (_OSD_POSIX) /* BS2000 needs this variable set to "SHELL" */
diff --git a/tcsh-rlimit_locks.patch b/tcsh-rlimit_locks.patch
index b00648f..d78d223 100644
--- a/tcsh-rlimit_locks.patch
+++ b/tcsh-rlimit_locks.patch
@@ -1,8 +1,17 @@
---- tcsh-6.13.00/sh.func.c.orig 2004-09-05 12:52:39.640514472 +0200
-+++ tcsh-6.13.00/sh.func.c 2004-09-05 13:05:05.446134784 +0200
-@@ -1873,6 +1873,10 @@
- { RLIMIT_SBSIZE, "sbsize", 1, "" },
- # endif /* RLIMIT_SBSIZE */
+diff -urNpa tcsh-6.20.00.orig/nls/C/set15 tcsh-6.20.00/nls/C/set15
+--- tcsh-6.20.00.orig/nls/C/set15 2006-03-02 18:46:45.000000000 +0000
++++ tcsh-6.20.00/nls/C/set15 2018-01-12 17:43:52.104098035 +0000
+@@ -5,3 +5,4 @@ $set 15
+ 2 remove
+ 3 set
+ 4 \040hard
++5 cannot set it on the current kernel\n
+diff -urNpa tcsh-6.20.00.orig/sh.func.c tcsh-6.20.00/sh.func.c
+--- tcsh-6.20.00.orig/sh.func.c 2016-10-18 17:26:42.000000000 +0000
++++ tcsh-6.20.00/sh.func.c 2018-01-12 17:43:52.104098035 +0000
+@@ -2016,6 +2016,10 @@ struct limits limits[] =
+ { RLIMIT_RTTIME, "maxrttime", 1, "usec" },
+ # endif /* RLIMIT_RTTIME */
+# ifdef RLIMIT_LOCKS
+ { RLIMIT_LOCKS, "flocks", 1, "" },
@@ -11,7 +20,7 @@
{ -1, NULL, 0, NULL }
};
-@@ -2082,6 +2086,7 @@
+@@ -2237,6 +2241,7 @@ plim(struct limits *lp, int hard)
# endif /* BSDLIMIT */
RLIM_TYPE limit;
int xdiv = lp->limdiv;
@@ -19,7 +28,7 @@
xprintf("%-13.13s", lp->limname);
-@@ -2092,7 +2097,12 @@
+@@ -2247,7 +2252,12 @@ plim(struct limits *lp, int hard)
limit -= 0x20000000;
# endif /* aiws */
# else /* BSDLIMIT */
@@ -33,7 +42,7 @@
limit = hard ? rlim.rlim_max : rlim.rlim_cur;
# endif /* BSDLIMIT */
-@@ -2191,6 +2201,11 @@
+@@ -2347,6 +2357,11 @@ setlim(struct limits *lp, int hard, RLIM
rlim.rlim_max = rlim.rlim_cur;
if (setrlimit(lp->limconst, &rlim) < 0) {
@@ -45,10 +54,3 @@
# else /* BSDLIMIT */
if (limit != RLIM_INFINITY && lp->limconst == RLIMIT_FSIZE)
limit /= 512;
---- tcsh-6.10.00.old/nls/C/set15 Sat Oct 19 15:52:32 1996
-+++ tcsh-6.10.00/nls/C/set15 Tue Apr 17 14:42:55 2001
-@@ -5,3 +5,4 @@
- 2 remove
- 3 set
- 4 \040hard
-+5 cannot set it on the current kernel\n
diff --git a/tcsh-termios.patch b/tcsh-termios.patch
index 0bd819e..9518d29 100644
--- a/tcsh-termios.patch
+++ b/tcsh-termios.patch
@@ -1,6 +1,7 @@
---- tcsh-6.09.00/sh.h.termios Sun Oct 25 10:10:16 1998
-+++ tcsh-6.09.00/sh.h Mon Jan 10 15:38:40 2000
-@@ -204,6 +204,8 @@
+diff -urNpa tcsh-6.20.00.orig/sh.h tcsh-6.20.00/sh.h
+--- tcsh-6.20.00.orig/sh.h 2016-09-12 16:33:54.000000000 +0000
++++ tcsh-6.20.00/sh.h 2018-01-12 17:40:23.463110471 +0000
+@@ -255,6 +255,8 @@ typedef long tcsh_number_t;
# define DEV_DEV_COMPARE(x,y) ((x) == (y))
#endif /* DEV_DEV_COMPARE */
diff --git a/tcsh-time.patch b/tcsh-time.patch
index dd6f9ea..3ac9337 100644
--- a/tcsh-time.patch
+++ b/tcsh-time.patch
@@ -1,6 +1,7 @@
---- tcsh-6.10.00/sh.h Sun Nov 19 15:50:43 2000
-+++ tcsh-6.10.00/sh.h.new Tue Feb 6 15:11:33 2001
-@@ -208,7 +208,7 @@
+diff -urNpa tcsh-6.20.00.orig/sh.h tcsh-6.20.00/sh.h
+--- tcsh-6.20.00.orig/sh.h 2018-01-12 17:40:23.000000000 +0000
++++ tcsh-6.20.00/sh.h 2018-01-12 17:42:56.464101352 +0000
+@@ -261,7 +261,7 @@ typedef long tcsh_number_t;
# include <sys/procstats.h>
#endif /* _SEQUENT_ */
#if (defined(POSIX) || SYSVREL > 0) && !defined(WINNT_NATIVE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tcsh.git/commitdiff/58d3c43384006d9ef0cc217530f9a9db957aab53
More information about the pld-cvs-commit
mailing list