From 1b957c686f718780179358441f1afdf0a18436a1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 2 Aug 2022 08:12:27 +0000 Subject: [PATCH] import ksh-20120801-256.el8 --- SOURCES/ksh-20120801-signal-bubbling.patch | 12 ++++++++++++ SPECS/ksh.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 SOURCES/ksh-20120801-signal-bubbling.patch diff --git a/SOURCES/ksh-20120801-signal-bubbling.patch b/SOURCES/ksh-20120801-signal-bubbling.patch new file mode 100644 index 0000000..80c3eb0 --- /dev/null +++ b/SOURCES/ksh-20120801-signal-bubbling.patch @@ -0,0 +1,12 @@ +diff --git a/src/cmd/ksh93/sh/xec.c b/src/cmd/ksh93/sh/xec.c +--- a/src/cmd/ksh93/sh/xec.c ++++ b/src/cmd/ksh93/sh/xec.c +@@ -3529,7 +3529,7 @@ int sh_funscope(int argn, char *argv[],int(*fun)(void*),void *arg,int execflg) + } + if(jmpval) + r=shp->exitval; +- if(r>SH_EXITSIG && ((r&SH_EXITMASK)==SIGINT || ((r&SH_EXITMASK)==SIGQUIT))) ++ if(r>SH_EXITSIG && ((r&SH_EXITMASK)==SIGINT || ((r&SH_EXITMASK)==SIGQUIT) || (getenv("_AST_KSH_SIGNAL_BUBBLE")))) + kill(getpid(),r&SH_EXITMASK); + if(jmpval > SH_JMPFUN) + { diff --git a/SPECS/ksh.spec b/SPECS/ksh.spec index 6d5dfc2..cf6c658 100644 --- a/SPECS/ksh.spec +++ b/SPECS/ksh.spec @@ -6,7 +6,7 @@ Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ License: EPL Version: %{releasedate} -Release: 255%{?dist} +Release: 256%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{release_date}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{release_date}.tgz Source2: kshcomp.conf @@ -220,6 +220,9 @@ Patch89: ksh-20120801-cve-2019-14868.patch # rhbz#1857847 Patch90: ksh-20120801-jobcontrol.patch +# rhbz#2060600 +Patch91: ksh-20120801-signal-bubbling.patch + Conflicts: pdksh Requires: coreutils, diffutils, chkconfig BuildRequires: bison @@ -372,6 +375,10 @@ fi %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf %changelog +* Thu Jul 21 2022 Vincent Mihalkovic - 20120801-256 +- Do not evaluate arithmetic expressions from environment variables at startup + Resolves: #2060600 + * Mon Jan 03 2022 Vincent Mihalkovic - 20120801-255 - Fix race conditions running external commands with job control on Resolves: #1857847