[tcsh] Update to tcsh-6.18.00 - update sources & remove obsolte patches
Vojtěch Vítek
vvitek at fedoraproject.org
Wed Jun 6 12:11:49 UTC 2012
commit 66fbce9c1e3a0237f1d5180f1e90b9452c95d7f1
Author: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
Date: Tue Mar 20 17:49:12 2012 +0100
Update to tcsh-6.18.00 - update sources & remove obsolte patches
- Remove obsolete patches: tcsh-6.15.00-ca-color.patch,
tcsh-6.17.00-tc-color.patch, tcsh-6.17.00-mh-color.patch,
tcsh-6.17.00-history.patch, tcsh-6.17.00-printexitvalue.patch,
tcsh-6.17.00-testsuite.patch, tcsh-6.17.00-negative_jobs.patch,
tcsh-6.17.00-wait-intr.patch, tcsh-6.17.00-dont-set-empty-remotehost.patch,
tcsh-6.17.00-dont-print-history-on-verbose.patch, tcsh-6.14.00-set.patch,
tcsh-6.17.00-extrafork.patch, tcsh-6.17.00-avoid-null-cwd.patch,
tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch,
tcsh-6.17.00-variable-names.patch,
tcsh-6.17.00-handle-signals-before-flush.patch
tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch (reverted!)
.gitignore | 1 +
sources | 2 +-
tcsh-6.14.00-set.patch | 11 --
tcsh-6.15.00-ca-color.patch | 11 --
tcsh-6.15.00-rs-color.patch | 11 --
...17.00-avoid-infinite-loop-pendjob-xprintf.patch | 10 -
tcsh-6.17.00-avoid-null-cwd.patch | 12 --
tcsh-6.17.00-dont-print-history-on-verbose.patch | 23 ---
tcsh-6.17.00-dont-set-empty-remotehost.patch | 18 --
tcsh-6.17.00-extrafork.patch | 18 --
tcsh-6.17.00-handle-signals-before-flush.patch | 36 ----
tcsh-6.17.00-history.patch | 12 --
tcsh-6.17.00-mh-color.patch | 12 --
tcsh-6.17.00-negative_jobs.patch | 13 --
tcsh-6.17.00-printexitvalue.patch | 82 ---------
...00-status-pipeline-backquote-list-of-cmds.patch | 141 ----------------
tcsh-6.17.00-testsuite.patch | 49 ------
tcsh-6.17.00-variable-names.patch | 92 ----------
tcsh-6.17.00-wait-intr.patch | 34 ----
...atch => tcsh-6.18.00-history-file-locking.patch | 176 +++++++++-----------
tcsh.spec | 67 ++------
21 files changed, 95 insertions(+), 736 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea60d43..301af94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tcsh-6.14.00.tar.gz
tcsh-6.15.00.tar.gz
tcsh-6.16.00.tar.gz
tcsh-6.17.00.tar.gz
+/tcsh-6.18.00.tar.gz
diff --git a/sources b/sources
index e819b14..af5fece 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c47de903e3d52f6824c8dd0c91eeb477 tcsh-6.17.00.tar.gz
+ee9b3aa36fb38d32eab6a37a34e4c341 tcsh-6.18.00.tar.gz
diff --git a/tcsh-6.17.00-history-file-locking.patch b/tcsh-6.18.00-history-file-locking.patch
similarity index 77%
rename from tcsh-6.17.00-history-file-locking.patch
rename to tcsh-6.18.00-history-file-locking.patch
index c30271a..1df5f78 100644
--- a/tcsh-6.17.00-history-file-locking.patch
+++ b/tcsh-6.18.00-history-file-locking.patch
@@ -1,8 +1,8 @@
-From c0612dbd1c6d78668f46910c20cb801a5c67780b Mon Sep 17 00:00:00 2001
+From d73747f08a9576f360e0e0b6c5f537547c30c5fa Mon Sep 17 00:00:00 2001
From: "Vojtech Vitek (V-Teq)" <vvitek at redhat.com>
-Date: Thu, 10 Nov 2011 18:19:57 +0100
-Subject: [PATCH 2/2] Implement .history file locking - shared readers,
- exclusive writer
+Date: Thu, 15 Mar 2012 03:13:01 +0100
+Subject: [PATCH] Implement .history file locking - shared readers, exclusive
+ writer
Originally reported at Red Hat Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=648592
@@ -15,13 +15,13 @@ Patch by Vojtech Vitek (V-Teq) <vvitek at redhat.com>
sh.dol.c | 2 +-
sh.err.c | 16 ++++++++++
sh.h | 17 +++++++++++
- sh.hist.c | 83 +++++++++++++++++++++++++++++-------------------------
+ sh.hist.c | 62 +++++++++++++++++++++++------------------
sh.lex.c | 8 ++--
sh.sem.c | 2 +-
- 9 files changed, 154 insertions(+), 72 deletions(-)
+ 9 files changed, 145 insertions(+), 60 deletions(-)
diff --git a/sh.c b/sh.c
-index da818fb..283af06 100644
+index dcd9116..aaf32bc 100644
--- a/sh.c
+++ b/sh.c
@@ -140,6 +140,7 @@ struct saved_state {
@@ -32,7 +32,7 @@ index da818fb..283af06 100644
};
static int srccat (Char *, Char *);
-@@ -1251,7 +1252,7 @@ main(int argc, char **argv)
+@@ -1369,7 +1370,7 @@ main(int argc, char **argv)
/*
* Source history before .login so that it is available in .login
*/
@@ -41,7 +41,7 @@ index da818fb..283af06 100644
#ifndef LOGINFIRST
if (loginsh)
(void) srccat(varval(STRhome), STRsldotlogin);
-@@ -1404,20 +1405,52 @@ static int
+@@ -1522,20 +1523,52 @@ static int
#else
int
#endif /*WINNT_NATIVE*/
@@ -80,7 +80,7 @@ index da818fb..283af06 100644
+
+ if (flg & (FD_WRLCK | FD_RDLCK)) {
+ struct flock fl;
-+
++
+ fl.l_type = (flg & FD_WRLCK) ? F_WRLCK : F_RDLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
@@ -99,15 +99,15 @@ index da818fb..283af06 100644
+ cleanup_until(unit); /* open_cleanup */
+ cleanup_until(unit); /* xfree */
+ }
-+
++
+ return -1; /* Invalid file descriptor. */
+ }
-+
++
+ return *unit;
}
-@@ -1475,10 +1508,14 @@ st_save(struct saved_state *st, int unit, int hflg, Char **al, Char **av)
+@@ -1593,10 +1626,14 @@ st_save(struct saved_state *st, int unit, int hflg, Char **al, Char **av)
st->onelflg = onelflg;
st->enterhist = enterhist;
st->justpr = justpr;
@@ -123,7 +123,7 @@ index da818fb..283af06 100644
st->cantell = cantell;
cpybin(st->B, B);
-@@ -1550,7 +1587,8 @@ st_restore(void *xst)
+@@ -1668,7 +1705,8 @@ st_restore(void *xst)
}
cpybin(B, st->B);
@@ -133,7 +133,7 @@ index da818fb..283af06 100644
insource = st->insource;
SHIN = st->SHIN;
-@@ -2024,24 +2062,25 @@ process(int catch)
+@@ -2153,24 +2191,25 @@ process(int catch)
}
/*ARGSUSED*/
@@ -164,7 +164,7 @@ index da818fb..283af06 100644
}
f = globone(*t++, G_ERROR);
-@@ -2049,9 +2088,13 @@ dosource(Char **t, struct command *c)
+@@ -2178,9 +2217,13 @@ dosource(Char **t, struct command *c)
cleanup_push(file, xfree);
xfree(f);
t = glob_all_or_error(t);
@@ -172,17 +172,17 @@ index da818fb..283af06 100644
- stderror(ERR_SYSTEM, file, strerror(errno));
- cleanup_until(file);
+ fd = srcfile(file, 0, (hflg | flg), t);
-+
++
+ /* Postpone fd cleanup, which is on the top of cleaning stack. */
+ cleanup_ignore(file);
+ xfree(file);
-+
++
+ return fd; /* File descriptor or -1. */
}
/*
diff --git a/sh.decls.h b/sh.decls.h
-index 70f76a4..806ae3a 100644
+index db90288..d4332f3 100644
--- a/sh.decls.h
+++ b/sh.decls.h
@@ -37,7 +37,7 @@
@@ -194,7 +194,7 @@ index 70f76a4..806ae3a 100644
extern void exitstat (void);
extern void goodbye (Char **, struct command *);
extern void importpath (Char *);
-@@ -97,6 +97,7 @@ extern void cleanup_until_mark(void);
+@@ -98,6 +98,7 @@ extern void cleanup_until_mark(void);
extern size_t cleanup_push_mark(void);
extern void cleanup_pop_mark(size_t);
extern void open_cleanup(void *);
@@ -202,20 +202,20 @@ index 70f76a4..806ae3a 100644
extern void opendir_cleanup(void *);
extern void sigint_cleanup(void *);
extern void sigprocmask_cleanup(void *);
-@@ -216,7 +217,7 @@ extern struct Hist *enthist (int, struct wordent *, int, int);
+@@ -219,7 +220,7 @@ extern struct Hist *enthist (int, struct wordent *, int, int, int);
extern void savehist (struct wordent *, int);
extern char *fmthist (int, ptr_t);
extern void rechist (Char *, int);
-extern void loadhist (Char *, int);
+extern int loadhist (Char *, int);
+ extern void displayHistStats(const char *);
/*
- * sh.init.c
diff --git a/sh.dir.c b/sh.dir.c
-index 9f72951..b75c366 100644
+index ab89855..4bfe430 100644
--- a/sh.dir.c
+++ b/sh.dir.c
-@@ -1336,7 +1336,7 @@ loaddirs(Char *fname)
+@@ -1342,7 +1342,7 @@ loaddirs(Char *fname)
loaddirs_cmd[1] = fname;
else
loaddirs_cmd[1] = STRtildotdirs;
@@ -225,10 +225,10 @@ index 9f72951..b75c366 100644
}
diff --git a/sh.dol.c b/sh.dol.c
-index bafb971..b9fe82a 100644
+index 45b10e0..02dfe98 100644
--- a/sh.dol.c
+++ b/sh.dol.c
-@@ -1099,6 +1099,6 @@ again:
+@@ -1110,6 +1110,6 @@ again:
*obp = 0;
tmp = short2str(obuf);
(void) xwrite(0, tmp, strlen (tmp));
@@ -237,10 +237,10 @@ index bafb971..b9fe82a 100644
cleanup_until(&inheredoc);
}
diff --git a/sh.err.c b/sh.err.c
-index 279c7b8..9759d72 100644
+index e157d6a..29d41c3 100644
--- a/sh.err.c
+++ b/sh.err.c
-@@ -505,6 +505,22 @@ open_cleanup(void *xptr)
+@@ -514,6 +514,22 @@ open_cleanup(void *xptr)
}
void
@@ -250,12 +250,12 @@ index 279c7b8..9759d72 100644
+ struct flock fl;
+
+ ptr = xptr;
-+
++
+ fl.l_type = F_UNLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_start = 0;
+ fl.l_len = 0;
-+
++
+ fcntl(*ptr, F_SETLK, &fl);
+}
+
@@ -264,7 +264,7 @@ index 279c7b8..9759d72 100644
{
DIR *dir;
diff --git a/sh.h b/sh.h
-index 83a3e93..c05870f 100644
+index 691add3..558b093 100644
--- a/sh.h
+++ b/sh.h
@@ -50,6 +50,23 @@
@@ -275,7 +275,7 @@ index 83a3e93..c05870f 100644
+#include <fcntl.h>
+/*
+ * Source flags (representing -h or -m).
-+ *
++ *
+ * File locking flags.
+ * - shared and exclusive (read and write) access to a file
+ * - currently used in sh.c and sh.hist.c files while acessing
@@ -292,10 +292,10 @@ index 83a3e93..c05870f 100644
typedef unsigned long intptr_t;
#endif
diff --git a/sh.hist.c b/sh.hist.c
-index 2863d5c..f0583cb 100644
+index 6a12737..7df84e5 100644
--- a/sh.hist.c
+++ b/sh.hist.c
-@@ -255,7 +255,7 @@ dohist(Char **vp, struct command *c)
+@@ -1173,7 +1173,7 @@ dohist(Char **vp, struct command *c)
}
if (hflg & (HIST_LOAD | HIST_MERGE))
@@ -304,7 +304,7 @@ index 2863d5c..f0583cb 100644
else if (hflg & HIST_SAVE)
rechist(*vp, 1);
else {
-@@ -374,8 +374,8 @@ fmthist(int fmt, ptr_t ptr)
+@@ -1224,8 +1224,8 @@ fmthist(int fmt, ptr_t ptr)
void
rechist(Char *fname, int ref)
{
@@ -315,7 +315,15 @@ index 2863d5c..f0583cb 100644
struct varent *shist;
static Char *dumphist[] = {STRhistory, STRmhT, 0, 0};
-@@ -405,15 +405,12 @@ rechist(Char *fname, int ref)
+@@ -1239,7 +1239,6 @@ rechist(Char *fname, int ref)
+ ((snum = varval(STRhistory)) == STRNULL))
+ snum = STRmaxint;
+
+-
+ if (fname == NULL) {
+ if ((fname = varval(STRhistfile)) == STRNULL)
+ fname = Strspl(varval(STRhome), &STRtildothist[1]);
+@@ -1255,15 +1254,12 @@ rechist(Char *fname, int ref)
* with numerous shells being in simultaneous use. Imagine
* any kind of window system. All these shells 'share' the same
* ~/.history file for recording their command line history.
@@ -325,10 +333,9 @@ index 2863d5c..f0583cb 100644
- * Users that like to nuke their environment require here an atomic
- * loadhist-creat-dohist(dumphist)-close
- * sequence.
-- *
+ *
- * jw.
- */
-+ *
+ * Atomic merge loadhist-creat/ftrunc-dohist(dumphist)-close
+ * implemented using fcntl (shared readers, exclusive writer)
+ * by Vojtech Vitek (V-Teq) <vvitek at redhat.com>.
@@ -337,52 +344,44 @@ index 2863d5c..f0583cb 100644
/*
* We need the didfds stuff before loadhist otherwise
* exec in a script will fail to print if merge is set.
-@@ -421,41 +418,49 @@ rechist(Char *fname, int ref)
+@@ -1271,22 +1267,34 @@ rechist(Char *fname, int ref)
*/
oldidfds = didfds;
didfds = 0;
- if ((shist = adrof(STRsavehist)) != NULL && shist->vec != NULL)
-- if (shist->vec[1] && eq(shist->vec[1], STRmerge)) {
-- /*
-- * Unset verbose while we read the history file. From:
-- * jbastian at redhat.com (Jeffrey Bastian)
-- */
-- Char *verb = varval(STRverbose);
-- if (verb != STRNULL)
-- unsetv(STRverbose);
+- if (shist->vec[1] && eq(shist->vec[1], STRmerge))
- loadhist(fname, 1);
-- if (verb != STRNULL)
-- setv(STRverbose, verb, VAR_READWRITE);
+-
+- fp = xcreat(short2str(fname), 0600);
+- cleanup_until(fname);
+- if (fp == -1) {
+- didfds = oldidfds;
+- return;
+ if ((shist = adrof(STRsavehist)) != NULL && shist->vec != NULL
+ && shist->vec[1] && eq(shist->vec[1], STRmerge)) {
-+ /*
-+ * Unset verbose while we read the history file. From:
-+ * jbastian at redhat.com (Jeffrey Bastian)
-+ */
-+ Char *verb = varval(STRverbose);
-+ if (verb != STRNULL)
-+ unsetv(STRverbose);
+ /* Read .history file, leave it's fd open for writing. */
+ fd = loadhist(fname, SRC_MFLAG|FD_WRLCK|FD_LEAVE_OPEN|FD_LEAVE_LCKD);
+ if (fd != -1) {
+ /* Truncate the .history file. */
+ (void) ftruncate(fd, 0);
+ (void) lseek(fd, 0, SEEK_SET);
- }
-- fp = xcreat(short2str(fname), 0600);
-- if (fp == -1) {
-- didfds = oldidfds;
-- cleanup_until(fname);
-- return;
-+ if (verb != STRNULL)
-+ setv(STRverbose, verb, VAR_READWRITE);
-+ }
++ }
+ }
+- ftmp = SHOUT;
+- SHOUT = fp;
+- dumphist[2] = snum;
+- dohist(dumphist, NULL);
+- xclose(fp);
+- SHOUT = ftmp;
++
++ /* Open .history file for writing (if not open yet). */
+ if (fd == -1) {
-+ /* Open .history file for writing (if not open yet). */
+ fd = xopen(short2str(fname), O_LARGEFILE|O_CREAT|O_WRONLY|O_TRUNC, 0600);
++ cleanup_until(fname);
+ if (fd != -1)
+ cleanup_push(&fd, open_cleanup);
+ }
++
+ if (fd != -1) {
+ ftmp = SHOUT;
+ SHOUT = fd;
@@ -390,41 +389,16 @@ index 2863d5c..f0583cb 100644
+ /* Write history to the .history file. */
+ dohist(dumphist, NULL);
+ SHOUT = ftmp;
- }
-- ftmp = SHOUT;
-- SHOUT = fp;
-- dumphist[2] = snum;
-- dohist(dumphist, NULL);
-- xclose(fp);
-- SHOUT = ftmp;
++ }
++
didfds = oldidfds;
- cleanup_until(fname);
}
-
--void
--loadhist(Char *fname, int mflg)
-+int
-+loadhist(Char *fname, int flg)
- {
- static Char *loadhist_cmd[] = {STRsource, NULL, NULL, NULL};
-- loadhist_cmd[1] = mflg ? STRmm : STRmh;
-+ loadhist_cmd[1] = (flg & SRC_MFLAG) ? STRmm : STRmh;
-
- if (fname != NULL)
- loadhist_cmd[2] = fname;
-@@ -464,5 +469,5 @@ loadhist(Char *fname, int mflg)
- else
- loadhist_cmd[2] = STRtildothist;
-
-- dosource(loadhist_cmd, NULL);
-+ return dosource(loadhist_cmd, NULL, flg);
- }
diff --git a/sh.lex.c b/sh.lex.c
-index 536097e..2543552 100644
+index 80643f7..e128789 100644
--- a/sh.lex.c
+++ b/sh.lex.c
-@@ -1589,7 +1589,7 @@ wide_read(int fildes, Char *buf, size_t nchars, int use_fclens)
+@@ -1595,7 +1595,7 @@ wide_read(int fildes, Char *buf, size_t nchars, int use_fclens)
/* Throwing away possible partial multibyte characters on error if the
stream is not seekable */
err = errno;
@@ -433,7 +407,7 @@ index 536097e..2543552 100644
errno = err;
return res != 0 ? res : r;
}
-@@ -1604,7 +1604,7 @@ bgetc(void)
+@@ -1610,7 +1610,7 @@ bgetc(void)
if (cantell) {
if (fseekp < fbobp || fseekp > feobp) {
fbobp = feobp = fseekp;
@@ -442,7 +416,7 @@ index 536097e..2543552 100644
}
if (fseekp == feobp) {
#ifdef WIDE_STRINGS
-@@ -1808,7 +1808,7 @@ btell(struct Ain *l)
+@@ -1814,7 +1814,7 @@ btell(struct Ain *l)
void
btoeof(void)
{
@@ -451,7 +425,7 @@ index 536097e..2543552 100644
aret = TCSH_F_SEEK;
fseekp = feobp;
alvec = NULL;
-@@ -1826,7 +1826,7 @@ settell(void)
+@@ -1832,7 +1832,7 @@ settell(void)
cantell = 0;
if (arginp || onelflg || intty)
return;
@@ -461,10 +435,10 @@ index 536097e..2543552 100644
fbuf = xcalloc(2, sizeof(Char **));
fblocks = 1;
diff --git a/sh.sem.c b/sh.sem.c
-index 7c5511a..b8eee96 100644
+index c880974..765bf50 100644
--- a/sh.sem.c
+++ b/sh.sem.c
-@@ -879,7 +879,7 @@ doio(struct command *t, int *pipein, int *pipeout)
+@@ -892,7 +892,7 @@ doio(struct command *t, int *pipein, int *pipeout)
fd = xopen(tmp, O_WRONLY|O_APPEND|O_LARGEFILE);
#else /* !O_APPEND */
fd = xopen(tmp, O_WRONLY|O_LARGEFILE);
@@ -474,5 +448,5 @@ index 7c5511a..b8eee96 100644
}
else
--
-1.7.6.2
+1.7.6.5
diff --git a/tcsh.spec b/tcsh.spec
index fdfe2f6..1baca73 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -2,48 +2,20 @@
Summary: An enhanced version of csh, the C shell
Name: tcsh
-Version: 6.17
-Release: 19%{?dist}
+Version: 6.18.00
+Release: 1%{?dist}
License: BSD
Group: System Environment/Shells
-Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.00.tar.gz
+Source: http://ftp.funet.fi/pub/unix/shells/tcsh/%{name}-%{version}.tar.gz
Patch1: tcsh-6.15.00-closem.patch
Patch2: tcsh-6.14.00-tinfo.patch
Patch3: tcsh-6.14.00-unprintable.patch
Patch4: tcsh-6.15.00-hist-sub.patch
-Patch6: tcsh-6.15.00-ca-color.patch
-Patch7: tcsh-6.14.00-set.patch
Patch8: tcsh-6.14.00-syntax.patch
Patch9: tcsh-6.13.00-memoryuse.patch
Patch11: tcsh-6.14.00-order.patch
-Patch12: tcsh-6.15.00-rs-color.patch
-Patch13: tcsh-6.17.00-mh-color.patch
-# Accepted by upstream:
-Patch14: tcsh-6.17.00-history.patch
-# Accepted by upstream:
-Patch15: tcsh-6.17.00-printexitvalue.patch
-Patch16: tcsh-6.17.00-testsuite.patch
-# Proposed to upstream (http://bugs.gw.com/view.php?id=149):
-Patch17: tcsh-6.17.00-negative_jobs.patch
-# Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=109):
-Patch19: tcsh-6.17.00-wait-intr.patch
-# Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=112):
-Patch21: tcsh-6.17.00-dont-set-empty-remotehost.patch
-# Patch by upstream (tcsh-6.17.01b http://mx.gw.com/pipermail/tcsh-bugs/2010-May/000673.html):
-Patch22: tcsh-6.17.00-dont-print-history-on-verbose.patch
-# Accepted by upstream:
-Patch23: tcsh-6.17.00-extrafork.patch
-# Proposed to upstream (http://bugs.gw.com/view.php?id=122):
-Patch24: tcsh-6.17.00-avoid-null-cwd.patch
-# Accepted by upstream (tcsh-6.17.05b http://mx.gw.com/pipermail/tcsh-bugs/2011-March/000727.html):
-Patch25: tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch
-# Accepted by upstream (tcsh-6.17.03b http://bugs.gw.com/view.php?id=113):
-Patch26: tcsh-6.17.00-variable-names.patch
-# Accepted by upstream (tcsh-6.17.06b http://bugs.gw.com/view.php?id=110)
-Patch27: tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch
# Proposed to upstream (http://bugs.gw.com/view.php?id=121)
Patch28: tcsh-6.17.00-manpage-spelling.patch
-Patch30: tcsh-6.17.00-handle-signals-before-flush.patch
Patch31: tcsh-6.17.00-history-file-locking.patch
Provides: csh = %{version}
@@ -62,32 +34,15 @@ spelling correction, a history mechanism, job control and a C language
like syntax.
%prep
-%setup -q -n %{name}-%{version}.00
+%setup -q -n %{name}-%{version}
%patch1 -p1 -b .closem
%patch2 -p1 -b .tinfo
%patch3 -p1 -b .unprintable
%patch4 -p1 -b .hist-sub
-%patch6 -p1 -b .ca-color
-%patch7 -p1 -b .set
%patch8 -p1 -b .syntax
%patch9 -p1 -b .memoryuse
%patch11 -p1 -b .order
-%patch12 -p1 -b .rs-color
-%patch13 -p1 -b .mh-color
-%patch14 -p1 -b .history
-%patch15 -p1 -b .printexitvalue
-%patch16 -p1 -b .testsuite
-%patch17 -p1 -b .negative_jobs
-%patch19 -p1 -b .wait-intr
-%patch21 -p1 -b .dont-set-empty-remotehost
-%patch22 -p1 -b .dont-print-history-on-verbose
-%patch23 -p1 -b .extrafork
-%patch24 -p1 -b .avoid-null-cwd
-%patch25 -p1 -b .avoid-infinite-loop-pendjob-xprintf
-%patch26 -p1 -b .variable-names
-%patch27 -p1 -b .status-pipeline-backquote-list-of-cmds
%patch28 -p1 -b .manpage-spelling
-%patch30 -p1 -b .handle-signals-before-flush
%patch31 -p1 -b .history-file-locking
for i in Fixes WishList; do
@@ -162,6 +117,20 @@ fi
%{_mandir}/man1/*.1*
%changelog
+* Thu Mar 15 2012 Vojtech Vitek (V-Teq) <vvitek at redhat.com> - 6.18.00-1
+- Update to tcsh-6.18.00
+- Remove obsolete patches: tcsh-6.15.00-ca-color.patch,
+ tcsh-6.17.00-tc-color.patch, tcsh-6.17.00-mh-color.patch,
+ tcsh-6.17.00-history.patch, tcsh-6.17.00-printexitvalue.patch,
+ tcsh-6.17.00-testsuite.patch, tcsh-6.17.00-negative_jobs.patch,
+ tcsh-6.17.00-wait-intr.patch, tcsh-6.17.00-dont-set-empty-remotehost.patch,
+ tcsh-6.17.00-dont-print-history-on-verbose.patch, tcsh-6.14.00-set.patch,
+ tcsh-6.17.00-extrafork.patch, tcsh-6.17.00-avoid-null-cwd.patch,
+ tcsh-6.17.00-avoid-infinite-loop-pendjob-xprintf.patch,
+ tcsh-6.17.00-variable-names.patch,
+ tcsh-6.17.00-handle-signals-before-flush.patch
+ tcsh-6.17.00-status-pipeline-backquote-list-of-cmds.patch (reverted!)
+
* Thu Feb 16 2012 Vojtech Vitek (V-Teq) <vvitek at redhat.com> - 6.17-19
- Handle pending signals before flush so that the the .history file
does not get truncated (#653054)
More information about the scm-commits
mailing list