pool/tcsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1079203 from shells

Browse Source 
- Update to tcsh 6.24.09
  * ls-F: unsetenv LS*COLOR reapplies other LS*COLOR (Luke Mewburn)
  * Don't crash if LSCOLORS contains > 11 pairs (Luke Mewburn)
- Port patch
  * tcsh-6.18.03-colorls.dif
    that is we ignore unknown colors to be compatible with LS_COLOR
    used by /usr/bin/ls from coreutils

- Update to tcsh 6.24.08

OBS-URL: https://build.opensuse.org/request/show/1079203
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=91
This commit is contained in:
Dominique Leuenberger 2023-04-14 11:12:30 +00:00 committed by Git OBS Bridge
commit f3c71a4133
7 changed files with 106 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
tcsh-6.18.03-colorls.dif
View File

@ -1,9 +1,76 @@
---
tw.color.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
tests/ls-F.at | 36 ++++++++++++++++++------------------
tw.color.c | 10 ++++------
2 files changed, 22 insertions(+), 24 deletions(-)
--- tests/ls-F.at
+++ tests/ls-F.at 2023-04-13 12:51:33.133052023 +0000
@@ -358,9 +358,9 @@ dnl
dnl Fail: environment LS_COLORS=YY:XX=0 exits with unknown 'XX'.
dnl (Unknown 'YY' is ignored.)
dnl
-AT_CHECK([LS_COLORS=YY:XX=0 tcsh -f -c 'set color;cd DIR && ls-F'], [1], [], [dnl
-Unknown LS_COLORS color variable 'XX'.
-])
+dnl AT_CHECK([LS_COLORS=YY:XX=0 tcsh -f -c 'set color;cd DIR && ls-F'], [1], [], [dnl
+dnl Unknown LS_COLORS color variable 'XX'.
+dnl ])
dnl
dnl setenv LS_COLORS "YY:XX=0" warns for unknown 'XX='. (Unknown 'YY' is ignored').
@@ -368,11 +368,11 @@ dnl listflags=A, listlinks
dnl
dnl As per ls-F-color-default.out.
dnl
-TCSH_LS_F([${tests_dir}/ls-F-color-default.out],
- [],
- [setenv LS_COLORS "YY:XX=0"; set color listflags=A listlinks], [dnl
-Unknown LS_COLORS color variable 'XX'.
-])
+dnl TCSH_LS_F([${tests_dir}/ls-F-color-default.out],
+dnl [],
+dnl [setenv LS_COLORS "YY:XX=0"; set color listflags=A listlinks], [dnl
+dnl Unknown LS_COLORS color variable 'XX'.
+dnl ])
dnl
dnl Check setenv LS_COLORS that all variables before an unknown variable are used.
@@ -383,11 +383,11 @@ dnl listflags=A, listlinks
dnl
dnl As per ls-F-LS_COLORS-all.out.
dnl
-TCSH_LS_F([${tests_dir}/ls-F-LS_COLORS-all.out],
- [],
- [setenv LS_COLORS "TCSH_TEXT_LS_COLORS:YY:XX=0"; set color listflags=A listlinks], [dnl
-Unknown LS_COLORS color variable 'XX'.
-])
+dnl TCSH_LS_F([${tests_dir}/ls-F-LS_COLORS-all.out],
+dnl [],
+dnl [setenv LS_COLORS "TCSH_TEXT_LS_COLORS:YY:XX=0"; set color listflags=A listlinks], [dnl
+dnl Unknown LS_COLORS color variable 'XX'.
+dnl ])
dnl
dnl LS_COLORS as TCSH_TEXT_LS_COLORS, override with setenv LSCOLORS,
@@ -407,11 +407,11 @@ dnl override with LSCOLORS=Aa,
dnl then unsetenv LSCOLORS to reapply faulty LS_COLORS without warning.
dnl and results in default colors.
dnl
-TCSH_LS_F([${tests_dir}/ls-F-color-default.out],
- [],
- [setenv LS_COLORS XX=0; setenv LSCOLORS Aa; unsetenv LSCOLORS || echo FAIL; set color listflags=A listlinks], [dnl
-Unknown LS_COLORS color variable 'XX'.
-])
+dnl TCSH_LS_F([${tests_dir}/ls-F-color-default.out],
+dnl [],
+dnl [setenv LS_COLORS XX=0; setenv LSCOLORS Aa; unsetenv LSCOLORS || echo FAIL; set color listflags=A listlinks], [dnl
+dnl Unknown LS_COLORS color variable 'XX'.
+dnl ])
m4_popdef([TCSH_TEXT_LS_COLORS])
--- tw.color.c
+++ tw.color.c 2023-04-11 10:36:56.030561276 +0000
+++ tw.color.c 2023-04-13 12:33:48.052952714 +0000
@@ -56,7 +56,7 @@ typedef struct {
typedef enum {
Vdi, Vln, Vor, Vpi, Vso, Vdo, Vbd, Vcd,
@ -21,7 +88,7 @@
};
#define nvariables (sizeof(variables)/sizeof(variables[0]))
@@ -362,7 +363,7 @@ parseLS_COLORS(const Char *value)
@@ -369,7 +370,7 @@ parseLS_COLORS(const Char *value, int si
size_t i, len;
const Char *v; /* pointer in value */
char *c; /* pointer in colors */
@ -30,7 +97,7 @@
jmp_buf_t osetexit;
size_t omark;
@@ -419,16 +420,14 @@ parseLS_COLORS(const Char *value)
@@ -426,17 +427,14 @@ parseLS_COLORS(const Char *value, int si
if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
(Char)variables[i].variable[1] == (v[1] & CHAR))
break;
@ -44,7 +111,8 @@
continue;
}
- else
- stderror(ERR_BADCOLORVAR, v[0], v[1]);
- stderror(ERR_BADCOLORVAR | (silent ? ERR_SILENT : 0),
- "LS_COLORS", v[0], v[1]);
}
break;
}

3
tcsh-6.24.08.tar.gz
View File

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

16
tcsh-6.24.08.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmQz1m8ACgkQZcJuRx9F
sSNzIg/9HAZFM8TgpfXqNx1wa1sQHyo2uB3a8dHf0OPHOzuLXUGNRryQcY8KfAhi
Y9ILuFBZ60Nk3L8iEtTT2o8961VsDuo3MPrecQlfvtttpHw0yWWjrF+TDThPqZUo
clEA757XDood3aQjeD0KlNY6a16LzdvtDEY1cLdKi5wK83wZlbW1QsBKGhMAFiXM
ULk1wk0erl16V5UyARivowccNvmNSSz5NcU+psvxRL9JL36NC9eaTXvcKqfdPmYA
SRHqCUErX4fZZZfOuURfqv32IWNqRsi40wTZ82PhqRaj+vV9FwmrNq+JBy7AY+vT
zaIbITuUMJ1oNrRm04gQ4nYA0LA9fAqG6k05BpA/Z+JC2i+Fdr84KkDNl+vBKeuw
8Rq46E80Ey+Paknn+GPvQFvbP6pkZXU05rrN7tz7RP8C+gRZkv6mQTvdp1mTeHei
HpodL1lLgCXEDRtLFLeB1rHNP4lBXirfoDvPTWHZ9OV0159OvdRifi/L2lifet5Z
RaVtBvVQu6cZ/xH8qI+w3VFr4sELtbjEPKah28lBQIzxL5OSi7larD6vn5p9Gs0G
hSvQm19klyfxYIvzWD+dX/OsW17ARiZEc0WVtNVSQmf7prjVu54rlhngi71w2fRi
H8NxeOsMQR6zCTlPIiSAAne1bwrFTY3vTlqoTELcann9KS2Umgo=
=0A84
-----END PGP SIGNATURE-----

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

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

16
tcsh-6.24.09.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmQ3ajsACgkQZcJuRx9F
sSODKQ//Zp5QPDz9sVRdBwotAD0nhLseRS2Klf6c0xQvM+9GkR128/o17OpSGG2k
3k1OydrxeY3tt2PgOtmzSx6zl0ndB4uo7TTdmy7RgCcxYU4nl7V+TPvSPzn7ZGUI
Z4moJugKtLm0n7S+DmCbw6xLOMeYTEFBk+4E9dCp7+0jqLbZ7MnKQi589yJf8Jy6
gts909/YqwApMyD2Y+K4JK0sDI1yp+fyDQolZTeMOSRtSQN047wczSI8kZtKKA7N
ZtLThNmmf1tZDhEOdqPLFP2jfhH2wali0OoBiMuR7RBztsjN3PGDzk3jgML4fu4D
zKLs/ebSoOqkHxfcyBrfUq/HBLcS7bb6bwO8mCATQ0NXR8MbADKZoB9+NPRju7wb
nw3lDr4o3hGnhuQhKtl2fuN3PGjZIA8uUvy/DHj3Vr3eBrcViNSLWfa2CLNZP7LE
BEb4QlBcV45sfQteqIrqyNr/IJN78jJcJy8YdwBYeuvbiCJMHD3lvUqtn9XKZHAi
hsZDHVyfyq4jZDoTsL8Ne/rNTSjl7Cklt7Q3q7iO0BHG6AOOatOlDKn2uDc5wqIc
LhNaeq6jh7ZhZFq9nGimduHE+rU8SmlTYdZIYYhjGSDG6pkP65BMReVVDDIvROdN
tQf3gVz69X4VQ9HGVIwP3AcrzEJtjbz/NcKqItnoXUjMDZzSGZo=
=0/V0
-----END PGP SIGNATURE-----

13
tcsh.changes
View File

@ -1,7 +1,18 @@
-------------------------------------------------------------------
Thu Apr 13 12:34:15 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to tcsh 6.24.09
* ls-F: unsetenv LS*COLOR reapplies other LS*COLOR (Luke Mewburn)
* Don't crash if LSCOLORS contains > 11 pairs (Luke Mewburn)
- Port patch
* tcsh-6.18.03-colorls.dif
that is we ignore unknown colors to be compatible with LS_COLOR
used by /usr/bin/ls from coreutils
-------------------------------------------------------------------
Tue Apr 11 09:52:13 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update too tcsh 6.24.08
- Update to tcsh 6.24.08
* Support LS_COLORS su,sg,tw,ow,st,mh variables. (Luke Mewburn)
* Fixes for LS_COLORS ln=target: ls-F directory; reset on unsetenv;
intermittent parse bug; only support lower-case "target". (Luke Mewburn)

2
tcsh.spec
View File

@ -17,7 +17,7 @@
Name: tcsh
Version: 6.24.08
Version: 6.24.09
Release: 0
Summary: The C SHell
License: BSD-3-Clause