From 077e60a7a02386b5fa44d997cc94830ecf207a81e94af48c13475c86bf748782 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 11 Apr 2023 10:49:58 +0000 Subject: [PATCH] Update to tcsh-6.24.08 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=147 --- tcsh-6.17.06-dspmbyte.dif | 2 +- tcsh-6.18.03-colorls.dif | 55 ++++++++++++++++----------------------- tcsh-6.21.00.dif | 6 ++--- tcsh-6.24.07.tar.gz | 3 --- tcsh-6.24.07.tar.gz.asc | 16 ------------ tcsh-6.24.08.tar.gz | 3 +++ tcsh-6.24.08.tar.gz.asc | 16 ++++++++++++ tcsh.changes | 16 ++++++++++++ tcsh.spec | 4 +-- 9 files changed, 63 insertions(+), 58 deletions(-) delete mode 100644 tcsh-6.24.07.tar.gz delete mode 100644 tcsh-6.24.07.tar.gz.asc create mode 100644 tcsh-6.24.08.tar.gz create mode 100644 tcsh-6.24.08.tar.gz.asc diff --git a/tcsh-6.17.06-dspmbyte.dif b/tcsh-6.17.06-dspmbyte.dif index a63de14..0a0ffba 100644 --- a/tcsh-6.17.06-dspmbyte.dif +++ b/tcsh-6.17.06-dspmbyte.dif @@ -7,7 +7,7 @@ --- sh.c +++ sh.c 2021-04-27 07:35:35.059651991 +0000 -@@ -863,9 +863,9 @@ main(int argc, char **argv) +@@ -865,9 +865,9 @@ main(int argc, char **argv) /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */ #if defined(DSPMBYTE) #if defined(NLS) && defined(LC_CTYPE) diff --git a/tcsh-6.18.03-colorls.dif b/tcsh-6.18.03-colorls.dif index bd55a24..4f3ca0a 100644 --- a/tcsh-6.18.03-colorls.dif +++ b/tcsh-6.18.03-colorls.dif @@ -1,18 +1,27 @@ --- - tw.color.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + tw.color.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) --- tw.color.c -+++ tw.color.c 2021-11-11 11:00:40.989284076 +0000 -@@ -85,6 +85,7 @@ static Variable variables[] = { - VAR(NOS, "hl", "44;37"), /* Reg file extra hard links, obsolete? */ - VAR(NOS, "mh", "44;37"), /* Reg file extra hard links */ - VAR(NOS, "ca", "30;41"), /* File with capability */ -+ VAR(NOS, "cl", ""), /* CLRTOEOL */ ++++ tw.color.c 2023-04-11 10:36:56.030561276 +0000 +@@ -56,7 +56,7 @@ typedef struct { + typedef enum { + Vdi, Vln, Vor, Vpi, Vso, Vdo, Vbd, Vcd, + Vex, Vfi, Vno, Vmi, Vlc, Vrc, Vec, Vsu, +- Vsg, Vtw, Vow, Vst, Vrs, Vhl, Vmh, Vca, ++ Vsg, Vtw, Vow, Vst, Vrs, Vhl, Vmh, Vca, Vcl, + } VARINDEX; + + typedef struct { +@@ -100,6 +100,7 @@ static Variable variables[] = { + VAR(Vhl, CV_NONE, "hl", ""), /* Obsolete, use mh */ + VAR(Vmh, CV_HARD, "mh", ""), /* Regular file with multiple hard links */ + VAR(Vca, CV_NONE, "ca", ""), /* File with capability. Not implemented. */ ++ VAR(Vcl, CV_NONE, "cl", ""), /* CLRTOEOL */ }; #define nvariables (sizeof(variables)/sizeof(variables[0])) -@@ -324,7 +325,7 @@ parseLS_COLORS(const Char *value) +@@ -362,7 +363,7 @@ parseLS_COLORS(const Char *value) size_t i, len; const Char *v; /* pointer in value */ char *c; /* pointer in colors */ @@ -21,7 +30,7 @@ jmp_buf_t osetexit; size_t omark; -@@ -381,16 +382,14 @@ parseLS_COLORS(const Char *value) +@@ -419,16 +420,14 @@ parseLS_COLORS(const Char *value) if ((Char)variables[i].variable[0] == (v[0] & CHAR) && (Char)variables[i].variable[1] == (v[1] & CHAR)) break; @@ -29,9 +38,9 @@ if (i < nvariables) { - v += 3; getstring(&c, &v, &variables[i].color, ':'); - if (i == VSym) - color_as_referent = strcasecmp( - variables[VSym].color.s, "target") == 0; + if (i == Vln) + color_as_referent = Str_equal_literal( + &variables[Vln].color, "target"); continue; } - else @@ -39,23 +48,3 @@ } break; } -@@ -449,12 +448,13 @@ print_color(const Char *fname, size_t le - break; - } - if (i == nvariables) { -- for (i = 0; i < nextensions; i++) -- if (len >= extensions[i].extension.len -- && strncmp(last - extensions[i].extension.len, -- extensions[i].extension.s, -- extensions[i].extension.len) == 0) { -- colorp = &extensions[i].color; -+ int j; -+ for (j = 0; j < nextensions; j++) -+ if (len >= extensions[j].extension.len -+ && strncmp(last - extensions[j].extension.len, -+ extensions[j].extension.s, -+ extensions[j].extension.len) == 0) { -+ colorp = &extensions[j].color; - break; - } - } diff --git a/tcsh-6.21.00.dif b/tcsh-6.21.00.dif index 8702b29..e94e399 100644 --- a/tcsh-6.21.00.dif +++ b/tcsh-6.21.00.dif @@ -119,7 +119,7 @@ --- sh.c +++ sh.c 2021-04-27 07:41:53.192829973 +0000 -@@ -1346,6 +1346,9 @@ main(int argc, char **argv) +@@ -1348,6 +1348,9 @@ main(int argc, char **argv) setintr = osetintr; parintr = oparintr; } @@ -172,7 +172,7 @@ #endif /* SYSMALLOC */ --- tc.func.c +++ tc.func.c 2021-04-27 07:41:53.196829900 +0000 -@@ -739,9 +739,13 @@ auto_lock(void) +@@ -743,9 +743,13 @@ auto_lock(void) handle_pending_signals(); errno = 0; } @@ -187,7 +187,7 @@ #else -@@ -1957,7 +1961,7 @@ getremotehost(int dest_fd) +@@ -1961,7 +1965,7 @@ getremotehost(int dest_fd) * have not caught up yet. */ addr.s_addr = inet_addr(name); diff --git a/tcsh-6.24.07.tar.gz b/tcsh-6.24.07.tar.gz deleted file mode 100644 index 6f09993..0000000 --- a/tcsh-6.24.07.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74e4e9805cbd9413ed34b4ffa1d72fc8d0ef81a5b79476854091416ce9336995 -size 946889 diff --git a/tcsh-6.24.07.tar.gz.asc b/tcsh-6.24.07.tar.gz.asc deleted file mode 100644 index 7dc1852..0000000 --- a/tcsh-6.24.07.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmOjYmYACgkQZcJuRx9F -sSPENQ/9ERRyohkmePIjVt/iaztIJtdtVOXuzRFrEoSohC8iOPSprVl6qjJt5sFh -1e92eelR/Uf1x/KL2dwUHrT7HwMIcu5GXBleSFkHoMkOIo/zzjMA6eDc6IzI+iwQ -t7dPNTSq71EOKhQElzLc31reha6r/XODKXkR2i7y8RjdvzfiyrWPs3pWsHrVcorB -/d8cfx2cRCCs7MC+RpUWKjAjwhrwuPTh0ZbUt0NdcYL4CowS/r99L7IlGZBafRt6 -kMrCjnZPmAiObI3saQQX/cj2L+90/2eGhMD/neN4iTPdo/ibJ8wv9sWm4WUQSjZ2 -QpZtF+HOPiQpk7kQg2X0hF/VE6/0yXqU3wNuOtoHYOuDvXD6fqhD5Bqqx4nL/o6S -mSycn8k+mQMKo38x8tS5yqeGonQXkSb56YRIc3TPMyBFPxaWDmnQLq0+E//r23m9 -xKX6akw2zCasVnv3+GYzCxbE9d7N9tjPIWYhuBum6Tm4m6sDZIjXJO/NuuhWy2lD -MZ7Agc5LJeGUj/jMrSixar8//wIW+veWy1ZRFLYZ84HtmnxIfdPSgRpXTjGzKS7y -vRiLI7ygPxYtsUmuzwOwKDYqDqaSfnN91p4wP7Vcg135S7R/3e7E+D5zzLQx+rzD -2YB0LOi/+JQAgXUFiBgC/eaPlZF6OUmd8E30AXC3sSAVHXZcDq4= -=9Q/z ------END PGP SIGNATURE----- diff --git a/tcsh-6.24.08.tar.gz b/tcsh-6.24.08.tar.gz new file mode 100644 index 0000000..a040ccf --- /dev/null +++ b/tcsh-6.24.08.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d07f1bc164faa6faf63dcf4f30d73eb8149df6de6f9ebfe7b47256234a6366ab +size 955091 diff --git a/tcsh-6.24.08.tar.gz.asc b/tcsh-6.24.08.tar.gz.asc new file mode 100644 index 0000000..91067ca --- /dev/null +++ b/tcsh-6.24.08.tar.gz.asc @@ -0,0 +1,16 @@ +-----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----- diff --git a/tcsh.changes b/tcsh.changes index d127dbc..0bc77fc 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Apr 11 09:52:13 UTC 2023 - Dr. Werner Fink + +- Update too 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) + * Fix LSCOLORS bold/bright color support, add to manual (Luke Mewburn) + * Implement CLICOLOR_FORCE (Luke Mewburn) + * On startup, use LS_COLORS in preference to LSCOLORS (Luke Mewburn) + * Improve color ls-F documentation (Luke Mewburn) +- Port patches + * tcsh-6.17.06-dspmbyte.dif + * tcsh-6.18.03-colorls.dif + * tcsh-6.21.00.dif + ------------------------------------------------------------------- Wed Dec 28 09:52:59 UTC 2022 - Dirk Müller diff --git a/tcsh.spec b/tcsh.spec index c06bfb6..128ebce 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -1,7 +1,7 @@ # # spec file for package tcsh # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: tcsh -Version: 6.24.07 +Version: 6.24.08 Release: 0 Summary: The C SHell License: BSD-3-Clause