diff --git a/0006-zsh-5.5.1-fix-wait.patch b/0006-zsh-5.5.1-fix-wait.patch new file mode 100644 index 0000000000000000000000000000000000000000..f89073e4af909009d9694969a86173cd9c68f467 --- /dev/null +++ b/0006-zsh-5.5.1-fix-wait.patch @@ -0,0 +1,28 @@ +From 6af0b07cc7950159129156cb85ef3f72fdd828cc Mon Sep 17 00:00:00 2001 +From: Peter Stephenson +Date: Sat, 3 Aug 2019 19:48:18 +0100 +Subject: [PATCH] 44635: Don't apply STAT_NOPRINT to backgrounded jobs + +Upstream-commit: e0d063a2ade821baf570eb300d4be93692b494f8 +Signed-off-by: Kamil Dudka +--- + Src/exec.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Src/exec.c b/Src/exec.c +index 8045db2..da089d6 100644 +--- a/Src/exec.c ++++ b/Src/exec.c +@@ -1666,7 +1666,8 @@ execpline(Estate state, wordcode slcode, int how, int last1) + + lastwj = thisjob = newjob; + +- if (list_pipe || (pline_level && !(how & Z_TIMED))) ++ if (list_pipe || (pline_level && !(how & Z_TIMED) && ++ !(jn->stat & STAT_NOSTTY))) + jn->stat |= STAT_NOPRINT; + + if (nowait) { +-- +2.34.1 + diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/zsh.spec b/zsh.spec index 08369e7cf1f3eb2420164d7c31fc70721e265410..c2b5dffa0c58bf8f3093eb4afbcdb838c71a2514 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,9 +1,9 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 Summary: Powerful interactive shell Name: zsh Version: 5.5.1 -Release: 9%{anolis_release}%{?dist} +Release: 10%{anolis_release}%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz @@ -32,6 +32,9 @@ Patch5: 0005-zsh-5.5.1-CVE-2021-45444.patch Patch1001: 1001-zsh-fix-A05execution-test.patch # End: Anolis customized patches +# make zsh wait built-in wait properly for all active child processes (#2070342) +Patch6: 0006-zsh-5.5.1-fix-wait.patch + BuildRequires: autoconf BuildRequires: coreutils BuildRequires: gawk @@ -200,11 +203,12 @@ fi %doc Doc/*.html %changelog -* Mon Oct 24 2022 yangxianzhao - 5.5.1-9.0.2 -- Fix A05execution test case issue - -* Fri Jul 15 2022 Liwei Ge - 5.5.1-9.0.1 +* Tue Jan 03 2023 Liwei Ge - 5.5.1-10.0.1 - Add doc sub package +- Fix A05execution test case issue (yangxianzhao@uniontech.com) + +* Fri Apr 01 2022 Kamil Dudka - 5.5.1-10 +- make zsh wait built-in wait properly for all active child processes (#2070342) * Tue Feb 22 2022 Kamil Dudka - 5.5.1-9 - do not perform PROMPT_SUBST evaluation on %F/%K arguments (CVE-2021-45444)