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