Update to tcsh 6.22.04

OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=113

tcsh-6.16.00-norm-cmd.dif

@@ -1,5 +1,9 @@
+---
+ ed.defns.c |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
 --- ed.defns.c
-+++ ed.defns.c	2007-08-28 10:02:42.862588122 +0000
++++ ed.defns.c	2021-04-27 07:32:34.710964878 +0000
 @@ -1404,16 +1404,6 @@ editinit(void)
      f->desc = CSAVS(3, 52, "Execute command");
  
@@ -16,7 +20,7 @@
 -    f++;
      f->name = "normalize-path";
      f->func = F_PATH_NORM;
-     f->desc = CSAVS(3, 53, 
+     f->desc = CSAVS(3, 53,
 @@ -1768,6 +1758,16 @@ editinit(void)
      f->desc = CSAVS(3, 121, "(WIN32 only) Page visible console window down");
  

tcsh-6.17.06-dspmbyte.dif

@@ -6,7 +6,7 @@
  4 files changed, 22 insertions(+), 15 deletions(-)
 
 --- sh.c
-+++ sh.c	2016-11-25 08:02:39.616478025 +0000
++++ sh.c	2021-04-27 07:35:35.059651991 +0000
 @@ -863,9 +863,9 @@ main(int argc, char **argv)
      /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */
  #if defined(DSPMBYTE)
@@ -20,7 +20,7 @@
      {
  	autoset_dspmbyte(str2short(tcp));
 --- sh.func.c
-+++ sh.func.c	2016-11-25 08:02:39.616478025 +0000
++++ sh.func.c	2021-04-27 07:36:57.210162751 +0000
 @@ -1420,14 +1420,6 @@ dosetenv(Char **v, struct command *c)
      }
  #endif /* apollo */
@@ -28,7 +28,7 @@
 -    /* dspkanji/dspmbyte autosetting */
 -    /* PATCH IDEA FROM Issei.Suzuki VERY THANKS */
 -#if defined(DSPMBYTE)
--    if(eq(vp, STRLANG) && !adrof(CHECK_MBYTEVAR)) {
+-    if (eq(vp, STRLANG) && !adrof(CHECK_MBYTEVAR)) {
 -	autoset_dspmbyte(lp);
 -    }
 -#endif
@@ -51,10 +51,10 @@
  	dont_free = 0;
  # endif /* SETLOCALEBUG */
 --- sh.set.c
-+++ sh.set.c	2016-11-25 08:02:39.616478025 +0000
++++ sh.set.c	2021-04-27 07:38:12.412808424 +0000
 @@ -1160,11 +1160,11 @@ update_dspmbyte_vars(void)
  	dstr1 = vp->vec[0];
- 	if(eq (dstr1, STRsjis))
+ 	if (eq (dstr1, STRsjis))
  	    iskcode = 1;
 -	else if (eq(dstr1, STReuc))
 +	else if (eq(dstr1, STReuc) || eq(dstr1, STReucjp) || eq(dstr1, STRGB2312))
@@ -112,7 +112,7 @@
      if (*codeset != '\0') {
  	for (i = 0; dspmc[i].n; i++) {
 --- tc.const.c
-+++ tc.const.c	2016-11-25 08:02:39.616478025 +0000
++++ tc.const.c	2021-04-27 07:35:35.059651991 +0000
 @@ -130,10 +130,12 @@ Char STRmmliteral[]	= { '-', 'G', '\0' }
  Char STRmmliteral[]	= { '-', '-', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\0' };
  # endif

tcsh-6.18.03-colorls.dif

@@ -12,7 +12,7 @@
  };
  
  #define nvariables (sizeof(variables)/sizeof(variables[0]))
-@@ -321,7 +322,7 @@ parseLS_COLORS(const Char *value)
+@@ -323,7 +324,7 @@ parseLS_COLORS(const Char *value)
      size_t  i, len;
      const Char	 *v;		/* pointer in value */
      char   *c;			/* pointer in colors */
@@ -21,7 +21,7 @@
      jmp_buf_t osetexit;
      size_t omark;
  
-@@ -378,13 +379,10 @@ parseLS_COLORS(const Char *value)
+@@ -380,13 +381,10 @@ parseLS_COLORS(const Char *value)
  			if ((Char)variables[i].variable[0] == (v[0] & CHAR) &&
  			    (Char)variables[i].variable[1] == (v[1] & CHAR))
  			    break;
@@ -38,7 +38,7 @@
  		}
  		break;
  	    }
-@@ -443,12 +441,13 @@ print_color(const Char *fname, size_t le
+@@ -445,12 +443,13 @@ print_color(const Char *fname, size_t le
  		break;
  	    }
  	if (i == nvariables) {

tcsh-6.22.02-local-dotlock.dif

@@ -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
-@@ -1209,9 +1209,11 @@ fmthist(int fmt, ptr_t ptr)
+@@ -1219,9 +1219,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. */
-@@ -1288,11 +1290,12 @@ rechist(Char *fname, int ref)
+@@ -1300,11 +1302,12 @@ rechist(Char *fname, int ref)
  	    jmp_buf_t osetexit;
  	    if (lock) {
  #ifndef WINNT_NATIVE

tcsh-6.22.03-unintentional.patch

@@ -1,48 +0,0 @@
-Subject: Re: [Tcsh] change in head/tail handling in tcsh-6.22.03
-Return-Path: <tcsh-bounces@astron.com>
-In-Reply-To: <CMM.0.95.0.1606054208.beebe@gamma.math.utah.edu>
-X-Mailer: Apple Mail (2.3654.20.0.2.21)
-Sender: Tcsh <tcsh-bounces@astron.com>
-
-It was unintentional so a bug...
-
-christos
-
----
- sh.lex.c         |    2 +-
- tests/lexical.at |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sh.lex.c b/sh.lex.c
---- a/sh.lex.c
-+++ b/sh.lex.c
-@@ -1046,7 +1046,7 @@ domod(Char *cp, Char type)
-     case 't':
- 	wp = Strrchr(cp, '/');
- 	if (wp == NULL)
--	    return Strsave(type == 't' ? cp : STRNULL);
-+	    return NULL;
- 	if (type == 't')
- 	    xp = Strsave(wp + 1);
- 	else
-diff --git a/tests/lexical.at b/tests/lexical.at
---- a/tests/lexical.at
-+++ b/tests/lexical.at
-@@ -677,7 +677,7 @@ AT_CHECK([tcsh -f colon_r_no_extension.c
- 
- AT_CLEANUP
- 
--AT_SETUP([$x:q:h does not cause out of memory crash and yields nothing])
-+AT_SETUP([$x:q:h does not cause out of memory crash and yields the full string])
- 
- AT_DATA([x_colon_q_colon_h.csh],
- [[set x='a/b c/d.e'
-@@ -686,7 +686,7 @@ exit 0
- ]])
- 
- AT_CHECK([tcsh -f x_colon_q_colon_h.csh], 0,
--[
-+[a/b c/d.e
- ])
- 
- AT_CLEANUP

tcsh-6.22.03.tar.gz

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

tcsh-6.22.04.tar.gz

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

tcsh-6.22.04.tar.gz.asc

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

tcsh.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Apr 27 07:43:18 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh bug fix version V6.22.04 - 20210426
+  * Don't crash with 'bindkey "^0" clear-screen' (Karl Jeacle)
+  * Fix $x:q:h and $x:q:t return the whole string for strings
+    not containing /
+- Port patches
+  * tcsh-6.16.00-norm-cmd.dif
+  * tcsh-6.17.06-dspmbyte.dif
+  * tcsh-6.18.03-colorls.dif
+  * tcsh-6.22.02-local-dotlock.dif
+- Delete patch now upstream fixed
+  * tcsh-6.22.03-unintentional.patch
+- Add keyring and signature
+  * tcsh-6.22.04.tar.gz.asc
+  * tcsh.keyring
+
 -------------------------------------------------------------------
 Thu Apr 22 10:32:44 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 

tcsh.keyring

@@ -0,0 +1,43 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+3fhT6pGrAJ42qJm0ptKqlSBwuYo2Ci36ZIQCaQ==
+=IJYi
+-----END PGP PUBLIC KEY BLOCK-----

tcsh.spec

@@ -17,15 +17,17 @@
 
 
 Name:           tcsh
-Version:        6.22.03
+Version:        6.22.04
 Release:        0
 Summary:        The C SHell
 License:        BSD-3-Clause
 Group:          System/Shells
 URL:            http://www.tcsh.org/
-Source:         ftp.astron.com:/pub/%{name}/%{name}-%{version}.tar.gz
+Source0:        ftp.astron.com:/pub/%{name}/%{name}-%{version}.tar.gz
+Source1:        ftp.astron.com:/pub/%{name}/%{name}-%{version}.tar.gz.asc
 Source2:        bindkey.tcsh
 Source3:        complete.tcsh
+Source4:        tcsh.keyring
 Patch0:         tcsh-6.21.00.dif
 Patch1:         tcsh-6.15.00-pipe.dif
 Patch2:         tcsh-6.16.00-norm-cmd.dif
@@ -33,7 +35,6 @@ Patch4:         tcsh-6.18.03-colorls.dif
 Patch5:         tcsh-6.17.06-dspmbyte.dif
 Patch6:         tcsh-6.18.03-catalogs.dif
 Patch8:         tcsh-6.22.02-local-dotlock.dif
-Patch9:         tcsh-6.22.03-unintentional.patch
 BuildRequires:  autoconf
 BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
@@ -60,7 +61,6 @@ correction, a history mechanism, job control, and a C-like syntax.
 %patch5      -b .dspmbyte
 %patch6      -b .catalogs
 %patch8 -p 0 -b .dotlock
-%patch9 -p 1 -b .unint
 %patch0      -b .0
 
 %build