Update to tcsh-6.24.12

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

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

tcsh-6.24.10-history-merge.dif

@@ -1,87 +0,0 @@
----
- sh.hist.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- sh.hist.c
-+++ sh.hist.c	2023-07-21 12:21:55.518480015 +0000
-@@ -64,7 +64,7 @@ static	void	hfree	(struct Hist *);
- 
- /* #define DEBUG_HIST 1 */
- 
--static const int fastMergeErase = 1;
-+static int fastMergeErase = 1;
- static unsigned histCount = 0;		/* number elements on history list */
- static int histlen = 0;
- static struct Hist *histTail = NULL;     /* last element on history list */
-@@ -1321,6 +1321,7 @@ rechist(Char *xfname, int ref)
- 	}
- 
- 	if (merge) {
-+	    fastMergeErase = 0;	/* Was true, now false to merge even with full history list */
- 	    jmp_buf_t osetexit;
- 	    if (lock) {
- #ifndef WINNT_NATIVE
-@@ -1393,7 +1394,7 @@ loadhist(Char *fname, int mflg)
-     /* During history merging (enthist sees mflg set), we disable management of
-      * Hnum and Href (because fastMergeErase is true).  So now reset all the
-      * values based on the final ordering of the history list. */
--    if (mflg) {
-+    if (mflg /* && fastMergeErase */) {
- 	int n = eventno;
-         struct Hist *hp = &Histlist;
-         while ((hp = hp->Hnext))
---- tests/history.at
-+++ tests/history.at	2023-07-24 07:53:41.471413277 +0000
-@@ -218,6 +218,52 @@ dnl savehist) set to 0 instead of 1.
- 
- AT_CLEANUP()
- 
-+AT_SETUP([History merge])
-+dnl Check if history merge really works out
-+
-+AT_DATA([hist-merge.csh],
-+[[set histfile=test.history histdup=prev history=(6 "%h TIME %R\n")
-+set savehist=(6 merge)
-+printf "'%s' %s\n" "$histdup" "$history"
-+history -c
-+: 1
-+: 2
-+: 3
-+: 4
-+: 5
-+history -S
-+: a
-+: b
-+: c
-+: d
-+: e
-+history -S
-+history -L
-+history 6
-+]])
-+
-+AT_CHECK([tcsh -f -q -i < hist-merge.csh], ,
-+[> 'prev' 6 %h TIME %R\n
-+    24 TIME : b
-+    25 TIME : c
-+    26 TIME : d
-+    27 TIME : e
-+    28 TIME history -S
-+    29 TIME history 6
-+> exit
-+],)
-+
-+dnl In broken case we see the former history instead
-+dnl > 'prev' 6 %h TIME %R\n
-+dnl    24 TIME : 4
-+dnl    25 TIME : 3
-+dnl    26 TIME : 2
-+dnl    27 TIME : 1
-+dnl    28 TIME history -S
-+dnl    29 TIME history 6
-+dnl > exit
-+
-+AT_CLEANUP()
- 
- dnl
- dnl	History faults

tcsh-6.24.11.tar.gz

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

tcsh-6.24.11.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmXyMP0ACgkQZcJuRx9F
-sSNVzQ/+IJuMLRiw2JnIUsC67NC6Fsd5Um6Kicret3WLyboDxFpRN7gZDNl7gRaW
-h0aJCq2NSvFOZ0KzIyFbewyj2lRSTOrcqrxDRUCAxYPQRJ6hG3QVX7XWOxlj70s+
-6nFLCq8Dw62HEg6NYtZu8Oy0BpCq3KZL1IzMjOjKk8s6hy1FI9NyhKUpxJcx7rc9
-XjlvZ+/rXi5Z9Ws1f75VwVi/SuR32E6xStIkZg7T76+AUqNze9SCvxqyHIF7ktnF
-1eA7+NVPgjq1DmXeeVjnXyEOHCGRBpP9kIb0FYbftcRnZayl5tyzYxyqLa5t1NtH
-IiCqIxhhcCCRWjJZCVWe1i9nd3lFhcibf68y7fV+Nk0fZD8Y1psHYgz7HlFEBu++
-HtfSxLUv3qdFzRqyeO6lmqOqKZLzI7dF6jqae33TNfuupkRC29vooL+5OPoPm8zk
-vJVcV+18c1DNjO9IczgfWgaDtc97BsJryOAjkgd1ICu+YaLteTdp5BF3dRsIdXrG
-Es1Np9Dmn+L7HcfR8/uUsPjF4n97eW22bLjRw79fo4LtI3wBwAZngl58uPIerKAc
-+/HkxMGAUmaMSfwEdefWqcqsPUbNkPWiO40UcmROvYu5yoSWLmnnpBGtjzTcDfMY
-iuupwazdnxsUslvY46BBFzpVpNVMx/19Gc08yk5EnR2GK3kLyII=
-=tOIg
------END PGP SIGNATURE-----

tcsh-6.24.12.tar.gz

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

tcsh-6.24.12.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEErYcQl2PY2MLJTLqAZcJuRx9FsSMFAmYPnPkACgkQZcJuRx9F
+sSPYrg/+KdHk7h/XM8ZffLTzw5YrhcManbS0njoXuHd9bM6Er0Hz/7fRuUBjlowJ
+ZKbaYiDgM+DY+MUs0CAyLmKT8rQ0z0NIaSpLunPV7N1HW2c4zedM8+/1rFEyWjDk
+Ek69WyEdflUCjar2QU2Pjk9up2I7z81xw61K4ewf1DwDv3ut5c0APbiVwJepC+MP
+YqTxhOawF+I9HrshCXF75UACGLo5TeEtTxM2e9A3Ft8qSNYXTOPLrq5dQz+pG/rd
+c2EVecTiSrMCqRYYzEX22MK/kNIFD1fxvwDW/lTe4aF8ksQ6kXtx7oi9hpOi+w55
+Zgr7tuurZ/s3KmkQkBArk+fGY+aA3488GCJs23AQ28B8QbB1WYNXWQ2bouAEuqOw
+F8805BcCNP6HRwhnzeSg12yZOOM86VM7bOAk14WyD3oasa2JlJJZPtMV29U9J+dD
+Kf0iYy8q8iZjuFeAoc+SOq7Asnerjr3xLzhOQpkz3jjOJv1cbAbNS4z0BVNQtd01
+rZerx+dTp5FHmszzATT5oBXzu2ikRMtXE1hoC0ZDKRFHoma7Fd6cNAJgX8VKIR88
+F+xL64DRd4Gh95HbJZxzC5dyIsiDcLkEfRwQl6vqlxeL3eL9tKn8yl9Idj4VmAWV
+Tis/2octJctrrY1T0oj0yKvlM+IhlCImeOYckhzq0hHI58mZUGg=
+=oZTq
+-----END PGP SIGNATURE-----

tcsh.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  5 09:08:30 UTC 2024 - Dr. Werner Fink <werner@suse.de>
+
+- Update to tcsh 6.24.12 - 2024-04-05
+  * Fix history merge and add a test for it (Werner Fink, Kimmo Suominen)
+- Remove patch tcsh-6.24.10-history-merge.dif now solved upstream
+- Port patch tcsh-6.22.02-local-dotlock.dif (corrected offsets)
+
 -------------------------------------------------------------------
 Thu Mar 14 07:30:23 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

tcsh.spec

@@ -17,7 +17,7 @@
 
 
 Name:           tcsh
-Version:        6.24.11
+Version:        6.24.12
 Release:        0
 Summary:        The C SHell
 License:        BSD-3-Clause
@@ -31,7 +31,6 @@ Source4:        tcsh.keyring
 Patch0:         tcsh-6.21.00.dif
 Patch1:         tcsh-6.15.00-pipe.dif
 Patch2:         tcsh-6.16.00-norm-cmd.dif
-Patch3:         tcsh-6.24.10-history-merge.dif
 Patch4:         tcsh-6.18.03-colorls.dif
 Patch5:         tcsh-6.17.06-dspmbyte.dif
 Patch6:         tcsh-6.18.03-catalogs.dif
@@ -59,7 +58,6 @@ correction, a history mechanism, job control, and a C-like syntax.
 %setup -q
 %patch -P1      -b .pipe
 %patch -P2      -b .normcmd
-%patch -P3      -b .merge
 %patch -P4      -b .colorls
 %patch -P5      -b .dspmbyte
 %patch -P6      -b .catalogs