diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..0ee7539a2292be885eb3a6caf1a4ee4666e5e99f --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8_6 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/ksh-20120801-signal-bubbling.patch b/ksh-20120801-signal-bubbling.patch new file mode 100644 index 0000000000000000000000000000000000000000..80c3eb06e03a045789d62de63d45c8446b5da989 --- /dev/null +++ b/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/ksh.spec b/ksh.spec index ca485540423583e50fd5be4dfadb96788cbd616e..a1c1a46ff31d7b7bf178b99f1060470e5fb731a6 100644 --- a/ksh.spec +++ b/ksh.spec @@ -7,7 +7,7 @@ Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ License: EPL Version: %{releasedate} -Release: 254%{anolis_release}%{?dist} +Release: 255%{anolis_release}%{?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 @@ -218,6 +218,9 @@ Patch88: ksh-20120801-annocheck.patch # rhbz#1790547 Patch89: ksh-20120801-cve-2019-14868.patch +# rhbz#2109589 +Patch90: ksh-20120801-signal-bubbling.patch + Conflicts: pdksh Requires: coreutils, diffutils, chkconfig BuildRequires: bison @@ -380,9 +383,13 @@ fi %doc src/cmd/ksh93/COMPATIBILITY src/cmd/ksh93/RELEASE src/cmd/ksh93/TYPES %changelog -* Tue Jul 19 2022 Bo Ren - 20120801-254.0.1 +* Fri Sep 16 2022 Bo Ren - 20120801-255.0.1 - Add doc sub package +* Thu Jul 21 2022 Vincent Mihalkovic - 20120801-255 +- Do not evaluate arithmetic expressions from environment variables at startup + Resolves: #2109589 + * Thu Feb 06 2020 Siteshwar Vashisht - 20120801-254 - Bump version number to avoid breaking upgrade path