pool/tcsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1007813 from shells

Browse Source 
- Replace tcsh-6.24.01-bash52.dif with upstream fix (forwarded request 1007809 from favogt)

OBS-URL: https://build.opensuse.org/request/show/1007813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=83
This commit is contained in:
Richard Brown 2022-10-11 15:59:11 +00:00 committed by Git OBS Bridge
commit 2f12d6ec0a
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tcsh-6.24.01-bash52.dif Normal file
View File

@ -0,0 +1,24 @@
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

12
tcsh.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Oct 4 06:48:42 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Replace tcsh-6.24.01-bash52.dif with upstream fix
-------------------------------------------------------------------
Fri Sep 30 08:58:48 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Add patch tcsh-6.24.01-bash52.dif
* Avoid to become last command in sub shell list as bash-5.2
now uses execve within sub shell which decreases SHLVL
-------------------------------------------------------------------
Fri May 13 08:11:25 UTC 2022 - Dr. Werner Fink <werner@suse.de>

2
tcsh.spec
View File

@ -35,6 +35,7 @@ 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
@ -61,6 +62,7 @@ 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