From 8b5e65c3cde85ecfb3735ac361e80aa87f9e8e10 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:29:40 +0000 Subject: import ksh-20120801-137.el7 --- diff --git a/SOURCES/ksh-20120801-jobwait-sigstop.patch b/SOURCES/ksh-20120801-jobwait-sigstop.patch new file mode 100644 index 0000000..1749288 --- /dev/null +++ b/SOURCES/ksh-20120801-jobwait-sigstop.patch @@ -0,0 +1,11 @@ +diff --git a/src/cmd/ksh93/sh/jobs.c b/src/cmd/ksh93/sh/jobs.c +--- a/src/cmd/ksh93/sh/jobs.c ++++ b/src/cmd/ksh93/sh/jobs.c +@@ -1579,6 +1579,7 @@ int job_wait(register pid_t pid) + if( pw->p_exit!=SIGTTIN && pw->p_exit!=SIGTTOU) + break; + ++ tcsetpgrp(JOBTTY,pw->p_pgrp); + killpg(pw->p_pgrp,SIGCONT); + } + else /* ignore stop when non-interactive */ diff --git a/SOURCES/ksh-20120801-kia-warning.patch b/SOURCES/ksh-20120801-kia-warning.patch new file mode 100644 index 0000000..12f0cce --- /dev/null +++ b/SOURCES/ksh-20120801-kia-warning.patch @@ -0,0 +1,11 @@ +diff --git a/src/cmd/ksh93/sh/parse.c b/src/cmd/ksh93/sh/parse.c +--- a/src/cmd/ksh93/sh/parse.c ++++ b/src/cmd/ksh93/sh/parse.c +@@ -2032,6 +2032,7 @@ unsigned long kiaentity(Lex_t *lexp,const char *name,int len,int type,int first, + else + sfputr(stkp,name,0); + } ++ sfputc(stkp,'\0'); + np = nv_search(stakptr(offset),lexp->entity_tree,NV_ADD); + stkseek(stkp,offset); + np->nvalue.i = pkind; diff --git a/SPECS/ksh.spec b/SPECS/ksh.spec index a43a20a..6bbe3b6 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: 35%{?dist} +Release: 137%{?dist} 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 @@ -177,8 +177,14 @@ Patch73: ksh-20120801-badgcc.patch # rhbz#1299484 Patch74: ksh-20120801-mb-after-argvar.patch +# rhbz#1438045 +Patch75: ksh-20120801-kia-warning.patch + +# rhbz#1457990 +Patch76: ksh-20120801-jobwait-sigstop.patch + # rhbz#1484937 -Patch75: ksh-20120801-signal-bubbling.patch +Patch77: ksh-20120801-signal-bubbling.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: pdksh @@ -253,7 +259,9 @@ with "sh" (the Bourne Shell). %patch72 -p1 -b .unset-param %patch73 -p1 -b .badgcc %patch74 -p1 -b .mb-after-argvar -%patch75 -p1 -b .signal-bubbling +%patch75 -p1 -b .kia-warning +%patch76 -p1 -b .jobwait-sigstop +%patch77 -p1 -b .signal-bubbling #/dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options @@ -379,10 +387,22 @@ fi rm -rf $RPM_BUILD_ROOT %changelog -* Wed Jan 24 2018 Siteshwar Vashisht - 20120801-35 +* Fri Feb 16 2018 Kamil Dudka - 20120801-137 +- Increase the release number by 100 to make sure it stays higher than in RHEL-6 + Related: #1484937 + +* Wed Jan 24 2018 Siteshwar Vashisht - 20120801-37 - Add configuration option to enable signal bubbling for backward compatibility Resolves: #1484937 +* Mon Sep 25 2017 Siteshwar Vashisht - 20120801-36 +- Fix setting terminal foreground process group while resuming process + Resolves: #1457990 + +* Mon Sep 25 2017 Siteshwar Vashisht - 20120801-35 +- Fix warning while creating kia file + Resolves: #1438045 + * Fri Feb 10 2017 Siteshwar Vashisht - 20120801-34 - Multibyte character string after $1-9 was not expanded correctly Resolves: #1299484