From 630c68254ce970a05053c4b154176ad730ff61b72e6c686e425cc06f71da233b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 30 Sep 2022 09:01:51 +0000 Subject: [PATCH 1/2] Avoid trouble with bash 5.2 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=128 --- tcsh-6.24.01-bash52.dif | 11 +++++++++++ tcsh.changes | 7 +++++++ tcsh.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 tcsh-6.24.01-bash52.dif diff --git a/tcsh-6.24.01-bash52.dif b/tcsh-6.24.01-bash52.dif new file mode 100644 index 0000000..dae2cf6 --- /dev/null +++ b/tcsh-6.24.01-bash52.dif @@ -0,0 +1,11 @@ +--- tcsh-6.24.01/tests/variables.at ++++ tcsh-6.24.01/tests/variables.at 2022-09-30 08:56:23.296533116 +0000 +@@ -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([SHLVL=5 tcsh -f shlvl.csh;:], , + [6 + 8 + 2 diff --git a/tcsh.changes b/tcsh.changes index b77bd8b..195f1c5 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 30 08:58:48 UTC 2022 - Dr. Werner Fink + +- 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 diff --git a/tcsh.spec b/tcsh.spec index 313293a..f83c73b 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -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 From da2551bedb5d1e11b2d9a7368b1ac498872e3691e85dc8716d5cb1a413990045 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 4 Oct 2022 07:20:22 +0000 Subject: [PATCH 2/2] Accepting request 1007809 from home:favogt:branches:shells - Replace tcsh-6.24.01-bash52.dif with upstream fix OBS-URL: https://build.opensuse.org/request/show/1007809 OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=129 --- tcsh-6.24.01-bash52.dif | 19 ++++++++++++++++--- tcsh.changes | 5 +++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tcsh-6.24.01-bash52.dif b/tcsh-6.24.01-bash52.dif index dae2cf6..d9afae9 100644 --- a/tcsh-6.24.01-bash52.dif +++ b/tcsh-6.24.01-bash52.dif @@ -1,11 +1,24 @@ ---- tcsh-6.24.01/tests/variables.at -+++ tcsh-6.24.01/tests/variables.at 2022-09-30 08:56:23.296533116 +0000 +From 391b04ec25b0d046d532d46a7468fa7a759d0115 Mon Sep 17 00:00:00 2001 +From: zoulasc +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([SHLVL=5 tcsh -f shlvl.csh;:], , ++AT_CHECK([env SHLVL=5 tcsh -f shlvl.csh], , [6 8 2 diff --git a/tcsh.changes b/tcsh.changes index 195f1c5..afa7a8d 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 4 06:48:42 UTC 2022 - Fabian Vogt + +- Replace tcsh-6.24.01-bash52.dif with upstream fix + ------------------------------------------------------------------- Fri Sep 30 08:58:48 UTC 2022 - Dr. Werner Fink