From deca7b72428b6db749624db38b808a9f7c9fb4c8 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Wed, 27 Sep 2023 13:09:44 +0000
Subject: [PATCH] import CS ksh-20120801-259.el8

---
 .../ksh-20120801-segfault-long-command.patch  | 13 ++++++++++++
 SPECS/ksh.spec                                | 21 ++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 SOURCES/ksh-20120801-segfault-long-command.patch

diff --git a/SOURCES/ksh-20120801-segfault-long-command.patch b/SOURCES/ksh-20120801-segfault-long-command.patch
new file mode 100644
index 0000000..ee5bcd1
--- /dev/null
+++ b/SOURCES/ksh-20120801-segfault-long-command.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cmd/ksh93/sh/path.c b/src/cmd/ksh93/sh/path.c
+index 9965bf5..46e061a 100644
+--- a/src/cmd/ksh93/sh/path.c
++++ b/src/cmd/ksh93/sh/path.c
+@@ -700,7 +700,7 @@ int	path_search(Shell_t *shp,register const char *name,Pathcomp_t **oldpp, int f
+ 	{
+ 		if(!pp)
+ 			pp=sh_isstate(SH_DEFPATH)?shp->defpathlist:shp->pathlist;
+-		if(pp && strmatch(name,e_alphanum)  && (fno=path_opentype(shp,name,pp,1))>=0)
++		if(pp && strlen(name)<256 && strmatch(name,e_alphanum)  && (fno=path_opentype(shp,name,pp,1))>=0)
+ 		{
+ 			if(flag==2)
+ 			{
diff --git a/SPECS/ksh.spec b/SPECS/ksh.spec
index 5c00740..ad9c337 100644
--- a/SPECS/ksh.spec
+++ b/SPECS/ksh.spec
@@ -4,9 +4,9 @@
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
-License:      EPL
+License:      EPL-1.0
 Version:      %{releasedate}
-Release:      257%{?dist}
+Release:      259%{?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
@@ -74,6 +74,7 @@ Patch35: ksh-20120801-fd2lost.patch
 # sent upstream 2014-01, rhbz#1047507
 Patch36: ksh-20120801-argvfix.patch
 
+
 # for ksh <= 2014-01-14, rhbz#1048995
 Patch37: ksh-20120801-memlik3.patch
 
@@ -231,6 +232,10 @@ Patch92: ksh-20120801-stack-robustness.patch
 # upstream commit: https://github.com/ksh93/ksh/commit/56805b25af24f454cdd477609bcddc984628bc01
 Patch93: ksh-20120801-stack-robustness-2.patch
 
+# rhbz#2013909
+# upstream commit: https://github.com/ksh93/ksh/commit/6f3b23e6f4d59590a51bfbcc66dc60082728b71d
+Patch94: ksh-20120801-segfault-long-command.patch
+
 
 Conflicts:    pdksh
 Requires: coreutils, diffutils, chkconfig
@@ -264,8 +269,9 @@ sed -i '/-c sh\/main.c/s|${mam_cc_FLAGS} |${mam_cc_FLAGS} ${CCFLAGS} |p' src/cmd
 sed -i 1i"#define register" src/lib/libast/include/ast.h
 
 %build
+# rhbz#2226653: -D_std_malloc (disable vmalloc and force use of the operating system's malloc)
 XTRAFLAGS=""
-for f in -Wno-unknown-pragmas -Wno-missing-braces -Wno-unused-result -Wno-return-type -Wno-int-to-pointer-cast -Wno-parentheses -Wno-unused -Wno-unused-but-set-variable -Wno-cpp -P
+for f in -D_std_malloc -Wno-unknown-pragmas -Wno-missing-braces -Wno-unused-result -Wno-return-type -Wno-int-to-pointer-cast -Wno-parentheses -Wno-unused -Wno-unused-but-set-variable -Wno-cpp -P
 do
   gcc $f -E - </dev/null >/dev/null 2>&1 && XTRAFLAGS="$XTRAFLAGS $f"
 done
@@ -384,6 +390,15 @@ fi
 %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf
 
 %changelog
+* Fri Aug 25 2023 Vincent Mihalkovic <vmihalko@redhat.com> - 20120801-259
+- Fix crash on trying a very long command
+  Fix license tag
+  Resolves: #2013909
+
+* Wed Jul 26 2023 Vincent Mihalkovic <vmihalko@redhat.com> - 20120801-258
+- disable vmalloc and force use of the operating system's malloc
+  Resolves: #2226653
+
 * Mon Aug 08 2022 Vincent Mihalkovic <vmihalko@redhat.com> - 20120801-257
 - Stack robustness fixes (two patches)
   Resolves: #2116372