diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/ap/ksh93/patches/ksh-20120801-fd2lost.patch | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/ksh93/patches/ksh-20120801-fd2lost.patch')
-rw-r--r-- | source/ap/ksh93/patches/ksh-20120801-fd2lost.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/source/ap/ksh93/patches/ksh-20120801-fd2lost.patch b/source/ap/ksh93/patches/ksh-20120801-fd2lost.patch deleted file mode 100644 index fbb76070e..000000000 --- a/source/ap/ksh93/patches/ksh-20120801-fd2lost.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up ksh-20120801/src/cmd/ksh93/sh/macro.c.orig ksh-20120801/src/cmd/ksh93/sh/macro.c ---- ksh-20120801/src/cmd/ksh93/sh/macro.c.orig 2013-12-09 13:13:22.153525239 +0100 -+++ ksh-20120801/src/cmd/ksh93/sh/macro.c 2013-12-09 13:20:58.144635385 +0100 -@@ -391,7 +391,7 @@ void sh_machere(Shell_t *shp,Sfio_t *inf - break; - } - case S_PAR: -- comsubst(mp,(Shnode_t*)0,1); -+ comsubst(mp,(Shnode_t*)0,3); - break; - case S_EOF: - if((c=fcfill()) > 0) -@@ -1165,7 +1165,7 @@ retry1: - case S_PAR: - if(type) - goto nosub; -- comsubst(mp,(Shnode_t*)0,1); -+ comsubst(mp,(Shnode_t*)0,3); - return(1); - case S_DIG: - var = 0; -@@ -2152,10 +2152,12 @@ static void comsubst(Mac_t *mp,register - mp->ifsp = nv_getval(np); - stkset(stkp,savptr,savtop); - newlines = 0; -- if(type/*==3 - don't break `` vs $() */ && mp->shp->spid) -+ if(type==3 && mp->shp->spid) - { - job_wait(mp->shp->spid); -- mp->shp->spid = 0; -+ if(mp->shp->pipepid==mp->shp->spid) -+ mp->shp->spid = 0; -+ mp->shp->pipepid = 0; - } - sfsetbuf(sp,(void*)sp,0); - bufsize = sfvalue(sp); -diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.anotherfix ksh-20120801/src/cmd/ksh93/sh/subshell.c ---- ksh-20120801/src/cmd/ksh93/sh/subshell.c.anotherfix 2014-01-20 14:43:46.410416327 +0100 -+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c 2014-01-20 14:43:46.444416042 +0100 -@@ -122,7 +122,8 @@ void sh_subtmpfile(Shell_t *shp) - else if(errno!=EBADF) - errormsg(SH_DICT,ERROR_system(1),e_toomany); - /* popping a discipline forces a /tmp file create */ -- sfdisc(sfstdout,SF_POPDISC); -+ if(shp->comsub != 1) -+ sfdisc(sfstdout,SF_POPDISC); - if((fd=sffileno(sfstdout))<0) - { - /* unable to create the /tmp file so use a pipe */ -diff -up ksh-20120801/src/cmd/ksh93/sh/xec.c.anotherfix ksh-20120801/src/cmd/ksh93/sh/xec.c ---- ksh-20120801/src/cmd/ksh93/sh/xec.c.anotherfix 2014-01-20 14:47:30.527524008 +0100 -+++ ksh-20120801/src/cmd/ksh93/sh/xec.c 2014-01-20 14:47:30.563523703 +0100 -@@ -1773,7 +1773,11 @@ int sh_exec(register const Shnode_t *t, - if(shp->pipepid) - shp->pipepid = parent; - else -+ { - job_wait(parent); -+ if(parent==shp->spid) -+ shp->spid = 0; -+ } - if(shp->topfd > topfd) - sh_iorestore(shp,topfd,0); - if(usepipe && tsetio && subdup && unpipe) |