pool/ksh
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 155544 from shells

Browse Source 
- Avoid segmentation fault on typeset on ENV variable (bnc#803613)

OBS-URL: https://build.opensuse.org/request/show/155544
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ksh?expand=0&rev=89
This commit is contained in:
Stephan Kulow 2013-02-17 16:04:16 +00:00 committed by Git OBS Bridge
commit d74c81aa2b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ksh.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 15 14:40:41 UTC 2013 - werner@suse.de
- Avoid segmentation fault on typeset on ENV variable (bnc#803613)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 7 13:56:58 UTC 2013 - werner@suse.de Thu Feb 7 13:56:58 UTC 2013 - werner@suse.de

4
ksh.spec
View File

@ -112,7 +112,7 @@ Patch24: ksh93-builtin.dif
# is part of ksh93u+ 2012-06-28 # is part of ksh93u+ 2012-06-28
# PATCH-EXTEND-UPSTREAM astksh_builtin_poll20120806_001.diff [bnc#779888] # PATCH-EXTEND-UPSTREAM astksh_builtin_poll20120806_001.diff [bnc#779888]
Patch27: astksh_builtin_poll20120806_001.diff Patch27: astksh_builtin_poll20120806_001.diff
# PATCH-FIX-UPSTREAM ksh93-env.dif [bnc#785266] # PATCH-FIX-UPSTREAM ksh93-env.dif [bnc#785266, bnc#803613]
Patch28: ksh93-env.dif Patch28: ksh93-env.dif
# PATCH-FIX-UPSTREAM ksh93-zerofill.dif [bnc#785360] # PATCH-FIX-UPSTREAM ksh93-zerofill.dif [bnc#785360]
Patch29: ksh93-zerofill.dif Patch29: ksh93-zerofill.dif
@ -366,6 +366,8 @@ fi
RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}" RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
cflags -mno-powerpc64 RPM_OPT_FLAGS cflags -mno-powerpc64 RPM_OPT_FLAGS
HOSTTYPE=linux.powerpc HOSTTYPE=linux.powerpc
_PACKAGE_HOSTTYPE_=linux.powerpc
export _PACKAGE_HOSTTYPE_
;; ;;
ppc64|powerpc64) ppc64|powerpc64)
RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}" RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"

11
ksh93-env.dif
View File

@ -1,3 +1,14 @@
--- src/cmd/ksh93/sh/init.c
+++ src/cmd/ksh93/sh/init.c 2013-02-15 13:29:57.129444048 +0000
@@ -336,6 +336,8 @@ static void put_restricted(register Namv
int path_scoped = 0, fpath_scoped=0;
Pathcomp_t *pp;
char *name = nv_name(np);
+ if (!shp)
+ shp = sh_getinterp();
if(!(flags&NV_RDONLY) && sh_isoption(SH_RESTRICTED))
errormsg(SH_DICT,ERROR_exit(1),e_restricted,nv_name(np));
if(np==PATHNOD || (path_scoped=(strcmp(name,PATHNOD->nvname)==0)))
--- src/cmd/ksh93/sh/name.c --- src/cmd/ksh93/sh/name.c
+++ src/cmd/ksh93/sh/name.c 2012-10-16 12:12:43.000000000 +0000 +++ src/cmd/ksh93/sh/name.c 2012-10-16 12:12:43.000000000 +0000
@@ -2162,7 +2162,7 @@ static void attstore(register Namval_t * @@ -2162,7 +2162,7 @@ static void attstore(register Namval_t *