From 532fae4808f6d8a5740c7d8eea524450e59fdc30 Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Thu, 10 Nov 2022 18:18:14 +0800 Subject: [PATCH 1/3] update to zsh-5.5.1-10.el8 Signed-off-by: anolis-bot --- 0006-zsh-5.5.1-fix-wait.patch | 28 +++++++++++++++++++++++ 1001-zsh-fix-A05execution-test.patch | 28 ----------------------- dist | 1 + zsh.spec | 34 +++++++--------------------- 4 files changed, 37 insertions(+), 54 deletions(-) create mode 100644 0006-zsh-5.5.1-fix-wait.patch delete mode 100644 1001-zsh-fix-A05execution-test.patch create mode 100644 dist 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 0000000..f89073e --- /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/1001-zsh-fix-A05execution-test.patch b/1001-zsh-fix-A05execution-test.patch deleted file mode 100644 index 1d6318c..0000000 --- a/1001-zsh-fix-A05execution-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst -index 567bd25..5d3d460 100644 ---- a/Test/A05execution.ztst -+++ b/Test/A05execution.ztst -@@ -52,12 +52,17 @@ - 0:path (4) - *>foo */command.tmp/tstcmd-arg - -- path=(/bin ${ZTST_testdir}/command.tmp/) -- tstcmd-interp-too-long 2>&1; echo "status $?" -- path=($storepath) --0:path (5) --*>*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory -->status 127 -+ # Just check this exits with non-zero status, -+ # as output and status code can differ. -+ ( -+ path=(/bin ${ZTST_testdir}/command.tmp/) -+ if tstcmd-interp-too-long >/dev/null 2>&1; then -+ exit 0 -+ else -+ exit 1 -+ fi -+ ) -+1:path (5) - - functst() { print $# arguments:; print -l $*; } - functst "Eines Morgens" "als Gregor Samsa" diff --git a/dist b/dist new file mode 100644 index 0000000..9c0e36e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/zsh.spec b/zsh.spec index 08369e7..0efe556 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,9 +1,7 @@ -%define anolis_release .0.2 - Summary: Powerful interactive shell Name: zsh Version: 5.5.1 -Release: 9%{anolis_release}%{?dist} +Release: 10%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz @@ -28,9 +26,9 @@ Patch4: 0004-zsh-5.5.1-CVE-2019-20044.patch # do not perform PROMPT_SUBST evaluation on %F/%K arguments (CVE-2021-45444) Patch5: 0005-zsh-5.5.1-CVE-2021-45444.patch -# Begin: Anolis customized patches -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 @@ -43,7 +41,6 @@ BuildRequires: pcre-devel BuildRequires: sed BuildRequires: texi2html BuildRequires: texinfo -Requires: glibc Requires(post): info grep Requires(preun): info Requires(postun): coreutils grep @@ -69,7 +66,6 @@ mechanism, and more. %package html Summary: Zsh shell manual in html format BuildArch: noarch -Requires: %{name} = %{version}-%{release} %description html The zsh shell is a command interpreter usable as an interactive login @@ -81,15 +77,6 @@ mechanism, and more. This package contains the Zsh manual in html format. - -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %autosetup -p1 autoreconf -fiv @@ -184,6 +171,8 @@ fi %files +%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES MACHINES +%doc NEWS Etc/zsh-development-guide Etc/completion-style-guide %attr(755,root,root) %{_bindir}/zsh %{_mandir}/*/* %{_infodir}/* @@ -192,19 +181,12 @@ fi %config(noreplace) %{_sysconfdir}/skel/.z* %config(noreplace) %{_sysconfdir}/z* -%files doc -%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES MACHINES -%doc NEWS Etc/zsh-development-guide Etc/completion-style-guide - %files html %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 -- Add doc sub package +* 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) -- Gitee From a613e2768fda03eece27c3043d66e5be74d657c1 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Fri, 15 Jul 2022 13:16:23 +0800 Subject: [PATCH 2/3] spec: add doc sub package --- zsh.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/zsh.spec b/zsh.spec index 0efe556..ad6f46c 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,9 @@ +%define anolis_release .0.1 + Summary: Powerful interactive shell Name: zsh Version: 5.5.1 -Release: 10%{?dist} +Release: 10%{anolis_release}%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz @@ -41,6 +43,7 @@ BuildRequires: pcre-devel BuildRequires: sed BuildRequires: texi2html BuildRequires: texinfo +Requires: glibc Requires(post): info grep Requires(preun): info Requires(postun): coreutils grep @@ -66,6 +69,7 @@ mechanism, and more. %package html Summary: Zsh shell manual in html format BuildArch: noarch +Requires: %{name} = %{version}-%{release} %description html The zsh shell is a command interpreter usable as an interactive login @@ -77,6 +81,15 @@ mechanism, and more. This package contains the Zsh manual in html format. + +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep %autosetup -p1 autoreconf -fiv @@ -171,8 +184,6 @@ fi %files -%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES MACHINES -%doc NEWS Etc/zsh-development-guide Etc/completion-style-guide %attr(755,root,root) %{_bindir}/zsh %{_mandir}/*/* %{_infodir}/* @@ -181,10 +192,17 @@ fi %config(noreplace) %{_sysconfdir}/skel/.z* %config(noreplace) %{_sysconfdir}/z* +%files doc +%doc README LICENCE Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES MACHINES +%doc NEWS Etc/zsh-development-guide Etc/completion-style-guide + %files html %doc Doc/*.html %changelog +* Tue Jan 03 2023 Liwei Ge - 5.5.1-10.0.1 +- Add doc sub package + * Fri Apr 01 2022 Kamil Dudka - 5.5.1-10 - make zsh wait built-in wait properly for all active child processes (#2070342) -- Gitee From 9e34c965356434caf72a99976a4c902d99e78cc4 Mon Sep 17 00:00:00 2001 From: ut003808 Date: Mon, 24 Oct 2022 13:40:25 +0800 Subject: [PATCH 3/3] [build][test]Fix A05execution test case build issue --- 1001-zsh-fix-A05execution-test.patch | 28 ++++++++++++++++++++++++++++ zsh.spec | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 1001-zsh-fix-A05execution-test.patch diff --git a/1001-zsh-fix-A05execution-test.patch b/1001-zsh-fix-A05execution-test.patch new file mode 100644 index 0000000..1d6318c --- /dev/null +++ b/1001-zsh-fix-A05execution-test.patch @@ -0,0 +1,28 @@ +diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst +index 567bd25..5d3d460 100644 +--- a/Test/A05execution.ztst ++++ b/Test/A05execution.ztst +@@ -52,12 +52,17 @@ + 0:path (4) + *>foo */command.tmp/tstcmd-arg + +- path=(/bin ${ZTST_testdir}/command.tmp/) +- tstcmd-interp-too-long 2>&1; echo "status $?" +- path=($storepath) +-0:path (5) +-*>*tstcmd-interp-too-long: bad interpreter: x*xn: no such file or directory +->status 127 ++ # Just check this exits with non-zero status, ++ # as output and status code can differ. ++ ( ++ path=(/bin ${ZTST_testdir}/command.tmp/) ++ if tstcmd-interp-too-long >/dev/null 2>&1; then ++ exit 0 ++ else ++ exit 1 ++ fi ++ ) ++1:path (5) + + functst() { print $# arguments:; print -l $*; } + functst "Eines Morgens" "als Gregor Samsa" diff --git a/zsh.spec b/zsh.spec index ad6f46c..c2b5dff 100644 --- a/zsh.spec +++ b/zsh.spec @@ -28,6 +28,9 @@ Patch4: 0004-zsh-5.5.1-CVE-2019-20044.patch # do not perform PROMPT_SUBST evaluation on %F/%K arguments (CVE-2021-45444) Patch5: 0005-zsh-5.5.1-CVE-2021-45444.patch +# Begin: Anolis customized patches +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 @@ -202,6 +205,7 @@ fi %changelog * 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) -- Gitee