Accepting request 931028 from shells

- Enable signature again as now Kimmo has provided his public key 

- Update to tcsh 6.23.00
  * Add "jobs -Z" to setproctitle(3)
  * Add ln=target in LS_COLORS
  * Add a :Q modifier that preserves empty arguments
- Port patches
  * tcsh-6.17.06-dspmbyte.dif
  * tcsh-6.18.03-colorls.dif
  * tcsh-6.21.00.dif
  * tcsh-6.22.02-local-dotlock.dif
- Disable signature as signed with unknown key

OBS-URL: https://build.opensuse.org/request/show/931028
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2021-11-13 21:48:22 +00:00 committed by Git OBS Bridge
commit 0e6ec97fca
11 changed files with 113 additions and 32 deletions

View File

@ -52,7 +52,7 @@
# endif /* SETLOCALEBUG */
--- sh.set.c
+++ sh.set.c 2021-04-27 07:38:12.412808424 +0000
@@ -1160,11 +1160,11 @@ update_dspmbyte_vars(void)
@@ -1163,11 +1163,11 @@ update_dspmbyte_vars(void)
dstr1 = vp->vec[0];
if (eq (dstr1, STRsjis))
iskcode = 1;
@ -66,7 +66,7 @@
iskcode = 4;
else if ((dstr1[0] - '0') >= 0 && (dstr1[0] - '0') <= 3) {
iskcode = 0;
@@ -1248,7 +1248,7 @@ update_dspmbyte_vars(void)
@@ -1251,7 +1251,7 @@ update_dspmbyte_vars(void)
_enable_mbdisp = 0;
dspmbyte_ls = 0;
}
@ -75,7 +75,7 @@
{
Char mbmapstr[300];
for (lp = 0; lp < 256; lp++)
@@ -1256,7 +1256,7 @@ update_dspmbyte_vars(void)
@@ -1259,7 +1259,7 @@ update_dspmbyte_vars(void)
mbmapstr[lp] = 0;
setcopy(STRmbytemap, mbmapstr, VAR_READWRITE);
}
@ -84,7 +84,7 @@
}
/* dspkanji/dspmbyte autosetting */
@@ -1265,6 +1265,7 @@ void
@@ -1268,6 +1268,7 @@ void
autoset_dspmbyte(const Char *pcp)
{
int i;
@ -92,7 +92,7 @@
static const struct dspm_autoset_Table {
Char *n;
Char *v;
@@ -1287,13 +1288,18 @@ autoset_dspmbyte(const Char *pcp)
@@ -1290,13 +1291,18 @@ autoset_dspmbyte(const Char *pcp)
#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
static const struct dspm_autoset_Table dspmc[] = {
{ STRstarutfstar8, STRutf8 },
@ -126,7 +126,7 @@
Char STRGB2312[] = { 'g', 'b', '2', '3', '1', '2', '\0' };
# ifdef MBYTEDEBUG /* Sorry, use for beta testing */
Char STRmbytemap[] = { 'm', 'b', 'y', 't', 'e', 'm', 'a', 'p', '\0' };
@@ -440,7 +442,7 @@ Char STRkilldup[] = { 'k', 'i', 'l', 'l
@@ -441,7 +443,7 @@ Char STRkilldup[] = { 'k', 'i', 'l', 'l
Char STRshlvl[] = { 's', 'h', 'l', 'v', 'l', '\0' };
Char STRKSHLVL[] = { 'S', 'H', 'L', 'V', 'L', '\0' };
Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' };

View File

@ -1,9 +1,9 @@
---
tw.color.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
tw.color.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- tw.color.c
+++ tw.color.c 2016-11-25 08:02:01.645250915 +0000
+++ 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 */
@ -12,7 +12,7 @@
};
#define nvariables (sizeof(variables)/sizeof(variables[0]))
@@ -323,7 +324,7 @@ parseLS_COLORS(const Char *value)
@@ -324,7 +325,7 @@ parseLS_COLORS(const Char *value)
size_t i, len;
const Char *v; /* pointer in value */
char *c; /* pointer in colors */
@ -21,24 +21,25 @@
jmp_buf_t osetexit;
size_t omark;
@@ -380,13 +381,10 @@ parseLS_COLORS(const Char *value)
@@ -381,16 +382,14 @@ parseLS_COLORS(const Char *value)
if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
(Char)variables[i].variable[1] == (v[1] & CHAR))
break;
- if (i < nvariables) {
- v += 3;
+ v += 3;
+ if (i < nvariables)
if (i < nvariables) {
- v += 3;
getstring(&c, &v, &variables[i].color, ':');
- continue;
- }
if (i == VSym)
color_as_referent = strcasecmp(
variables[VSym].color.s, "target") == 0;
continue;
}
- else
- stderror(ERR_BADCOLORVAR, v[0], v[1]);
+ continue;
}
break;
}
@@ -445,12 +443,13 @@ print_color(const Char *fname, size_t le
@@ -449,12 +448,13 @@ print_color(const Char *fname, size_t le
break;
}
if (i == nvariables) {

View File

@ -187,7 +187,7 @@
#else
@@ -1937,7 +1941,7 @@ getremotehost(int dest_fd)
@@ -1939,7 +1943,7 @@ getremotehost(int dest_fd)
* have not caught up yet.
*/
addr.s_addr = inet_addr(name);
@ -221,7 +221,7 @@
if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
--- tcsh.man
+++ tcsh.man 2021-04-27 07:41:53.196829900 +0000
@@ -602,7 +602,7 @@ Repeating \fIdabbrev-expand\fR without a
@@ -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

View File

@ -172,7 +172,7 @@ Avoid left over dot lock file after reboot
#endif /* #ifndef _DOTLOCK_H_ */
--- sh.hist.c
+++ sh.hist.c 2020-02-19 09:48:57.640589111 +0000
@@ -1219,9 +1219,11 @@ fmthist(int fmt, ptr_t ptr)
@@ -1230,9 +1230,11 @@ fmthist(int fmt, ptr_t ptr)
}
static void
@ -186,7 +186,7 @@ Avoid left over dot lock file after reboot
}
/* Save history before exiting the shell. */
@@ -1300,11 +1302,12 @@ rechist(Char *fname, int ref)
@@ -1311,11 +1313,12 @@ rechist(Char *fname, int ref)
jmp_buf_t osetexit;
if (lock) {
#ifndef WINNT_NATIVE

View File

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

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAmCG8OgACgkQcREqsWyzOzpG9gCfamrA+lSmiEOdpSe2VhLDf53K
PQIAoMv2/YXJONISwE0uUGXyI6MpB0tr
=Rw/9
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmGM7eYACgkQZcJuRx9F
sSNxYBAAjGoOXnrXdGzIXTGt+0TWgn9wj1p65I5BiSRlaBhlsjW6LXWMzTJ0s9ct
nuEmdPunU4xea/OStfxlDmgV1ypxIsllwHyJ+XEVINqn3Ilq0RGgY1/mjmXoMBxX
P+80OI6rhyqWDcixwdJrcjCZTO3Q/sErKCfQfKBXRxp9a6uO8ilgzZvALZPmW+zG
v3Hg5RhcGlud34Yrr62GoOmddzWDA4AYuyBn0Xjx6Czw+VZYK6tnRIKm9uwJqghd
K88maAXiB6Qp6o1JUnTog65xlS4CUdixhY7oyyqYJag6mPfnh0ig2QfARq+3PhjM
axRc72P4paE0U19w72mx3fjwdJeXgBMg2s1ijmDO1g1SEKAB/8EJZY3ZDp7niUS8
Dd2lyKFdrqzCHcAkFmcQpGRof6ZwMEjlST8pGBgLp3VvXiOh8vFwRKoI5hLr8Rwq
RjyBVo2IW8Lx23qxF15hij5BEHSYnA0F9bbJmnXAXsf/0Ox+Wm3ikvN/4XqkRRAx
4X+QQh4BK7ljIk6StDl+jQngH9mfftV7G4frTzZZhOA1LFAjt2F+LJUYYmEKSZfr
F75FHtHtmlUpsIya+DzrTZan3zGJoy2ow0zIy3JK2V3Yv6pHAmsw/QR1p+UtC7BK
OnO7B+g7xOyTTr49m+tcWjjvQ8O7Hf46lZqMKb23vnXHoVLZbyE=
=4DgN
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Nov 12 07:28:43 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Enable signature again as now Kimmo has provided his public key
-------------------------------------------------------------------
Thu Nov 11 13:23:13 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Update to tcsh 6.23.00
* Add "jobs -Z" to setproctitle(3)
* Add ln=target in LS_COLORS
* Add a :Q modifier that preserves empty arguments
- Port patches
* tcsh-6.17.06-dspmbyte.dif
* tcsh-6.18.03-colorls.dif
* tcsh-6.21.00.dif
* tcsh-6.22.02-local-dotlock.dif
- Disable signature as signed with unknown key
-------------------------------------------------------------------
Wed Aug 4 12:24:25 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -41,3 +41,54 @@ AgAPAhsMBQJXtGxGBQkiRZ0QAAoJEHERKrFsszs6IlQAnjLT4D/+k6uneuOjbxTK
3fhT6pGrAJ42qJm0ptKqlSBwuYo2Ci36ZIQCaQ==
=IJYi
-----END PGP PUBLIC KEY BLOCK-----
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=+OYc
-----END PGP PUBLIC KEY BLOCK-----

View File

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