diff --git a/bash-5.2-patches.tar.bz2 b/bash-5.2-patches.tar.bz2 index e5c5929e..6ec4f7f6 100644 --- a/bash-5.2-patches.tar.bz2 +++ b/bash-5.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f42795923731f5c12f73f2e6b011aa16dec5b3d77e785850177f0c1bddf8f54 -size 237 +oid sha256:23adb8e4f372fe2722e16a2b0768f1808a8d7e1e1bb05748aeab5a394f301111 +size 1867 diff --git a/bash.changes b/bash.changes index 66248008..a888a22f 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Oct 6 10:43:59 UTC 2022 - Dr. Werner Fink + +- Add upstream patches + * bash52-001 + Expanding unset arrays in an arithmetic context can cause a + segmentation fault. + * bash52-002 + Starting bash with an invalid locale specification for + LC_ALL/LANG/LC_CTYPE can cause the shell to crash. +- Do not run checks in parallel as it eats memory, a lot of memory +- Disable alternate array implementation as it eats a lot of memory + ------------------------------------------------------------------- Tue Sep 27 07:54:48 UTC 2022 - Dr. Werner Fink @@ -11,7 +24,6 @@ Tue Sep 27 07:44:16 UTC 2022 - Dr. Werner Fink - Modernize run-tests - ------------------------------------------------------------------- Sat Sep 24 13:57:27 UTC 2022 - Christopher Yeleighton diff --git a/bash.spec b/bash.spec index ed3c2ca9..509277e9 100644 --- a/bash.spec +++ b/bash.spec @@ -21,6 +21,8 @@ %else %bcond_without alternatives %endif +# Unicode tests do alloc to much memory +%bcond_with altarray %define bextend %{nil} %define bversion 5.2 @@ -87,6 +89,8 @@ Patch50: quotes-man2html.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: fdupes +BuildRequires: glibc-locale +BuildRequires: glibc-locale-base BuildRequires: makeinfo BuildRequires: patchutils BuildRequires: pkgconfig @@ -442,7 +446,11 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 --enable-help-builtin \ --enable-separate-helpfiles \ --enable-array-variables \ +%if %{with altarray} --enable-alt-array-implementation \ +%else + --disable-alt-array-implementation \ +%endif --enable-brace-expansion \ --enable-command-timing \ --enable-disabled-builtins \ @@ -465,7 +473,7 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 tail -q -s 0.5 -f $SCREENLOG & pid=$! env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_RUN_PATH TMPDIR=$TMPDIR \ SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \ - screen -D -m %make_build TESTSCRIPT=%{SOURCE4} check + screen -D -m %make_build -j1 TESTSCRIPT=%{SOURCE4} check kill -TERM $pid %if 0%{?do_profiling} rm -f jobs.gcda @@ -478,7 +486,7 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 grep -F '$'\' doc/bash.html %{nil:test for boo#1203091} %check - %make_build check + %make_build -j1 check %install %make_install