Accepting request 1291947 from shells

- Update to tcsh 6.24.16 - 2025-07-09
  * Use $+ instead of $^ in nls/Makefile.in
    NetBSD make added support for $^ per POSIX, so it no longer expands to
    an empty string, which breaks the rules.  It does not define $+, so we
    can use that instead for GNU make.
    A proper fix would be to detect the make flavor used, and build rules
    appropriate for each flavor.  Listing all the dependencies is not
    practical (in the rules involving multiple set files).

OBS-URL: https://build.opensuse.org/request/show/1291947
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=104

bindkey.tcsh

@@ -31,17 +31,6 @@ bindkey    "^[[3~"		delete-char
 bindkey    "^[[4~"		end-of-line
 bindkey    "^[[5~"		history-search-backward
 bindkey    "^[[6~"		history-search-forward
-if ( ${?MC_SID} == 0 ) then
-	#
-	# Those bindings interfere with Midnight Commander
-	#
-	bindkey    "^M[1~"	beginning-of-line
-	bindkey    "^M[2~"	yank
-	bindkey    "^M[3~"	delete-char
-	bindkey    "^M[4~"	end-of-line
-	bindkey    "^M[5~"	history-search-backward
-	bindkey    "^M[6~"	history-search-forward
-endif
 bindkey -r "\233"
 bindkey    "\2331~"		beginning-of-line
 bindkey    "\2332~"		yank

tcsh-6.18.03-catalogs.dif

@@ -14,117 +14,117 @@
 +INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh
 +${localedir}/C/LC_MESSAGES/tcsh:	C.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
 -${localedir}/et/LC_MESSAGES/tcsh.cat:	et.cat
 +INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh
 +${localedir}/et/LC_MESSAGES/tcsh:	et.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
 -${localedir}/fi/LC_MESSAGES/tcsh.cat:	finnish.cat
 +INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh
 +${localedir}/fi/LC_MESSAGES/tcsh:	finnish.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
 -${localedir}/fr/LC_MESSAGES/tcsh.cat:	french.cat
 +INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh
 +${localedir}/fr/LC_MESSAGES/tcsh:	french.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
 -${localedir}/de/LC_MESSAGES/tcsh.cat:	german.cat
 +INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh
 +${localedir}/de/LC_MESSAGES/tcsh:	german.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/el/LC_MESSAGES/tcsh.cat
 -${localedir}/el/LC_MESSAGES/tcsh.cat:	greek.cat
 +INSTALLED+=${localedir}/el_GR/LC_MESSAGES/tcsh
 +${localedir}/el_GR/LC_MESSAGES/tcsh:	greek.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
 -${localedir}/it/LC_MESSAGES/tcsh.cat:	italian.cat
 +INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh
 +${localedir}/it/LC_MESSAGES/tcsh:	italian.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
 -${localedir}/ja/LC_MESSAGES/tcsh.cat:	ja.cat
 +INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh
 +${localedir}/ja/LC_MESSAGES/tcsh:	ja.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
 -${localedir}/pl/LC_MESSAGES/tcsh.cat:	pl.cat
 +INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh
 +${localedir}/pl/LC_MESSAGES/tcsh:	pl.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
 -${localedir}/ru/LC_MESSAGES/tcsh.cat:	russian.cat
 +INSTALLED+=${localedir}/ru_RU/LC_MESSAGES/tcsh
 +${localedir}/ru_RU/LC_MESSAGES/tcsh:	russian.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
 -${localedir}/es/LC_MESSAGES/tcsh.cat:	spanish.cat
 +INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh
 +${localedir}/es/LC_MESSAGES/tcsh:	spanish.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
  spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
- 	@${CATGEN} $(GENCAT) $@ $^ $>
+ 	@${CATGEN} $(GENCAT) $@ $+ $>
  
 -INSTALLED+=${localedir}/ru_UA/LC_MESSAGES/tcsh.cat
 -${localedir}/ru_UA/LC_MESSAGES/tcsh.cat:	ukrainian.cat
 +INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh
 +${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh:	ukrainian.cat
  	$(MKDIR_P) $(@D)
- 	$(INSTALL_DATA) $> $^ $@
+ 	$(INSTALL_DATA) $> $+ $@
  
 --- sh.c
 +++ sh.c	2022-01-11 15:13:07.548063798 +0000

tcsh-6.21.00.dif

@@ -1,44 +1,20 @@
 ---
- system/linux |   10 ++++++++++
+ config_f.h   |   11 ++++++++---
- config_f.h   |    9 +++++++--
  glob.h       |    3 ++-
  host.defs    |    9 +++------
  pathnames.h  |    2 +-
  sh.c         |    3 +++
+ system/linux |   10 ++++++++++
  tc.alloc.c   |   10 ++++++----
  tc.func.c    |    8 ++++++--
  tc.str.c     |    2 +-
  tc.who.c     |    3 +++
  tcsh.man.in  |    2 +-
  tw.h         |    4 ++++
- 12 files changed, 47 insertions(+), 18 deletions(-)
+ 12 files changed, 48 insertions(+), 19 deletions(-)
 
---- system/linux
-+++ system/linux	2021-04-27 07:41:53.192829973 +0000
-@@ -99,6 +99,9 @@
- #ifndef _SVID_SOURCE
- # define _SVID_SOURCE
- #endif
-+#ifndef _DEFAULT_SOURCE
-+# define _DEFAULT_SOURCE
-+#endif
- #ifndef _POSIX_SOURCE
- # define _POSIX_SOURCE
- #endif
-@@ -139,4 +142,11 @@
- # define POSIX
- #endif
- 
-+#if !defined(PW_SHADOW)
-+# define PW_SHADOW
-+#endif
-+#if !defined(SuSE)
-+# define SuSE
-+#endif
-+
- #endif /* _h_config */
 --- config_f.h
-+++ config_f.h	2021-04-27 07:41:53.192829973 +0000
++++ config_f.h	2024-11-28 09:55:11.062052907 +0000
 @@ -72,7 +72,12 @@
  /*
   * LOGINFIRST   Source ~/.login before ~/.cshrc
@@ -63,7 +39,7 @@
  /*
   * COLOR_LS_F Do you want to use builtin color ls-F ?
 --- glob.h
-+++ glob.h	2021-04-27 07:41:53.192829973 +0000
++++ glob.h	2024-11-28 09:54:10.575159476 +0000
 @@ -72,6 +72,7 @@ typedef struct {
  #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
  
@@ -82,7 +58,7 @@
  int	glob (const char *, int, int (*)(const char *, int), glob_t *);
  void	globfree (glob_t *);
 --- host.defs
-+++ host.defs	2021-05-28 09:44:03.337584826 +0000
++++ host.defs	2024-11-28 09:54:10.575159476 +0000
 @@ -189,9 +189,8 @@ static void populate(void)
  #endif
  	}
@@ -107,7 +83,7 @@
      machtype = "unknown";
  #endif
 --- pathnames.h
-+++ pathnames.h	2021-04-27 07:41:53.192829973 +0000
++++ pathnames.h	2024-11-28 09:54:10.575159476 +0000
 @@ -83,7 +83,7 @@
  # endif /* !_PATH_DOTLOGIN */
  #endif /* sgi || OREO || cray || AMIX || CDC */
@@ -118,7 +94,7 @@
  #endif /* _CRAYCOM && !_PATH_TCSHELL */
  
 --- sh.c
-+++ sh.c	2021-04-27 07:41:53.192829973 +0000
++++ sh.c	2024-11-28 09:54:10.579159403 +0000
 @@ -1348,6 +1348,9 @@ main(int argc, char **argv)
  	    setintr = osetintr;
  	    parintr = oparintr;
@@ -129,8 +105,32 @@
  #ifdef LOGINFIRST
  	if (loginsh)
  	    (void) srccat(varval(STRhome), STRsldotlogin);
+--- system/linux
++++ system/linux	2024-11-28 09:54:10.575159476 +0000
+@@ -99,6 +99,9 @@
+ #ifndef _SVID_SOURCE
+ # define _SVID_SOURCE
+ #endif
++#ifndef _DEFAULT_SOURCE
++# define _DEFAULT_SOURCE
++#endif
+ #ifndef _POSIX_SOURCE
+ # define _POSIX_SOURCE
+ #endif
+@@ -139,4 +142,11 @@
+ # define POSIX
+ #endif
+ 
++#if !defined(PW_SHADOW)
++# define PW_SHADOW
++#endif
++#if !defined(SuSE)
++# define SuSE
++#endif
++
+ #endif /* _h_config */
 --- tc.alloc.c
-+++ tc.alloc.c	2021-04-27 07:41:53.192829973 +0000
++++ tc.alloc.c	2024-11-28 09:54:10.579159403 +0000
 @@ -518,7 +518,7 @@ smalloc(size_t n)
  {
      ptr_t   ptr;
@@ -171,7 +171,7 @@
  
  #endif /* SYSMALLOC */
 --- tc.func.c
-+++ tc.func.c	2021-04-27 07:41:53.196829900 +0000
++++ tc.func.c	2024-11-28 09:54:10.579159403 +0000
 @@ -743,9 +743,13 @@ auto_lock(void)
  	    handle_pending_signals();
  	    errno = 0;
@@ -187,7 +187,7 @@
  
  #else
  
-@@ -1965,7 +1965,7 @@ getremotehost(int dest_fd)
+@@ -1965,7 +1969,7 @@ getremotehost(int dest_fd)
  	     * have not caught up yet.
  	     */
  	    addr.s_addr = inet_addr(name);
@@ -197,7 +197,7 @@
  	    else {
  		if (sptr != name) {
 --- tc.str.c
-+++ tc.str.c	2021-04-27 07:41:53.196829900 +0000
++++ tc.str.c	2024-11-28 09:54:10.579159403 +0000
 @@ -347,7 +347,7 @@ s_strlen(const Char *str)
  {
      size_t n;
@@ -208,7 +208,7 @@
      return (n);
  }
 --- tc.who.c
-+++ tc.who.c	2021-04-27 07:41:53.196829900 +0000
++++ tc.who.c	2024-11-28 09:54:10.579159403 +0000
 @@ -259,6 +259,9 @@ watch_login(int force)
      }
      stlast = sta.st_mtime;
@@ -220,7 +220,7 @@
  #else
      if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
 --- tcsh.man.in
-+++ tcsh.man.in	2021-04-27 07:41:53.196829900 +0000
++++ tcsh.man.in	2024-11-28 09:54:10.579159403 +0000
 @@ -1012,7 +1012,7 @@ much like
  .Ic history-search-backward
  does.
@@ -231,7 +231,7 @@
  See also
  .Ic delete-char-or-list-or-eof .
 --- tw.h
-+++ tw.h	2021-04-27 07:41:53.196829900 +0000
++++ tw.h	2024-11-28 09:54:10.579159403 +0000
 @@ -32,6 +32,10 @@
  #ifndef _h_tw
  #define _h_tw

tcsh-6.24.13.tar.gz

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

tcsh-6.24.13.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmZpN8wACgkQZcJuRx9F
-sSMckRAAoCbOtzFRvgiAKP8Nekec6vRdSAJUY56+4ppfgyA51amS7G8Yi1x4VP0a
-/QdeyQEU8CmVDXXsj9InGb3dlGnTutY6v9Am+Zixkt4A2yUg/DCAXcQjtB6G9YEU
-1mciICVuDCWs4Q+z8jn/MCE6Lif/gnc+Egwn2Pj3CxL+k2Cik1Qf6qpyV7MA0PPE
-1Dx4ofI44AHoTv9Dkcl477tDcKd8KBc5vOsnBLMaDBz5jcaL1/dQc6DWWRE5dGBv
-IuNr/LHHdjaBY/35jIyzCzzCeW5qCGnRYa44KNVZ27NdYjTH1lapZKKTS244Z4kB
-rv77NCoLnv0d2oZVveTATHKX9EPNLzFJWqALL7EpC2pWCD9KLvM8N0K4g96NBume
-2m6gUmZ+id+U6ImJA20jWa+L+3Z8OwkLoXoXQAC5jnPUthZxtVEsBfVOmytNA7B0
-t1dO6uZrcZUxEizw/ztYYF1K9sZ6SrYNZvFW2Pne1TyZTSlI6KVmDEQRjElqnJ4u
-R201PdB1XlC5nhQvBcuzkjg/Nxx9AOT9yMjUPapWHRt4fTJe3QmwjtLO3Yks7pR+
-lKpSF8fz4BoFlRoFFMVP0e+Umy4l9NGtUh0t9AmvGKIZPovcYWWYKSimR+m6BbUv
-JuIyx70pZpyWJcJ3WzLjeAJ9jb2XY3q1umQQjqr0UniRiuf3dIU=
-=E8Cm
------END PGP SIGNATURE-----

tcsh-6.24.16.tar.gz

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

tcsh-6.24.16.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmhuHUkACgkQZcJuRx9F
+sSOtnw/8DEFQi+/gfbuWmnHNCXKU4J2em4FIqjGkIvOYns28Rr9YPRczsogZRvqn
+6JInbRUpLaqICAWGcjjuWE5hGFX5Pr1E31n0s2gR35uVHmgQtHArIObuuACYWH5V
+6f7FkgGvtZMgTfuVlOxPH7R6zkFMxmyou8wLw56958DZlGMCDO95IwLPgsGIVqLS
+hqov7CDLRCOZ5emQSwja9oUIwEtSlE6RbcpBBv2z42biW4LbIhQEWMaAlQRWkWHc
+WRtVlm0/+4FHSjn+7q4EwZet6DOWbmkYi/Ww/drvfAJCKdDbX0yMiWdGcjC1MiKo
+JQDSS+vLRBj2DnkhJX2MWo2vWfJU1tLEOKx0z9G5jbtjfZdz0W4HALo31lqUwIUm
+gim14/dLls6tNRnjrAK2NeZb3WmXBrVZbPm16CjS82rIM+75qPY2Gi0FRlOMg9bP
+opth0DYD6BxYxHVt9KYu3l0Sf31NTzBAiK01/Gnsqw5ZowcoUF9gzCfI9nVEfJJS
+Mcd8+M/1i6SDIOXAEbtecuxRzUFOjlBnKUx/qnv12nn62Ysfrx986qDgzCEGp7nY
+WjwQR4W0v9ZO2gfPz9liILjeXSBhyzvqWCs/PDL0mzGJr3FbdP1kPZ9pNe82hGbz
+y6rEgSB2TkxmMG4Utr6F3k7+RShXqyo13bFoaB09bHDucKpGzvA=
+=GBfx
+-----END PGP SIGNATURE-----

tcsh.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Fri Jul 11 09:53:34 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh 6.24.16 - 2025-07-09
+  * Use $+ instead of $^ in nls/Makefile.in
+    NetBSD make added support for $^ per POSIX, so it no longer expands to
+    an empty string, which breaks the rules.  It does not define $+, so we
+    can use that instead for GNU make.
+    A proper fix would be to detect the make flavor used, and build rules
+    appropriate for each flavor.  Listing all the dependencies is not
+    practical (in the rules involving multiple set files).
+
+-------------------------------------------------------------------
+Fri Feb 14 11:33:30 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Do not interfere Meta with Carriage Return (boo#1170527)
+
+-------------------------------------------------------------------
+Wed Feb  5 07:25:17 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh 6.24.15 - 2025-02-04
+  * This release provides fixes for some compilation failures
+    introduced in the previous release
+- Port patch tcsh-6.21.00.dif means remove temporary fix now upstream
+
+-------------------------------------------------------------------
+Thu Nov 28 08:44:43 UTC 2024 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh 6.24.14 - 2024-11-26
+  * Fix issues with S-JIS handling (T. Nosaka)
+  * Handle redirections in bracketed expressions
+    if { foo > /dev/null } (christos)
+  * Recognize history searches in history expansion
+    !?foo<tab> (christos)
+
 -------------------------------------------------------------------
 Wed Jun 12 07:48:40 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

tcsh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tcsh
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 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.13
+Version:        6.24.16
 Release:        0
 Summary:        The C SHell
 License:        BSD-3-Clause
@@ -41,6 +41,7 @@ BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
 BuildRequires:  screen
 Requires:       gawk
+Requires:       hostname
 Requires:       textutils
 Recommends:     tcsh-lang = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build