From b97b525faf2c86aadfaa40fff2a1cc166e1ceca1 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 18 Apr 2011 14:45:13 +0200 Subject: [PATCH] ksh updated to 2011-04-15 --- .gitignore | 2 ++ ksh-20110208-arrays.patch | 12 ------------ ksh-20110208-clist.patch | 12 ------------ ksh-20110208-suspend.patch | 11 ----------- ksh.spec | 21 ++++++--------------- sources | 4 ++-- 6 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 ksh-20110208-arrays.patch delete mode 100644 ksh-20110208-clist.patch delete mode 100644 ksh-20110208-suspend.patch diff --git a/.gitignore b/.gitignore index d146547..2666159 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ INIT.2010-07-01.tgz /INIT.2011-02-02.tgz /ast-ksh.2011-02-08.tgz /INIT.2011-02-08.tgz +/ast-ksh.2011-04-15.tgz +/INIT.2011-04-15.tgz diff --git a/ksh-20110208-arrays.patch b/ksh-20110208-arrays.patch deleted file mode 100644 index a02385d..0000000 --- a/ksh-20110208-arrays.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ksh-20110208/src/cmd/ksh93/bltins/typeset.c.oddarrays ksh-20110208/src/cmd/ksh93/bltins/typeset.c ---- ksh-20110208/src/cmd/ksh93/bltins/typeset.c.oddarrays 2010-12-31 01:15:57.000000000 +0100 -+++ ksh-20110208/src/cmd/ksh93/bltins/typeset.c 2011-03-29 07:21:03.484519769 +0200 -@@ -587,7 +587,7 @@ static int b_common(char **argv,regi - path_alias(np,path_absolute(shp,nv_name(np),NIL(Pathcomp_t*))); - continue; - } -- np = nv_open(name,troot,nvflags|((nvflags&NV_ASSIGN)?0:NV_ARRAY)|NV_FARRAY); -+ np = nv_open(name,troot,nvflags|((nvflags&NV_ASSIGN)?0:NV_ARRAY)|(iarray?NV_FARRAY:0)); - if(nv_isnull(np) && !nv_isarray(np) && nv_isattr(np,NV_NOFREE)) - nv_offattr(np,NV_NOFREE); - if(tp->pflag) diff --git a/ksh-20110208-clist.patch b/ksh-20110208-clist.patch deleted file mode 100644 index 4f9d1ed..0000000 --- a/ksh-20110208-clist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ksh-20110208/src/cmd/ksh93/sh/subshell.c.clist ksh-20110208/src/cmd/ksh93/sh/subshell.c ---- ksh-20110208/src/cmd/ksh93/sh/subshell.c.clist 2010-11-03 21:01:11.000000000 +0100 -+++ ksh-20110208/src/cmd/ksh93/sh/subshell.c 2011-03-02 15:52:14.339083830 +0100 -@@ -242,7 +242,7 @@ Namval_t *sh_assignok(register Namval_t - if(!sp->shpwd || np==SH_LEVELNOD || np==L_ARGNOD || np==SH_SUBSCRNOD || np==SH_NAMENOD) - return(np); - /* don't bother to save if in newer scope */ -- if(sp->var!=shp->var_tree && shp->last_root==shp->var_tree) -+ if(sp->var!=shp->var_tree && sp->var!=shp->var_base && shp->last_root==shp->var_tree) - return(np); - if((ap=nv_arrayptr(np)) && (mp=nv_opensub(np))) - { diff --git a/ksh-20110208-suspend.patch b/ksh-20110208-suspend.patch deleted file mode 100644 index de7cee1..0000000 --- a/ksh-20110208-suspend.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ksh-20110208/src/cmd/ksh93/sh/jobs.c.suspend ksh-20110208/src/cmd/ksh93/sh/jobs.c ---- ksh-20110208/src/cmd/ksh93/sh/jobs.c.suspend 2010-12-01 17:57:47.000000000 +0100 -+++ ksh-20110208/src/cmd/ksh93/sh/jobs.c 2011-03-29 17:01:32.880515568 +0200 -@@ -945,6 +945,7 @@ int job_walk(Sfio_t *file,int (*fun)(str - if(!(pw = job_bypid(pid))) - { - pw = &dummy; -+ pw->p_shp = sh_getinterp(); - pw->p_pid = pid; - pw->p_pgrp = pid; - } diff --git a/ksh.spec b/ksh.spec index 15dacc1..8c3cd4a 100644 --- a/ksh.spec +++ b/ksh.spec @@ -1,12 +1,12 @@ -%global releasedate 2011-02-08 +%global releasedate 2011-04-15 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: CPL -Version: 20110208 -Release: 3%{?dist} +Version: 20110415 +Release: 1%{?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 Source3: kshrc.rhs @@ -20,15 +20,6 @@ Patch1: ksh-20070328-builtins.patch #fix regression test suite to be usable during packagebuild - Fedora/RHEL specific Patch2: ksh-20100826-fixregr.patch -Patch3: ksh-20110208-clist.patch - -#for ksh<=20110329 -Patch4: ksh-20110208-arrays.patch - -#for ksh<=20110329 -Patch5: ksh-20110208-suspend.patch - - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Conflicts: pdksh Requires: coreutils, glibc-common, diffutils @@ -49,9 +40,6 @@ with "sh" (the Bourne Shell). %setup -q -T -D -a 1 %patch1 -p1 -b .builtins %patch2 -p1 -b .fixregr -%patch3 -p1 -b .clist -%patch4 -p1 -b .oddarrays -%patch5 -p1 -b .suspend #/dev/fd test does not work because of mock sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options @@ -130,6 +118,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 18 2011 Michal Hlavinka - 20110415-1 +- ksh updated to 2011-04-15 + * Tue Mar 29 2011 Michal Hlavinka - 20110208-3 - fix array definition being treated as fixed array - fix suspend crashing ksh diff --git a/sources b/sources index 8a35cd7..275daaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5481d41adf067503afbad92d048ff91a ast-ksh.2011-02-08.tgz -2870a583f7c170d4f67b1d9858d6b091 INIT.2011-02-08.tgz +8e0269bcb1f6c231c2e59c2f303bf975 ast-ksh.2011-04-15.tgz +5b7b17c38502cbceecf05edbb1be4b00 INIT.2011-04-15.tgz