summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiloslav Trmac <mitr@fedoraproject.org>2006-03-23 02:09:08 +0000
committerMiloslav Trmac <mitr@fedoraproject.org>2006-03-23 02:09:08 +0000
commitbed8c67a167414670a54d4e95d9edc8a194a7c41 (patch)
tree23ee867ec5094805df33765f62f8b8b3175cd3f1
parent5533df3a657a5e2ee22b06d1013bb9945c75750e (diff)
downloadtcsh-rebase-6.19.00-bed8c67a167414670a54d4e95d9edc8a194a7c41.tar.gz
tcsh-rebase-6.19.00-bed8c67a167414670a54d4e95d9edc8a194a7c41.tar.xz
tcsh-rebase-6.19.00-bed8c67a167414670a54d4e95d9edc8a194a7c41.zip
- Backport a patch to ignore LS_COLOR codes introduced in newer coreutils
(#186037)
-rw-r--r--tcsh-6.14.00-colors.patch14
-rw-r--r--tcsh.spec8
2 files changed, 21 insertions, 1 deletions
diff --git a/tcsh-6.14.00-colors.patch b/tcsh-6.14.00-colors.patch
new file mode 100644
index 0000000..cb1e514
--- /dev/null
+++ b/tcsh-6.14.00-colors.patch
@@ -0,0 +1,14 @@
+--- tcsh-6.14.00/tw.color.c.colors 2006-03-23 02:59:40.000000000 +0100
++++ tcsh-6.14.00/tw.color.c 2006-03-23 03:00:44.000000000 +0100
+@@ -80,6 +80,11 @@
+ #endif
+ VAR(NOS, "rc", "m"), /* Right code */
+ VAR(NOS, "ec", ""), /* End code (replaces lc+no+rc) */
++ VAR(NOS, "su", ""), /* Setuid file (u+s) */
++ VAR(NOS, "sg", ""), /* Setgid file (g+s) */
++ VAR(NOS, "tw", ""), /* Sticky and other writable dir (+t,o+w) */
++ VAR(NOS, "ow", ""), /* Other writable dir (o+w) but not sticky */
++ VAR(NOS, "st", ""), /* Sticky dir (+t) but not other writable */
+ };
+
+ enum FileType {
diff --git a/tcsh.spec b/tcsh.spec
index ee48607..9584f9f 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -3,7 +3,7 @@
Summary: An enhanced version of csh, the C shell.
Name: tcsh
Version: 6.14
-Release: 7
+Release: 8
License: distributable
Group: System Environment/Shells
Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -15,6 +15,7 @@ Patch4: tcsh-6.14.00-dashn.patch
Patch5: tcsh-6.14.00-read.patch
Patch6: tcsh-6.14.00-sigint.patch
Patch7: tcsh-6.14.00-wide-crash.patch
+Patch8: tcsh-6.14.00-colors.patch
Provides: csh = %{version}
Prereq: fileutils, grep
URL: http://www.tcsh.org/
@@ -39,6 +40,7 @@ like syntax.
%patch5 -p1 -b .read
%patch6 -p1 -b .sigint
%patch7 -p1 -b .wide-crash
+%patch8 -p1 -b .colors
nroff -me eight-bit.me > eight-bit.txt
@@ -106,6 +108,10 @@ fi
%{_mandir}/*/*
%changelog
+* Thu Mar 23 2006 Miloslav Trmac <mitr@redhat.com> - 6.14-8
+- Backport a patch to ignore LS_COLOR codes introduced in newer coreutils
+ (#186037)
+
* Sat Mar 18 2006 Miloslav Trmac <mitr@redhat.com> - 6.14-7
- Fix a crash when reading scripts with multibyte characters (#183267)
- Block SIGINT while waiting for children (#177366)