diff --git a/SOURCES/ksh-20140801-arraylen.patch b/SOURCES/ksh-20140801-arraylen.patch new file mode 100644 index 0000000..34c9b6b --- /dev/null +++ b/SOURCES/ksh-20140801-arraylen.patch @@ -0,0 +1,11 @@ +--- ksh-20120801/src/cmd/ksh93/sh/xec.c 2015-04-02 10:55:26.228017873 -0400 ++++ ksh-20120801/src/cmd/ksh93/sh/xec.c 2015-04-02 10:56:04.099017700 -0400 +@@ -1234,7 +1234,7 @@ int sh_exec(register const Shnode_t *t, + if((io||argn)) + { + Shbltin_t *bp=0; +- static char *argv[1]; ++ static char *argv[2]; + int tflags = 1; + if(np && nv_isattr(np,BLT_DCL)) + tflags |= 2; diff --git a/SPECS/ksh.spec b/SPECS/ksh.spec index c2eb715..eb27d68 100644 --- a/SPECS/ksh.spec +++ b/SPECS/ksh.spec @@ -8,7 +8,7 @@ Group: System Environment/Shells #CPL everywhere else (for KSH itself) License: EPL Version: 20120801 -Release: 22%{?dist} +Release: 22%{?dist}.1 Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz Source2: kshcomp.conf @@ -126,6 +126,9 @@ Patch52: ksh-20120801-retfix.patch # sent upstream, for ksh <= 2014-09-30 Patch53: ksh-20120801-cdfork.patch +# not upstream yet, for ksh <= 2015-04-03, rhbz#1200534 +Patch54: ksh-20140801-arraylen.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: pdksh Requires: coreutils, diffutils, chkconfig @@ -182,6 +185,7 @@ with "sh" (the Bourne Shell). %patch51 -p1 -b .cdfix4 %patch52 -p1 -b .retfix %patch53 -p1 -b .cdfork +%patch54 -p1 -b .arraylen #/dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options @@ -307,6 +311,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 07 2015 Michal Hlavinka - 20120801-22.1 +- using trap DEBUG could cause segmentation fault (#1209507) + * Mon Nov 24 2014 Michal Hlavinka - 20120801-22 - fix postun scriptlet (#1146161)