Accepting request 1038210 from shells

- Update to tcsh 6.24.02
  7. V6.24.02 - 20221124
  6. Complete mdoc-based manual page (Luke Mewburn)
  5. Fix rechist() check for NULL filename (broke when arg was renamed).
       > cd
       > rm .history
       > unset savehist
       > history -S /tmp/s
       > exit
     A ~/.history has been written when it should not have been.
  4. Make OpenBSD use SHORT_STRINGS and fix non-SHORT_STRINGS compilation.
- Delete patch tcsh-6.24.01-bash52.dif now upstream
- Correct offset and port patches
  * tcsh-6.21.00.dif
  * tcsh-6.22.02-local-dotlock.dif
- Enhance completion for man command

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

complete.tcsh

@@ -29,9 +29,9 @@
     set _ypdir  =  /var/yp
     set _domain =  "`domainname`"
     if ($?MANPATH) then
-	set _manpath="{${MANPATH:as/:/,/}}/{man,cat}"
+	set _manpath="{${MANPATH:as/:/,/}}/man"
     else
-	set _manpath="/usr{{/X11/man,/openwin/man}/{man,cat},{/man/{man,cat}}}"
+	set _manpath="/usr{{/X11/man,/openwin/man,/share/man}/{man,cat},{/man/{man,cat}}}"
     endif
 if ( -d /usr/lib/ispell/ ) then
     set _hash=(`\ls -1fUA /usr/lib/ispell/|&\sed -rn \\%.\*\\.hash%{s%\.hash%%p}`)
@@ -700,11 +700,11 @@ skip_mh:
 			n@-u@T:$_maildir@ n/-f/f/ n/*/u/
     endif
 
-
-    complete man	n@[0-9n]@'`\ls -1fUA ${_manpath}$:-1/|&\sed \\%.\*:%d\;s%\\.$:-1.\*\$%%|\sort -u`'@ \
-			c/-/"(- f k s t l)"/ n/-f/c/ n/-k/x:'<keyword>'/ n/-l/f/ C@./*@f@ n/*/c/
-    unset _manpath
-
+    complete man	'n@[0-9n]@`\ls -1fUA ${_manpath}$:-1/|&\sed \\%.\*:%d\;s%\\.$:-1.\*\$%%|\sort -u`@' \
+			c@-@"(- f k M P s S t)"@ n@-f@c@ n@-k@x:'<keyword>'@ n/-l/f/ C@./*@f@ n@-[MP]@d@    \
+			'N@-[MP]@`\ls -1 $:-1/man? |&\sed -n s%\\..\\+\$%%p`@' \
+			'n@-[sS]@`\ls -1 ${_manpath:h}|&\sed -n s%man%%p|\sort -u`@' \
+			'n@*@`\find ${_manpath:h} \( -type f -o -type l \) -printf "%f\n"|&\sed -r "\%find:.*:%d;s%([^.]+).([^ ]*?)%\1%g"|\sort -u`@'
     complete ps		c/-t/x:'<tty>'/ c/-/"(a c C e g k l S t u v w x)"/ \
 			n/-k/x:'<kernel>'/ N/-k/x:'<core_file>'/ n/*/x:'<PID>'/
     complete compress	c/-/"(c f v b)"/ n/-b/x:'<max_bits>'/ n/*/f:^*.Z/

tcsh-6.21.00.dif

@@ -39,7 +39,7 @@
  #endif /* _h_config */
 --- config_f.h
 +++ config_f.h	2021-04-27 07:41:53.192829973 +0000
-@@ -74,7 +74,12 @@
+@@ -72,7 +72,12 @@
  /*
   * LOGINFIRST   Source ~/.login before ~/.cshrc
   */
@@ -53,7 +53,7 @@
  
  /*
   * VIDEFAULT    Make the VI mode editor the default
-@@ -168,7 +173,7 @@
+@@ -166,7 +171,7 @@
   *		successful, set $REMOTEHOST to the name or address of the
   *		host
   */
@@ -221,15 +221,15 @@
      if ((utmpfd = xopen(TCSH_PATH_UTMP, O_RDONLY|O_LARGEFILE)) < 0) {
 --- tcsh.man
 +++ tcsh.man	2021-04-27 07:41:53.196829900 +0000
-@@ -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
--.B delete-char \fR(not bound)
-+.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR)
+@@ -1001,7 +1001,7 @@ much like
+ .Ic history-search-backward
+ does.
+ .
+-.It Ic delete-char No (not bound)
++.It Ic delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR)
  Deletes the character under the cursor.
- See also \fIdelete-char-or-list-or-eof\fR.
- Cursor behavior modified by \fBvimode\fR.
+ See also
+ .Ic delete-char-or-list-or-eof .
 --- tw.h
 +++ tw.h	2021-04-27 07:41:53.196829900 +0000
 @@ -32,6 +32,10 @@

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
-@@ -1230,9 +1230,11 @@ fmthist(int fmt, ptr_t ptr)
+@@ -1243,9 +1243,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. */
-@@ -1311,11 +1313,12 @@ rechist(Char *fname, int ref)
+@@ -1324,11 +1326,12 @@ rechist(Char *fname, int ref)
  	    jmp_buf_t osetexit;
  	    if (lock) {
  #ifndef WINNT_NATIVE

tcsh-6.24.01-bash52.dif

@@ -1,24 +0,0 @@
-From 391b04ec25b0d046d532d46a7468fa7a759d0115 Mon Sep 17 00:00:00 2001
-From: zoulasc <christos@zoulas.com>
-Date: Sun, 2 Oct 2022 08:41:50 -0400
-Subject: [PATCH] bash 5.2 uses implicit exec for "SHLVL=5 tcsh", which causes
- it to decrement SHLVL before executing tcsh. Use env to avoid that.
- (Vogtinator at github)
-
----
- tests/variables.at | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/variables.at b/tests/variables.at
-index 1e8cc8f4..cdd5e211 100644
---- a/tests/variables.at
-+++ b/tests/variables.at
-@@ -964,7 +964,7 @@ tcsh -f -c 'tcsh -f -c "printenv SHLVL"'
- tcsh -f -c 'exec tcsh -f -c "printenv SHLVL"'
- tcsh -f -c '(exec tcsh -f -c "printenv SHLVL")'
- ]])
--AT_CHECK([SHLVL=5 tcsh -f shlvl.csh], ,
-+AT_CHECK([env SHLVL=5 tcsh -f shlvl.csh], ,
- [6
- 8
- 2

tcsh-6.24.01.tar.gz

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

tcsh-6.24.01.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmJ9GUYACgkQZcJuRx9F
-sSNIjg//Ry+EVSrxTN96YgLzai9wDvm719Spwgz3ILjVO/dpBfuls5mshs/iRg8J
-pNXOARMJnEXcfjS5pdZwOFisKI2IQKbynFdagkqWfM7YKuuw4j6pEz9JbTi+yVLj
-FY9zoJrrIiG1pvr9roTOuBYRAIg+HdKdS9Oe8Hmb3kFTgyOkNhbCv3PZOd5Mp9ED
-6BfHcOkUABEdSEYJvb+QjP3hn1TnVtQ+ygW8EBoTm8vnTa1DzsnMspB4CYWPpXgW
-wy0qOJWw+LO01TD0r7sDuOZxrKpjcnR2DToGrubkVHGHri74Y+FcMuCgrmJFT+Mv
-WKOKSDtD/GjY2Zh77cISVwKWCq4xUiVoS9Zk0z5R4Yp1vIWQIOtbKCdFWPmnesa1
-iin2yniHzGGbFg05aHwM2EIyDkxxWdyiUDkRy12EnlyWCjbGy4JqU7QLE++lwQwE
-jmTUSmXfaeBGXroIXpTsrLEh3rsnwBrC7vijk/g33mapLSDh3sUf6K6l3c0rEboF
-vrhIFugccc6cmft+c9PMqMMbo0tX1MufaUZen465Y2Po/G9qL68QG5vkhbq0QNBR
-WUTTu6J1S+ybICmz8o0slf0n97d53H++eHpByuaZ/Q56QXAv1qebf32xwsAamr5W
-HXfDNy2oTFaNo/dCMvd98h9KE/HkFm8wKZccrsX19qhDd+xokGI=
-=gSVY
------END PGP SIGNATURE-----

tcsh-6.24.02.tar.gz

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

tcsh-6.24.02.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmN+n7YACgkQZcJuRx9F
+sSPMEg//f/+wLi/31vVsFni7xsPj9rcDjI0mV31zhNiEgbwSOLRasr0pwKJic0E6
+NS7+EF7AI+XZFU9xWYUibCgA2s3pn3cFDCtWaTXDy0qFI1ykg4uJZjis3HLS0IAU
+/EsNxHhh2wl5BUmLjN5jUhKEwqoItcdE+9MCHFJ2/2CvDld+sIQ63dhIc9RU/uH3
+X/Rz7NJHvPqK9XtThNiBI0cciTxUXyK2Wb0UvI2g+pDNOHLJMwnjioY1ZHpCOp+W
+QtISMBF3tdSACYFHXsAE9gmvsnUNU6f3/AnPK3xli/cyMgS0Kd47rZdR9EXc1eHH
+3/RZWpInU6h+m8rrUUUWzjOMVO7KXJg2KscAGQ7s+ZZZHguWhVlp+XNk6mFgAKLu
+ynz9BieeVSP2Gt0LDrvs53CSgqLlW+KTVVbIuEFoBBn+OBTU0ZiPrrFRXGqnKQht
+tVbq8Vp/iYBssIElH97zoV8XaQWuTKourNbAIAtkGoOcouGX5OrWoQ5g+14KxW5k
+gWtudb+EbIh0wo4XkKXbMFy1Xeqdl+GK9zs9uGOE8ExrFgkeh69iQ1mEUvQDdgSY
+uQ6CW2K5ZjzpQ829xEv3nCmoUDjsgHLu156aAPhgKzUGP8FQbFxutwa89hjmLUGh
+Iw5EpnlMgiF6eIpeBAGLdfSARgHJ03707y/oLuJwvzYycovt740=
+=pB0T
+-----END PGP SIGNATURE-----

tcsh.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Nov 25 08:54:10 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh 6.24.02
+  7. V6.24.02 - 20221124
+  6. Complete mdoc-based manual page (Luke Mewburn)
+  5. Fix rechist() check for NULL filename (broke when arg was renamed).
+       > cd
+       > rm .history
+       > unset savehist
+       > history -S /tmp/s
+       > exit
+     A ~/.history has been written when it should not have been.
+  4. Make OpenBSD use SHORT_STRINGS and fix non-SHORT_STRINGS compilation.
+- Delete patch tcsh-6.24.01-bash52.dif now upstream
+- Correct offset and port patches
+  * tcsh-6.21.00.dif
+  * tcsh-6.22.02-local-dotlock.dif
+- Enhance completion for man command
+
 -------------------------------------------------------------------
 Tue Nov 15 13:32:26 UTC 2022 - Dr. Werner Fink <werner@suse.de>
 

tcsh.spec

@@ -17,7 +17,7 @@
 
 
 Name:           tcsh
-Version:        6.24.01
+Version:        6.24.02
 Release:        0
 Summary:        The C SHell
 License:        BSD-3-Clause
@@ -35,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.24.01-bash52.dif
 BuildRequires:  autoconf
 BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
@@ -62,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 .bash52
 %patch0      -b .0
 
 %build