commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2019-09-16 10:50:59
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new.7948 (New)
Package is "ksh"
Mon Sep 16 10:50:59 2019 rev:109 rq:730729 version:93vu
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2017-12-21 11:29:53.381951662
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new.7948/ksh.changes2019-09-16
10:51:01.911167342 +0200
@@ -1,0 +2,6 @@
+Fri Sep 6 17:25:26 CEST 2019 - m...@suse.de
+
+- fix build by removing -Werror=return-type and using
+ -ffat-lto-objects
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.RKJOJL/_old 2019-09-16 10:51:03.071167191 +0200
+++ /var/tmp/diff_new_pack.RKJOJL/_new 2019-09-16 10:51:03.075167190 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ksh
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -66,7 +66,7 @@
Version:93vu
Release:0
Summary:Korn Shell
-License:CPL-1.0 and EPL-1.0
+License:CPL-1.0 AND EPL-1.0
Group: System/Shells
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.%{date}.tar.bz2
@@ -274,6 +274,8 @@
%patch63 -p 1
%build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+
#
# Check for a clean signal environment for runtime tests
#
@@ -322,6 +324,8 @@
RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-as-needed/-no-as-needed/}"
# Use POSIX as environment
test -n "${!LC_*}" && unset "${!LC_*}"
+ # ksh currently does not build with -Werror=return-type
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-Werror=return-type/}"
cflags ()
{
set +x
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2017-12-21 11:29:43 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is "ksh" Thu Dec 21 11:29:43 2017 rev:108 rq:558827 version:93vu Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2015-06-30 10:19:23.0 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2017-12-21 11:29:53.381951662 +0100 @@ -1,0 +2,86 @@ +Wed Dec 20 13:18:32 CET 2017 - m...@suse.de + +- fix build with new glibc versions + new patch: ksh93-filedefined.dif + +--- +Wed Oct 12 13:23:14 CEST 2016 - m...@suse.de + +- fix locking error in spawn implementation [bnc#988213] + new patch: ksh93-spawnlock.dif +- make patch ordering the same as in sle-11 + +--- +Tue Jul 5 14:49:03 CEST 2016 - m...@suse.de + +- own the ksh files in /etc/alternatives [bnc#987362] [bnc#962069] +- fix leak in optimize processing [bnc#982423] + new patch: ksh93-optimizeleak.dif +- fix editor prediction code garbling input [bnc#964966] + new patch: ksh93-edpredict.dif + +--- +Wed Dec 16 16:00:53 CET 2015 - m...@suse.de + +- add ast suffix to optbin manpages to prevent file conflicts +- fix fd leak when doing redirects in a subshell [bnc#954856] + new patch: ksh93-redirectleak.dif +- rewrite ksh93-backtick.dif to a more correct version + [bnc#953533] [bnc#955221] +- also tweak ksh93-backtick.dif so that the pipe is drained after + io_restore is called. + +--- +Tue Sep 15 18:07:09 CEST 2015 - m...@suse.de + +- fix freeing memory twice if an array is turned into an + compound variable and then unset [bnc#924043] + new patch: ksh93-nvtree-free.dif +- backport fix for segmentation fault with 'typeset -RF' + new patch: ksh93-int16double.dif +- backport hanging command substitution with large output fix from + upstream [bnc#887320] [bnc#926172] [bnc#934437] + new patch: ksh93-backtick.dif +- backport job list corruption fix from ksg93v [bnc#924318] + new patch: ksh93-jpold.dif + +--- +Fri Jun 12 13:54:45 CEST 2015 - m...@suse.de + +- go back to ksh93u to have a stable version in SLE-12 + use 93vu as version so that the software stack sees this + as an update. (FATE#319107, bsc#939252) +- add back the following patches: + * astksh_builtin_poll20120806_001.diff + * ksh93-backticks.dif + * ksh93-crashes.dif + * ksh93-dttree-crash.dif + * ksh93-fdstatus.dif + * ksh93-heredoclex.dif + * ksh93-jobs.dif + * ksh93-sfio.dif + * ksh93-uninitialized.dif +- fix stk aliasing code [bnc#844071] + new patch: ksh93-stkalias.dif +- fix stk restoration in sh_exec [bnc#844071] + new patch: ksh93-stkfreeze.dif +- make a unknown location fatal in stkset so that we get a core + dump right away instead of later in an unrelated part of code + new patch: ksh93-stkset-abort.dif +- fix build with std malloc + new patch: ksh93-malloc-hook.dif +- backport job locking code fix + new patch: ksh93-joblock.dif +- disable vfork, use fork instead + new patch: ksh93-disable-vfork.dif +- fix crash when the subshell number overflows [bnc#893031] + new patch: ksh93-longenv.dif +- fix path normalization in cd command [bnc#867401] + new patch: ksh93-cdpwd.dif +- fix segfault in dirname when cwd is gone [bnc#852160] + new patch: ksh93-subshellpwd.dif +- Fix ksh using wrong files is some elements in the path do not + exist [bnc#899014] + new patch: ksh93-path-skip.dif + +--- Old: INIT.2014-06-25.tar.bz2 ast-base.2014-06-25.tar.bz2 ksh93-backticks.dif ksh93-crashes.dif New: INIT.2012-08-01.tar.bz2 ast-base.2012-08-01.tar.bz2 astksh_builtin_poll20120806_001.diff ksh93-backtick.dif ksh93-cdpwd.dif ksh93-disable-vfork.dif ksh93-dttree-crash.dif ksh93-edpredict.dif ksh93-fdstatus.dif ksh93-filedefined.dif ksh93-heredoclex.dif ksh93-int16double.dif ksh93-joblock.dif ksh93-jobs.dif ksh93-jpold.dif ksh93-longenv.dif ksh93-malloc-hook.dif ksh93-nvtree-free.dif ksh93-optimizeleak.dif ksh93-path-skip.dif ksh93-redirectleak.dif ksh93-sfio.dif ksh93-spawnlock.dif ksh93-stkalias.dif ksh93-stkfreeze.dif ksh93-stkset-abort.dif ksh93-subshellpwd.dif ksh93-uninitialized.dif Other differences: -- ++ ksh.spec ++ --- /var/tmp/diff_new_pack.H72VXR/_old 2017-12-21 11:29:57.169766971 +0100 +++
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2015-06-30 10:19:21 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is ksh Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2014-08-03 15:36:20.0 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2015-06-30 10:19:23.0 +0200 @@ -1,0 +2,5 @@ +Thu Jun 11 10:42:59 UTC 2015 - sch...@suse.de + +- cpp.patch: fix use of cc -E without -P + +--- New: cpp.patch Other differences: -- ++ ksh.spec ++ --- /var/tmp/diff_new_pack.FO0P2B/_old 2015-06-30 10:19:24.0 +0200 +++ /var/tmp/diff_new_pack.FO0P2B/_new 2015-06-30 10:19:24.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package ksh # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,6 +134,8 @@ Patch37:ksh93-crashes.dif # PATCH-FIX-SUSE Strings in backticks cannot be longer than 65536 characters bnc#887320 Patch38:ksh93-backticks.dif +# PATCH-FIX-UPSTREAM fix use of cc -E without -P +Patch39:cpp.patch Patch42:ksh-locale.patch %description @@ -219,6 +221,7 @@ %patch36 %patch37 #%patch38 +%patch39 -p1 %patch42 %build ++ cpp.patch ++ iffe depends on cc -E not inserting newlines between tokens Index: ksh93/src/cmd/INIT/iffe.sh === --- ksh93.orig/src/cmd/INIT/iffe.sh +++ ksh93/src/cmd/INIT/iffe.sh @@ -3427,7 +3427,7 @@ $src (eval $src) $nullin || e=1 ;; mac*|nomac*) - if compile $cc -E $tmp.c $nullin $tmp.i + if compile $cc -E -P $tmp.c $nullin $tmp.i thensed -e '/[]*.*[ ]*/!d' -e 's/[ ]*//g' -e 's/[]*//g' $tmp.i elsee=1 fi @@ -3718,7 +3718,7 @@ $inc \#define $v\ $v \/* native $v */\ \#endif\ #endif $tmp.c - if compile $cc -E $tmp.c $nullin $tmp.i + if compile $cc -E -P $tmp.c $nullin $tmp.i thensed -e '/[]*.*[ ]*/!d' -e 's/[ ]*//g' -e 's/[]*//g' $tmp.i $tmp.t if test -s $tmp.t thensuccess
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2014-08-03 15:36:18
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2014-07-18 14:03:49.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2014-08-03
15:36:20.0 +0200
@@ -1,0 +2,17 @@
+Fri Aug 1 06:58:17 UTC 2014 - wer...@suse.de
+
+- Disable patch ksh93-backticks.dif as it breaks several test cases
+
+---
+Thu Jul 31 12:42:49 UTC 2014 - dims...@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+ Follow the packaging guidelines.
+
+---
+Fri Jul 18 14:14:23 UTC 2014 - wer...@suse.de
+
+- Add patch ksh93-backticks.dif to allow the ksh to use more than
+ 65536 characters in the output of old fashion `...` commands (bnc#887320)
+
+---
Old:
rpmlintrc
New:
ksh-rpmlintrc
ksh93-backticks.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.AqiPGA/_old 2014-08-03 15:36:21.0 +0200
+++ /var/tmp/diff_new_pack.AqiPGA/_new 2014-08-03 15:36:21.0 +0200
@@ -91,7 +91,7 @@
Source14: leak3.sh
Source20: Agreement
Source21: Warning
-Source30: rpmlintrc
+Source30: ksh-rpmlintrc
Source31: vmbalance
Source42: sigexec.c
Patch: ksh93.dif
@@ -132,6 +132,8 @@
Patch36:ksh93-fs3d.dif
# PATCH-FIX-SUSE Various crashes fixed for bnc#844071
Patch37:ksh93-crashes.dif
+# PATCH-FIX-SUSE Strings in backticks cannot be longer than 65536 characters
bnc#887320
+Patch38:ksh93-backticks.dif
Patch42:ksh-locale.patch
%description
@@ -216,6 +218,7 @@
%patch34
%patch36
%patch37
+#%patch38
%patch42
%build
++ ksh-rpmlintrc ++
addFilter(.*binary-or-shlib-defines-rpath.*/lib/ast/.*\.so.*)
addFilter(.*binary-or-shlib-defines-rpath.*/lib/ast/bin/shcomp.*)
addFilter(.*binary-or-shlib-defines-rpath.*/lib/ast/bin/ksh.*)
addFilter(.*binary-or-shlib-defines-rpath.*/lib64/ast/.*\.so.*)
addFilter(.*binary-or-shlib-defines-rpath.*/lib64/ast/bin/shcomp.*)
addFilter(.*binary-or-shlib-defines-rpath.*/lib64/ast/bin/ksh.*)
addFilter(.*suse-filelist-forbidden-devel-in-lib.*/lib/ast/.*\.so.*)
addFilter(.*suse-filelist-forbidden-devel-in-lib.*/lib64/ast/.*\.so.*)
addFilter(.*devel-file-in-non-devel-package.*/lib/ast/.*\.so)
addFilter(.*devel-file-in-non-devel-package.*/lib64/ast/.*\.so)
addFilter(.*script-without-shebang.*/usr/share/ksh/fun/.*)
addFilter(.*no-rpm-opt-flags.*ldtest.c.*)
addFilter(.*invalid-suse-version-check.*)
addFilter(.*obsolete-suse-version-check.*)
++ ksh93-backticks.dif ++
---
src/cmd/ksh93/sh/macro.c|2 -
1 file changed, 1 insertion(+), 1 deletion(-)
--- src/cmd/ksh93/sh/macro.c
+++ src/cmd/ksh93/sh/macro.c2014-07-18 13:50:47.590235743 +
@@ -2198,7 +2198,7 @@ static void comsubst(Mac_t *mp,register
mp-shp-inlineno = error_info.line+mp-shp-st.firstline;
t = (Shnode_t*)sh_parse(mp-shp, sp,SH_EOF|SH_NL);
mp-shp-inlineno = c;
- type = 1;
+ type = 3;
}
#if KSHELL
if(t)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2014-07-18 14:03:39
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2014-07-16 16:16:22.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2014-07-18
14:03:49.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 17 11:07:34 UTC 2014 - wer...@suse.de
+
+- Skip signal test as currently ksh93 uses malloc() within signal
+ handlers and this cause deadlocks even with libast memory
+ management
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.GtxzYV/_old 2014-07-18 14:03:51.0 +0200
+++ /var/tmp/diff_new_pack.GtxzYV/_new 2014-07-18 14:03:51.0 +0200
@@ -31,6 +31,7 @@
%endif
%bcond_withuse_locale
%bcond_withvm_debug
+%bcond_without skip_signals
BuildRequires: bind-utils
BuildRequires: bison
BuildRequires: flex
@@ -540,6 +541,10 @@
SHCOMP=${TMPDIR}/bin/shcomp
export PATH SHCOMP SHELL
pushd ${test}
+%if %{with skip_signals}
+ echo Skip signal.sh test as this is broken due used malloc() in signal
handlers
+ rm -vf signal.sh
+%endif
typeset -i failed=0
ln -sf ${root}/lib ${test}/../
unset ${!LESS*}
++ sigexec.c ++
--- /var/tmp/diff_new_pack.GtxzYV/_old 2014-07-18 14:03:51.0 +0200
+++ /var/tmp/diff_new_pack.GtxzYV/_new 2014-07-18 14:03:51.0 +0200
@@ -166,6 +166,9 @@
dup2(pts, 2);
close(pts);
close(ptm);
+ sa.sa_flags = SA_RESTART;
+ sa.sa_handler = SIG_IGN;
+ sigaction(SIGHUP, sa, (struct sigaction*)0);
if (ioctl (0, TIOCSCTTY, 1) 0) {
perror(pty: can not get controlling tty);
exit(errno);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-12-11 11:28:39
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-11-29 21:25:21.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-12-11
11:28:41.0 +0100
@@ -1,0 +2,5 @@
+Fri Dec 6 21:13:42 UTC 2013 - m...@suse.de
+
+- Recognize ppc64le (setting HOSTTYPE to powerpc64le)
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.WasGQ0/_old 2013-12-11 11:28:42.0 +0100
+++ /var/tmp/diff_new_pack.WasGQ0/_new 2013-12-11 11:28:42.0 +0100
@@ -392,6 +392,13 @@
_PACKAGE_HOSTTYPE_=linux.powerpc
export _PACKAGE_HOSTTYPE_
;;
+ ppc64le|powerpc64le)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O}
+# -mpowerpc64 is correct, the compiler defaults to
+# little endian anyway
+cflags -mpowerpc64 RPM_OPT_FLAGS
+HOSTTYPE=linux.powerpc64le
+;;
ppc64|powerpc64)
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O}
cflags -mpowerpc64 RPM_OPT_FLAGS
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-11-29 21:25:19
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-11-29 16:22:50.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-11-29
21:25:21.0 +0100
@@ -1,0 +2,5 @@
+Fri Nov 29 15:45:44 UTC 2013 - wer...@suse.de
+
+- Add patch ksh93-pwd.dif to fix crash if cwd is gone (bnc#852160)
+
+---
New:
ksh93-pwd.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.YStJ3l/_old 2013-11-29 21:25:23.0 +0100
+++ /var/tmp/diff_new_pack.YStJ3l/_new 2013-11-29 21:25:23.0 +0100
@@ -135,6 +135,8 @@
Patch36:ksh93-fs3d.dif
# PATCH-FIX-UPSTREAM Ouch ... use memmove instead of memcopy on overlapping
areas
Patch37:ksh93-sfio.dif
+# PATCH-FIX-SUSE Do not crash wenn cwd is gone [bnc#852160]
+Patch38:ksh93-pwd.dif
Patch42:ksh-locale.patch
%description
@@ -226,6 +228,7 @@
%patch35
%patch36
%patch37
+%patch38
%build
#
++ ksh93-pwd.dif ++
--- src/cmd/ksh93/sh/subshell.c
+++ src/cmd/ksh93/sh/subshell.c 2013-11-29 14:46:37.966735617 +
@@ -549,7 +549,9 @@ Sfio_t *sh_subshell(Shell_t *shp,Shnode_
#ifdef _lib_fchdir
for(xp=sp-prev; xp; xp=xp-prev)
{
- if(xp-pwdfd0 strcmp(xp-pwd,shp-pwd)==0)
+ if (!shp-pwd)
+ break;
+ if(xp-pwdfd0 xp-pwd
strcmp(xp-pwd,shp-pwd)==0)
{
sp-pwdfd = xp-pwdfd;
break;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-11-12 09:50:25
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-11-07 12:53:05.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-11-12
09:50:26.0 +0100
@@ -1,0 +2,6 @@
+Tue Oct 29 17:44:05 UTC 2013 - g...@opensuse.org
+
+- deliver %{_sysconfdir}/ksh.kshrc as a packaged symlink on
+ openSUSE = 13.2
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.nVOVJk/_old 2013-11-12 09:50:27.0 +0100
+++ /var/tmp/diff_new_pack.nVOVJk/_new 2013-11-12 09:50:27.0 +0100
@@ -670,6 +670,9 @@
ln -sf /%{_lib}/ast/$so %{buildroot}%{_libdir}/ast/${so.*}.so
done
rm -f %{buildroot}%{_libdir}/ast/*.so.*
+%if %suse_version = 1320
+ ln -s %{_sysconfdir}/bash.bashrc %{buildroot}%{_sysconfdir}/ksh.kshrc
+%endif
sed -rn '/^\.de Af/,/^\.\./p;/^\.de aF/,/^\.\./p' man/man3/int.3 af.man
for man in $(grep -l '\.}S' man/man[138]/*.[138]); do
sed -ri '1r af.man' $man
@@ -754,7 +757,9 @@
%endif
%post
+%if %suse_version 1320
test -e etc/bash.bashrc ln -sf bash.bashrc etc/ksh.kshrc || true
+%endif
%if %use_suid_exe
%if %{defined set_permissions}
%set_permissions /%{_lib}/ast/bin/suid_exec
@@ -802,6 +807,7 @@
%endif
%postun
+%if %suse_version 1320
if test $1 -eq 0 -a ! -x bin/ksh ; then
if test ! -x bin/pdksh ; then
rm -f etc/ksh.kshrc
@@ -810,11 +816,14 @@
rm -f bin/ksh %{_exec_prefix}/bin/ksh
%endif
fi
+%endif
%posttrans
+%if %suse_version 1320
if test -x bin/ksh -o -x bin/pdksh ; then
test -e etc/bash.bashrc ln -sf bash.bashrc etc/ksh.kshrc || true
fi
+%endif
%files -f ksh.lang
%defattr(-,root,root)
@@ -855,6 +864,9 @@
%dir %{_datadir}/ksh
%dir %{_datadir}/ksh/fun
%{_datadir}/ksh/fun/*
+%if %suse_version = 1320
+%{_sysconfdir}/ksh.kshrc
+%endif
%files -n ksh-devel
%defattr(-,root,root)
++ ksh93-dttree-crash.dif ++
--- /var/tmp/diff_new_pack.nVOVJk/_old 2013-11-12 09:50:27.0 +0100
+++ /var/tmp/diff_new_pack.nVOVJk/_new 2013-11-12 09:50:27.0 +0100
@@ -1,6 +1,388 @@
+--- src/cmd/ksh93/bltins/typeset.c
src/cmd/ksh93/bltins/typeset.c 2013-10-25 13:20:42.799733785 +
+@@ -579,7 +579,7 @@ static int setall(char **argv,regist
+ np =
sh_fsearch(shp,name,NV_ADD|HASH_NOSCOPE);
+ else
+ #endif /* SHOPT_NAMESPACE */
+- np =
nv_open(name,sh_subfuntree(1),NV_NOARRAY|NV_IDENT|NV_NOSCOPE);
++ np =
nv_open(name,sh_subfuntree(shp,1),NV_NOARRAY|NV_IDENT|NV_NOSCOPE);
+ }
+ else
+ {
+@@ -1168,14 +1168,14 @@ static int unall(int argc, char **argv,
+ {
+ name = sh_optunalias;
+ if(shp-subshell)
+- troot = sh_subaliastree(0);
++ troot = sh_subaliastree(shp,0);
+ }
+ else
+ name = sh_optunset;
+ while(r = optget(argv,name)) switch(r)
+ {
+ case 'f':
+- troot = sh_subfuntree(1);
++ troot = sh_subfuntree(shp,1);
+ break;
+ case 'a':
+ all=1;
+--- src/cmd/ksh93/include/defs.h
src/cmd/ksh93/include/defs.h 2013-10-25 13:20:42.799733785 +
+@@ -423,10 +423,10 @@ extern void sh_printopts(Shopt_t,int,Sh
+ extern intsh_readline(Shell_t*,char**,volatile
int,int,ssize_t,long);
+ extern Sfio_t *sh_sfeval(char*[]);
+ extern void sh_setmatch(Shell_t*,const char*,int,int,int[],int);
+-extern Dt_t *sh_subaliastree(int);
++extern Dt_t *sh_subaliastree(Shell_t*,int);
+ extern void sh_scope(Shell_t*, struct argnod*, int);
+ extern Namval_t *sh_scoped(Shell_t*, Namval_t*);
+-extern Dt_t *sh_subfuntree(int);
++extern Dt_t *sh_subfuntree(Shell_t*,int);
+ extern void sh_subjobcheck(pid_t);
+ extern intsh_subsavefd(int);
+ extern void sh_subtmpfile(Shell_t*);
+--- src/cmd/ksh93/sh/arith.c
src/cmd/ksh93/sh/arith.c 2013-10-25 13:20:42.799733785 +
+@@ -180,7 +180,10 @@ static Namval_t *scope(register Namval_t
+ {
+ ap = nv_arrayptr(np);
+
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-11-07 12:53:04
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-09-23 09:37:27.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-11-07
12:53:05.0 +0100
@@ -1,0 +2,27 @@
+Fri Oct 25 14:07:57 UTC 2013 - wer...@suse.de
+
+- Add missing sfsetbuf() in patch ksh93-fdstatus.dif
+- Rework patch ksh93-dttree-crash.dif
+- Rework patch ksh93-uninitialized.dif
+
+---
+Tue Oct 22 11:58:21 UTC 2013 - wer...@suse.de
+
+- Change patch ksh93-fdstatus.dif by adding some more EINTR wrapper
+
+---
+Fri Oct 18 12:21:58 UTC 2013 - wer...@suse.de
+
+- Add patch ksh93-sfio.dif as on overlapping memory areas there
+ should memmove be used instead of memcopy (backport 2013-10-10)
+
+---
+Fri Oct 18 10:41:05 UTC 2013 - wer...@suse.de
+
+- Change patch ksh93-fdstatus.dif which may solve bnc#844071
+- Add patch ksh93-fs3d.dif to avoid crash due dummy function call
+ fs3d_mount(3ast) during valgrind sessions
+- Add patch ksh93-uninitialized.dif to avoid sometimes random
+ errors on busy systems which may also related to bnc#844071
+
+---
New:
ksh93-fs3d.dif
ksh93-sfio.dif
ksh93-uninitialized.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.O5TqHr/_old 2013-11-07 12:53:06.0 +0100
+++ /var/tmp/diff_new_pack.O5TqHr/_new 2013-11-07 12:53:06.0 +0100
@@ -129,6 +129,12 @@
Patch33:ksh93-fdstatus.dif
# PATCH-FIX-UPSTREAM ksh93-alias-k.dif [bnc#824187]
Patch34:ksh93-alias-k.dif
+# PATCH-FIX-SUSE Reduce warnings about uninitialized varaibles (most of them
are handled correct)
+Patch35:ksh93-uninitialized.dif
+# PATCH-FIX-SUSE Do not use mount(2) system call instead of fs3d_mount(3ast)
+Patch36:ksh93-fs3d.dif
+# PATCH-FIX-UPSTREAM Ouch ... use memmove instead of memcopy on overlapping
areas
+Patch37:ksh93-sfio.dif
Patch42:ksh-locale.patch
%description
@@ -217,6 +223,9 @@
%patch32
%patch33
%patch34
+%patch35
+%patch36
+%patch37
%build
#
@@ -245,9 +254,6 @@
test -s $fd -a ! -c $fd break || true
done
set -- $(readlink $fd)
-grep pts /proc/mounts
-ls -ld /dev/ptmx
-ls -ld /dev/pts
exec ./sigexec $SHELL ${1+$@}
fi
IGNORED=0x$(ps --no-headers -o ignored $$)
@@ -324,6 +330,7 @@
cflags -Wno-implicit IGNORE
cflags -Wno-unused-value IGNORE
cflags -Wno-type-limits IGNORE
+ cflags -Wclobbered RPM_OPT_FLAGS
#
# Do not use -DSHOPT_SPAWN=1 and/or -DSHOPT_AMP=1 this would cause
# errors due race conditions while executing the test suite.
@@ -466,7 +473,7 @@
done
nobuiltin=${PWD}/.nobuiltin
nm -D ${root}/lib/libast.so | \
- grep -E 'T[[:blank:]](_ast_)?(str|mem|(get|put|set)env|(c|m|re|v)alloc)'
| \
+ grep -E
'T[[:blank:]](_ast_)?(str|mem|(get|put|set)env|free|(c|m|re|v|vm)alloc)' | \
sed -r
's/[[:xdigit:]]+[[:blank:]]+T[[:blank:]]+(_ast_)?([^[:blank:]]*)/-fno-builtin-\2/'
| \
sort -u $nobuiltin
rm -rf $root
@@ -481,7 +488,7 @@
*) cflags @$nobuiltinRPM_OPT_FLAGS
esac
- export .env
+ export | grep -vE 'PROFILEREAD|PWD|MAIL|HOME|HOST|HIST|LESS|TMP' .env
bin/package make CCFLAGS=$RPM_OPT_FLAGS -I${root}/include
HOSTTYPE=$HOSTTYPE AR=$AR CC=$CC
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
@@ -535,7 +542,16 @@
sed -ri '/^L[[:blank:]]/a \t 8000' pty.sh
sed -ri 's/(SECONDS[[:blank:]]*[[:blank:]]*)([[:digit:]]+)/\18/'
signal.sh
unset ${!LESS*}
+ printf '\033[1m'
+ grep -E '^(model name|flags)[[:blank:]]*:' /proc/cpuinfo | sort -ur |
fold -s
+ printf '\033(B\033[m'
${SHELL} shtests
+ result=$(${SHELL} -k -c 'd=`/bin/echo x y=z`; echo $d x y=z')
+ test $result = 'x x' || exit 1
+ result=$(${SHELL} -c 'echo | echo x`/bin/echo y`')
+ test $result = xy || exit 1
+ result=$(${SHELL} -c 'echo | echo x$(/bin/echo y)')
+ test $result = xy || exit 1
exec 3 ${TMPDIR:-/tmp}/log
LANG=POSIX
strace $MEMORY -o '!%{S:31}' ${SHELL} %{S:10} 400
@@ -567,7 +583,9 @@
fi
LANG=POSIX
exec 3-
+ printf '\033[1m'
uniq -c ${TMPDIR:-/tmp}/log
+ printf '\033(B\033[m'
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-09-23 09:37:26
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-08-23 13:54:19.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-09-23
09:37:27.0 +0200
@@ -1,0 +2,11 @@
+Thu Sep 19 08:43:37 UTC 2013 - wer...@suse.de
+
+- Make vmbalance awk script more clear for small vm page sizes
+
+---
+Wed Sep 18 11:09:34 UTC 2013 - wer...@suse.de
+
+- Extend patch ksh93-fdstatus.dif to solve bnc#835885
+- Modify patch ksh93-builtin.dif to reduce timeouts of pty utility
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.uYwcwA/_old 2013-09-23 09:37:28.0 +0200
+++ /var/tmp/diff_new_pack.uYwcwA/_new 2013-09-23 09:37:28.0 +0200
@@ -245,6 +245,9 @@
test -s $fd -a ! -c $fd break || true
done
set -- $(readlink $fd)
+grep pts /proc/mounts
+ls -ld /dev/ptmx
+ls -ld /dev/pts
exec ./sigexec $SHELL ${1+$@}
fi
IGNORED=0x$(ps --no-headers -o ignored $$)
@@ -530,7 +533,7 @@
typeset -i failed=0
ln -sf ${root}/lib ${test}/../
sed -ri '/^L[[:blank:]]/a \t 8000' pty.sh
- sed -ri 's/(SECONDS[[:blank:]]*[[:blank:]]*)([[:digit:]]+)/\18/p'
signal.sh
+ sed -ri 's/(SECONDS[[:blank:]]*[[:blank:]]*)([[:digit:]]+)/\18/'
signal.sh
unset ${!LESS*}
${SHELL} shtests
exec 3 ${TMPDIR:-/tmp}/log
@@ -662,7 +665,7 @@
ln -sf ../man1/ksh93.1ast.gz %{buildroot}/%{_mandir}/man1/ksh.1ast.gz
ln -sf ../man1/ksh93.1ast.gz
%{buildroot}/%{_mandir}/man1/rksh.1ast.gz
%else
- install -m 0644 man/man1/sh.1ast %{buildroot}%{_mandir}/man1/ksh.1ast
+ install -m 0644 man/man1/sh.1
%{buildroot}%{_mandir}/man1/ksh.1ast
ln -sf ../man1/ksh.1ast.gz
%{buildroot}/%{_mandir}/man1/rksh.1ast.gz
%endif
install -m 0644 man/man1/shcomp.1ast %{buildroot}%{_mandir}/man1/shcomp.1ast
++ ksh93-builtin.dif ++
--- /var/tmp/diff_new_pack.uYwcwA/_old 2013-09-23 09:37:28.0 +0200
+++ /var/tmp/diff_new_pack.uYwcwA/_new 2013-09-23 09:37:28.0 +0200
@@ -1,6 +1,6 @@
--- src/cmd/builtin/pty.c
+++ src/cmd/builtin/pty.c 2013-02-01 15:59:52.697952156 +
-@@ -216,6 +216,12 @@ mkpty(int* master, int* slave)
+@@ -216,13 +216,19 @@ mkpty(int* master, int* slave)
#if !_lib_openpty
char* sname;
#endif
@@ -13,6 +13,24 @@
/*
* some systems hang hard during the handshake
* if you know why then please let us know
+*/
+
+- alarm(4);
+- if (tcgetattr(STDERR_FILENO, tty) = 0)
++ alarm(6);
++ if (tcgetattr(sffileno(sfstderr), tty) = 0)
+ ttyp = tty;
+ else
+ {
+@@ -230,7 +236,7 @@ mkpty(int* master, int* slave)
+ error(-1, unable to get standard error terminal attributes);
+ }
+ #ifdef TIOCGWINSZ
+- if (ioctl(STDERR_FILENO, TIOCGWINSZ, win) = 0)
++ if (ioctl(sffileno(sfstderr), TIOCGWINSZ, win) = 0)
+ winp = win;
+ else
+ {
@@ -238,6 +244,12 @@ mkpty(int* master, int* slave)
error(-1, unable to get standard error window size);
}
@@ -36,6 +54,87 @@
alarm(0);
return 0;
}
+@@ -317,9 +332,13 @@ process(Sfio_t* mp, Sfio_t* lp, int dela
+ char* s;
+ Sfio_t* ip;
+ Sfio_t* sps[2];
++ struct stat dst;
++ struct stat fst;
+
+ ip = sfstdin;
+- for (;;)
++ if (!fstat(sffileno(ip), dst) !stat(/dev/null, fst)
dst.st_dev == fst.st_dev dst.st_ino == fst.st_ino)
++ ip = 0;
++ do
+ {
+ i = 0;
+ t = timeout;
+@@ -336,39 +355,39 @@ process(Sfio_t* mp, Sfio_t* lp, int dela
+ {
+ if (n 0)
+ error(ERROR_SYSTEM|2, poll failed);
+- if (t 0)
+- break;
++ break;
+ }
+- else
+- for (i = 0; i n; i++)
++ for (i = t = 0; i n; i++)
++ {
++ if (!(sfvalue(sps[i]) SF_READ))
++ /*skip*/;
++ else if (sps[i] == mp)
+ {
+- if (!(sfvalue(sps[i]) SF_READ))
+- /*skip*/;
+-
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-08-23 13:54:17
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-08-01 17:14:54.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-08-23
13:54:19.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 13 09:59:45 UTC 2013 - dmuel...@suse.com
+
+- rediff ksh-qemu.patch
+
+---
Other differences:
--
++ ksh-qemu.patch ++
--- /var/tmp/diff_new_pack.k52fZl/_old 2013-08-23 13:54:20.0 +0200
+++ /var/tmp/diff_new_pack.k52fZl/_new 2013-08-23 13:54:20.0 +0200
@@ -1,6 +1,6 @@
--- src/lib/libast/features/lib
-+++ src/lib/libast/features/lib2007-03-28 15:49:29.0 +
-@@ -92,27 +92,6 @@ tst lib_poll_fd_1 note{ fd is first arg
src/lib/libast/features/lib
+@@ -92,27 +92,6 @@
}
}end
@@ -28,7 +28,7 @@
exp _lib_poll _lib_poll_fd_1||_lib_poll_fd_2
tst lib_poll_notimer note{ poll with no fds ignores timeout }end execute{
-@@ -241,74 +220,6 @@ tst real_vfork note{ vfork child shares
+@@ -241,120 +220,6 @@
}
}end
@@ -40,11 +40,11 @@
- #include signal.h
- #include fcntl.h
- #include string.h
-- #undef fork
- /* if it uses fork() why bother? */
-- pid_t fork _ARG_((void)) { return -1; }
-- pid_t _fork _ARG_((void)) { return -1; }
-- pid_t __fork _ARG_((void)) { return -1; }
+- #undef fork
+- pid_t fork _ARG_((void)) { NOTE(uses fork()); return -1; }
+- pid_t _fork _ARG_((void)) { NOTE(uses _fork()); return -1; }
+- pid_t __fork _ARG_((void)) { NOTE(uses __fork()); return -1; }
- int
- main(argc, argv)
- int argc;
@@ -61,40 +61,86 @@
- _exit(signal(SIGHUP, SIG_DFL) != SIG_IGN);
- signal(SIGHUP, SIG_IGN);
- if (posix_spawnattr_init(attr))
+- {
+- NOTE(posix_spawnattr_init() FAILED);
- _exit(0);
+- }
- if (posix_spawnattr_setpgroup(attr, 0))
+- {
+- NOTE(posix_spawnattr_setpgroup() FAILED);
- _exit(0);
+- }
- if (posix_spawnattr_setflags(attr, POSIX_SPAWN_SETPGROUP))
+- {
+- NOTE(posix_spawnattr_setflags() FAILED);
- _exit(0);
+- }
- /* first try an a.out and verify that SIGHUP is ignored */
- cmd[0] = argv[0];
- cmd[1] = test;
- cmd[2] = 0;
- if (posix_spawn(pid, cmd[0], 0, attr, cmd, 0))
+- {
+- NOTE(posix_spawn() FAILED);
- _exit(0);
+- }
- status = 1;
-- if (wait(status) 0 || status != 0)
+- if (wait(status) 0)
+- {
+- NOTE(wait() FAILED);
- _exit(0);
-- /* passing ENOEXEC to the shell is bogus */
+- }
+- if (status != 0)
+- {
+- NOTE(SIGHUP ignored in parent not ignored in child);
+- _exit(0);
+- }
+- /* must return exec-type errors or its useless to us *unless*
there is no [v]fork() */
- n = strlen(cmd[0]);
- if (n = (sizeof(tmp) - 3))
+- {
+- NOTE(test executable path too long);
- _exit(0);
+- }
- strcpy(tmp, cmd[0]);
- tmp[n] = '.';
- tmp[n+1] = 's';
- tmp[n+2] = 'h';
- tmp[n+3] = 0;
-- if (close(open(tmp, O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO)) 0 ||
chmod(tmp, S_IRWXU|S_IRWXG|S_IRWXO) 0)
+- if ((n = open(tmp, O_CREAT|O_WRONLY, S_IRWXU|S_IRWXG|S_IRWXO))
0 ||
+- chmod(tmp, S_IRWXU|S_IRWXG|S_IRWXO) 0 ||
+- write(n, exit 99\n, 8) != 8 ||
+- close(n) 0)
+- {
+- NOTE(test script create FAILED);
- _exit(0);
+- }
- cmd[0] = tmp;
-- n = 0;
+- n = 0; /* 0 means reject */
- pid = -1;
- if (posix_spawn(pid, cmd[0], 0, attr, cmd, 0))
+- {
- n = 2;
+- NOTE(ENOEXEC produces posix_spawn() error (BEST));
+- }
+- else if (pid
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-08-01 17:14:53
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-03-26 19:48:09.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-08-01
17:14:54.0 +0200
@@ -1,0 +2,16 @@
+Thu Aug 1 12:32:53 UTC 2013 - wer...@suse.de
+
+- Use own subsection 1ast in manual section 1 to avoid name space
+ conflicts
+
+---
+Tue Jun 11 16:55:30 UTC 2013 - wer...@suse.de
+
+- Add patch ksh93-alias-k.dif as fix for bnc#824187
+
+---
+Tue Apr 23 12:31:35 UTC 2013 - wer...@suse.de
+
+- Add patch ksh93-fdstatus.dif as fix for bnc#814135 and bnc#808449
+
+---
New:
ksh93-alias-k.dif
ksh93-fdstatus.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.rrYp7r/_old 2013-08-01 17:14:55.0 +0200
+++ /var/tmp/diff_new_pack.rrYp7r/_new 2013-08-01 17:14:55.0 +0200
@@ -124,6 +124,11 @@
Patch31:ksh93-dttree-crash.dif
# PATCH-FIX-UPSTREAM ksh93-heredoclex.dif [bnc#804998]
Patch32:ksh93-heredoclex.dif
+# PATCH-FIX-UPSTREAM ksh93-fdstatus.dif [bnc#808449, bnc#814135]
+# this is a backport from the alpha version ksh93v-2013-04-22
+Patch33:ksh93-fdstatus.dif
+# PATCH-FIX-UPSTREAM ksh93-alias-k.dif [bnc#824187]
+Patch34:ksh93-alias-k.dif
Patch42:ksh-locale.patch
%description
@@ -210,6 +215,8 @@
%patch30
%patch31
%patch32
+%patch33
+%patch34
%build
#
@@ -592,7 +599,7 @@
set -- $(shcomp --version 21)
eval version=\${$#}
for bin in shcomp pty what mime asa dlls ; do
- $bin --nroff 21 | sed 's/\(\.TH .*\)/\1 %{date} Korn shell
utilities/' ../man/man1/$bin.1
+ $bin --nroff 21 | sed 's/\(\.TH .*\)/\1 %{date} Korn shell
utilities/' ../man/man1/$bin.1ast
done
popd
test -d /tmp -a /tmp -ef ${TMPDIR} || rm -rf ${TMPDIR}
@@ -651,17 +658,17 @@
done
install -m 0644 lib/*.a %{buildroot}%{_libdir}/ast/
%if %suse_version 1120
- install -m 0644 man/man1/sh.1
%{buildroot}%{_mandir}/man1/ksh93.1
- ln -sf ../man1/ksh93.1.gz%{buildroot}/%{_mandir}/man1/ksh.1.gz
- ln -sf ../man1/ksh93.1.gz%{buildroot}/%{_mandir}/man1/rksh.1.gz
+ install -m 0644 man/man1/sh.1
%{buildroot}%{_mandir}/man1/ksh93.1ast
+ ln -sf ../man1/ksh93.1ast.gz %{buildroot}/%{_mandir}/man1/ksh.1ast.gz
+ ln -sf ../man1/ksh93.1ast.gz
%{buildroot}/%{_mandir}/man1/rksh.1ast.gz
%else
- install -m 0644 man/man1/sh.1
%{buildroot}%{_mandir}/man1/ksh.1
- ln -sf ../man1/ksh.1.gz %{buildroot}/%{_mandir}/man1/rksh.1.gz
+ install -m 0644 man/man1/sh.1ast %{buildroot}%{_mandir}/man1/ksh.1ast
+ ln -sf ../man1/ksh.1ast.gz
%{buildroot}/%{_mandir}/man1/rksh.1ast.gz
%endif
- install -m 0644 man/man1/shcomp.1%{buildroot}%{_mandir}/man1/shcomp.1
+ install -m 0644 man/man1/shcomp.1ast %{buildroot}%{_mandir}/man1/shcomp.1ast
%if %use_opt_bins
for bin in pty what mime asa dlls ; do
- install -m 0644 man/man1/$bin.1 %{buildroot}%{_mandir}/man1/$bin.1
+ install -m 0644 man/man1/$bin.1ast
%{buildroot}%{_mandir}/man1/$bin.1ast
done
%endif
for man in man/man3/*.3 ; do
@@ -750,8 +757,8 @@
%endif
--install /bin/ksh ksh /bin/ksh93 20 \
--slave %{_bindir}/ksh usr-bin-ksh /bin/ksh93 \
---slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/ksh93.1.gz \
---slave %{_mandir}/man1/rksh.1.gz rksh.1.gz %{_mandir}/man1/ksh93.1.gz
+--slave %{_mandir}/man1/ksh.1ast.gz ksh.1.gz %{_mandir}/man1/ksh93.1ast.gz
\
+--slave %{_mandir}/man1/rksh.1ast.gz rksh.1.gz
%{_mandir}/man1/ksh93.1ast.gz
%else
if test -x /%{_lib}/ast/bin/ksh ; then
rm -f /%{_lib}/ast/bin/ksh
@@ -800,20 +807,20 @@
%ghost %verify(not link) /bin/ksh
%ghost %verify(not link) %{_bindir}/ksh
%if %suse_version 1120
-%ghost %verify(not link) %{_mandir}/man1/ksh.1.gz
-%ghost %verify(not link) %{_mandir}/man1/rksh.1.gz
-%doc %{_mandir}/man1/ksh93.1.gz
+%ghost %verify(not link) %{_mandir}/man1/ksh.1ast.gz
+%ghost %verify(not link) %{_mandir}/man1/rksh.1ast.gz
+%doc %{_mandir}/man1/ksh93.1ast.gz
%else
-%doc %{_mandir}/man1/ksh.1.gz
-%doc %{_mandir}/man1/rksh.1.gz
+%doc %{_mandir}/man1/ksh.1ast.gz
+%doc %{_mandir}/man1/rksh.1ast.gz
%endif
-%doc %{_mandir}/man1/shcomp.1.gz
+%doc %{_mandir}/man1/shcomp.1ast.gz
%if
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-03-26 19:48:08
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-03-01 07:23:47.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-03-26
19:48:09.0 +0100
@@ -1,0 +2,14 @@
+Tue Mar 19 16:48:37 UTC 2013 - wer...@suse.de
+
+- Add patch ksh93-typedef.dif as found during debugging
+
+---
+Tue Mar 19 15:14:00 UTC 2013 - wer...@suse.de
+
+- Make Shift_JIS patch more reliable as requestef from upstream
+- Drop remaining part of the patch ksh93-zerofill.dif for zerofilled
+ variables (bnc#785360 as the first part of the patch is upstream
+ together with an other change. This fix a side effect of cutting
+ variables if TMOUT is used (bnc#808956)
+
+---
Old:
ksh93-zerofill.dif
New:
ksh93-typedef.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.gt1ThX/_old 2013-03-26 19:48:11.0 +0100
+++ /var/tmp/diff_new_pack.gt1ThX/_new 2013-03-26 19:48:11.0 +0100
@@ -114,8 +114,8 @@
Patch27:astksh_builtin_poll20120806_001.diff
# PATCH-FIX-UPSTREAM ksh93-env.dif [bnc#785266, bnc#803613]
Patch28:ksh93-env.dif
-# PATCH-FIX-UPSTREAM ksh93-zerofill.dif [bnc#785360]
-Patch29:ksh93-zerofill.dif
+# PATCH-FIX-UPSTREAM ksh93-typedef.dif
+Patch29:ksh93-typedef.dif
# PATCH-EXTEND-UPSTREAM ksh93-pathtemp.dif [bnc#786134]
# the fix is part of ksh93u+ 2012-06-28
# nevertheless the /dev/shm extension is useful
@@ -389,7 +389,7 @@
fi
done
MEMORY=-s 128 ${MEMORY:+-e ${MEMORY}}
- RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS}|sed -r 's/[[:blank:]]+-g[0-9]?/
-g2/g')
+ RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS}|sed -r
's/([[:blank:]]+)-g[[:digit:]]+/\1-g2/g;s/([[:blank:]]+)-g([[:blank:]]+|$)/\1-g2\2/g')
UNIVERSE=att
LDFLAGS=-lm
LDSOFLG=
++ ksh93-shift_ijs.dif ++
--- /var/tmp/diff_new_pack.gt1ThX/_old 2013-03-26 19:48:11.0 +0100
+++ /var/tmp/diff_new_pack.gt1ThX/_new 2013-03-26 19:48:11.0 +0100
@@ -116,7 +116,7 @@
else
{
--- src/cmd/ksh93/sh/macro.c
-+++ src/cmd/ksh93/sh/macro.c 2013-02-07 13:26:07.897952986 +
src/cmd/ksh93/sh/macro.c 2013-03-19 17:16:46.062074381 +0100
@@ -54,6 +54,7 @@
#if SHOPT_MULTIBYTE
# undef isascii
@@ -125,7 +125,7 @@
#else
# define mbchar(p) (*(unsigned char*)p++)
#endif /* SHOPT_MULTIBYTE */
-@@ -2026,6 +2027,10 @@ static void comsubst(Mac_t *mp,register
+@@ -2026,6 +2027,11 @@ static void comsubst(Mac_t *mp,register
struct _mac_savemac;
int savtop = stktell(stkp);
charlastc=0, *savptr = stkfreeze(stkp,0);
@@ -133,33 +133,46 @@
+ const Lc_t *lc=lcinfo(LC_CTYPE)-lc;
+ wchar_t lastw=0;
+#endif /* SHOPT_MULTIBYTE */
++ ssize_t len;
int was_history = sh_isstate(SH_HISTORY);
int was_verbose = sh_isstate(SH_VERBOSE);
int was_interactive = sh_isstate(SH_INTERACTIVE);
-@@ -2209,6 +2214,17 @@ static void comsubst(Mac_t *mp,register
+@@ -2127,7 +2133,7 @@ static void comsubst(Mac_t *mp,register
+ num = lseek(fd, (off_t)0, SEEK_CUR);
+ goto out_offset;
+ }
+- if(!(sp=mp-shp-sftable[fd]))
++ if(!(sp=mp-shp-sftable[fd]) || (sffileno(sp)!=fd
!(sfset(sp,0,0)SF_STRING)))
+ sp =
sfnew(NIL(Sfio_t*),(char*)malloc(IOBSIZE+1),IOBSIZE,fd,SF_READ|SF_MALLOC);
+ type = 3;
+ }
+@@ -2209,17 +2215,36 @@ static void comsubst(Mac_t *mp,register
}
else if(lastc)
{
+- mac_copy(mp,lastc,1);
++ char mb[8];
++ mb[0] = lastc;
++ len = 1;
+#if SHOPT_MULTIBYTE
+ if(lastw)
-+ {
-+ int n;
-+ charmb[8];
-+ n = mbconv(mb, lastw);
-+ mac_copy(mp,mb,n);
-+ lastw = 0;
-+ }
-+ else
++ len = mbconv(mb, lastw);
++
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2013-03-01 07:23:46 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is ksh, Maintainer is wer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-02-17 17:04:18.0 +0100 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-03-01 07:23:47.0 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 13:10:09 UTC 2013 - wer...@suse.de + +- Add patch ksh93-heredoclex.dif: substitution in here-document + results in syntax error (bnc#804998) + +--- New: ksh93-heredoclex.dif Other differences: -- ++ ksh.spec ++ --- /var/tmp/diff_new_pack.nE4vvC/_old 2013-03-01 07:23:48.0 +0100 +++ /var/tmp/diff_new_pack.nE4vvC/_new 2013-03-01 07:23:48.0 +0100 @@ -122,6 +122,8 @@ Patch30:ksh93-pathtemp.dif # PATCH-FIX-UPSTREAM ksh93-dttree-crash.dif [bnc#795324] Patch31:ksh93-dttree-crash.dif +# PATCH-FIX-UPSTREAM ksh93-heredoclex.dif [bnc#804998] +Patch32:ksh93-heredoclex.dif Patch42:ksh-locale.patch %description @@ -207,6 +209,7 @@ %patch29 %patch30 %patch31 +%patch32 %build # ++ ksh93-heredoclex.dif ++ --- src/cmd/ksh93/sh/lex.c +++ src/cmd/ksh93/sh/lex.c 2013-02-26 12:21:11.618820739 +0100 @@ -1559,6 +1559,7 @@ static int comsub(register Lex_t *lp, in register intline=lp-sh-inlineno; char *first,*cp=fcseek(0),word[5]; int off, messages=0, assignok=lp-assignok, csub; + struct ionod *inheredoc = lp-heredoc; struct lexstate save; save = lp-lex; csub = lp-comsub; @@ -1683,7 +1684,7 @@ done: lp-lexd.dolparen--; lp-lex = save; lp-assignok = (endchar(lp)==RBRACT?assignok:0); - if(lp-heredoc) + if(lp-heredoc !inheredoc) errormsg(SH_DICT,ERROR_exit(SYNBAD),e_lexsyntax5,lp-sh-inlineno,lp-heredoc-ioname); return(messages); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2013-02-01 15:48:48
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-12-28 15:03:17.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-02-01
15:48:50.0 +0100
@@ -1,0 +2,14 @@
+Wed Jan 30 11:17:34 UTC 2013 - wer...@suse.de
+
+- Finally found the reason for bnc#795324, that is avoid to free
+ data which is used lateron in the has tree of reloaded shell
+ functions.
+
+---
+Thu Jan 17 11:19:59 UTC 2013 - wer...@suse.de
+
+- Avoid to skip builtin functions of the gcc if the libast does not
+ provide them. Maybe related, to bnc#795324, where a crash happens
+ in libc strcmp() if optimized for sse2 on AMD Opteron[tm] 6128.
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.Pt8mzw/_old 2013-02-01 15:48:52.0 +0100
+++ /var/tmp/diff_new_pack.Pt8mzw/_new 2013-02-01 15:48:52.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ksh
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -109,11 +109,17 @@
Patch23:ksh93-foreground-prgrp.dif
Patch24:ksh93-builtin.dif
Patch25:ksh93-vmleak.dif
+# PATCH-FIX-UPSTREAM ksh93-read-dont-ignore-esc.dif [bnc#765171]
Patch26:ksh93-read-dont-ignore-esc.dif
+# PATCH-EXTEND-UPSTREAM astksh_builtin_poll20120806_001.diff [bnc#779888]
Patch27:astksh_builtin_poll20120806_001.diff
+# PATCH-FIX-UPSTREAM ksh93-env.dif [bnc#785266]
Patch28:ksh93-env.dif
+# PATCH-FIX-UPSTREAM ksh93-zerofill.dif [bnc#785360]
Patch29:ksh93-zerofill.dif
+# PATCH-FIX-UPSTREAM ksh93-pathtemp.dif [bnc#786134]
Patch30:ksh93-pathtemp.dif
+# PATCH-FIX-UPSTREAM ksh93-dttree-crash.dif [bnc#795324]
Patch31:ksh93-dttree-crash.dif
Patch42:ksh-locale.patch
@@ -246,32 +252,11 @@
#
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-funwind-tables/}
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fasynchronous-unwind-tables/}
- nobuiltin=${TMPDIR:-/tmp}/nobuiltin
- set -C
- (cat-EOF
- -fno-builtin-putenv
- -fno-builtin-setenv
- -fno-builtin-strftime
- -fno-builtin-strlcat
- -fno-builtin-strlcpy
- -fno-builtin-strptime
- -fno-builtin-strtod
- -fno-builtin-strtol
- -fno-builtin-strtold
- -fno-builtin-strtoll
- -fno-builtin-strtoul
- -fno-builtin-strtoull
- EOF
- find src/lib/ -name '*.h' | xargs \
- sed -nr
'\@^extern[[:blank:]].*[[:blank:]](str|mem|(get|put|set)env|(c|m|re|v)alloc).*\(@{
- s@[[:blank:]]+_ARG_@@
- s@[a-zA-Z_\*]+[[:blank:]]+@@g
- s@([^\(\)]+)\(.*\);$@-fno-builtin-\1@; p}') | \
- sort -u $nobuiltin
- set +C
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this
# comment and the line below.
+ RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-as-needed/-no-as-needed/}
+ # Use POSIX as environment
test -n ${!LC_*} unset ${!LC_*}
cflags ()
{
@@ -405,7 +390,6 @@
LDSOFLG=
cflags -std=gnu99RPM_OPT_FLAGS
cflags -fPIC RPM_OPT_FLAGS
- cflags @$nobuiltin RPM_OPT_FLAGS
cflags -fno-strict-aliasing RPM_OPT_FLAGS
cflags -fno-zero-initialized-in-bss RPM_OPT_FLAGS
cflags -fno-delete-null-pointer-checksRPM_OPT_FLAGS
@@ -414,8 +398,9 @@
cflags -fsigned-charsRPM_OPT_FLAGS
cflags -fsigned-zerosRPM_OPT_FLAGS
case $(gcc --version | head -n 1) in
- *4.3.*) cflags -fno-tree-sinkRPM_OPT_FLAGS ;;
- *4.6.*) cflags -ftree-loop-linearRPM_OPT_FLAGS ;;
+ *4.[012345].*)
+ cflags -fno-tree-sink RPM_OPT_FLAGS ;;
+ *) cflags -ftree-loop-linear RPM_OPT_FLAGS ;;
esac
cflags -g2 RPM_OPT_FLAGS
cflags -pipe RPM_OPT_FLAGS
@@ -435,6 +420,51 @@
printenv
getconf PAGESIZE
+ #
+ # Build libast first and then determine the library functions used
+ # by this library simply to avoid that gcc will overwrites those with
+ # its own builtin
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-12-28 15:03:15
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-11-02 16:40:44.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-12-28
15:03:17.0 +0100
@@ -1,0 +2,10 @@
+Thu Dec 20 12:48:02 UTC 2012 - wer...@suse.de
+
+- Add ksh93-dttree-crash.dif - Allow empty strings in (dt)trees
+ (bnc#795324)
+- Modify ksh93-jobs.dif - make sure that tty is closed even if an
+ interrupt has been happen at close and also be aware that the
+ return value of tcgetpgrp() is greater than `1' that does not
+ match the process group ID of any existing process group (bnc#790315)
+
+---
New:
ksh93-dttree-crash.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.VkoNuk/_old 2012-12-28 15:03:20.0 +0100
+++ /var/tmp/diff_new_pack.VkoNuk/_new 2012-12-28 15:03:20.0 +0100
@@ -114,6 +114,7 @@
Patch28:ksh93-env.dif
Patch29:ksh93-zerofill.dif
Patch30:ksh93-pathtemp.dif
+Patch31:ksh93-dttree-crash.dif
Patch42:ksh-locale.patch
%description
@@ -200,6 +201,7 @@
%patch28
%patch29
%patch30
+%patch31
%build
#
++ ksh93-dttree-crash.dif ++
--- src/lib/libast/include/cdt.h
+++ src/lib/libast/include/cdt.h2012-12-20 11:37:28.641452879 +
@@ -313,7 +313,7 @@ _END_EXTERNS_
#define _DTCMP(dt,k1,k2,dc) \
((dc)-comparf ? (*(dc)-comparf)((dt), (k1), (k2),
(dc)) : \
(dc)-size 0 ? memcmp((Void_t*)(k1), ((Void_t*)k2),
(dc)-size) : \
- strcmp((char*)(k1), ((char*)k2)) )
+ strcmp((char*)(k1), ((char*)(k2 ? k2
: ))) )
#define _DTHSH(dt,ky,dc) ((dc)-hashf ? (*(dc)-hashf)((dt), (ky), (dc)) : \
dtstrhash(0, (ky), (dc)-size) )
++ ksh93-jobs.dif ++
--- /var/tmp/diff_new_pack.VkoNuk/_old 2012-12-28 15:03:20.0 +0100
+++ /var/tmp/diff_new_pack.VkoNuk/_new 2012-12-28 15:03:20.0 +0100
@@ -1,6 +1,42 @@
--- src/cmd/ksh93/sh/jobs.c
-+++ src/cmd/ksh93/sh/jobs.c2011-08-15 18:43:23.005726321 +0200
-@@ -1103,7 +1103,7 @@ static struct process *job_bystring(regi
src/cmd/ksh93/sh/jobs.c2012-12-20 13:33:27.885452491 +
+@@ -638,12 +638,14 @@ void job_init(Shell_t *shp, int lflag)
+ /* This should have already been done by rlogin */
+ register int fd;
+ register char *ttynam;
++ int err = errno;
+ #ifndef SIGTSTP
+ setpgid(0,shp-gd-pid);
+ #endif /*SIGTSTP */
+ if(job.mypgid0 || !(ttynam=ttyname(JOBTTY)))
+ return;
+-close(JOBTTY);
++ while(close(JOBTTY)0 errno==EINTR)
++ errno = err;
+ if((fd = open(ttynam,O_RDWR)) 0)
+ return;
+ if(fd!=JOBTTY)
+@@ -660,7 +662,7 @@ void job_init(Shell_t *shp, int lflag)
+ /* wait until we are in the foreground */
+ while((job.mytgid=tcgetpgrp(JOBTTY)) != job.mypgid)
+ {
+- if(job.mytgid == -1)
++ if(job.mytgid = 0)
+ return;
+ /* Stop this shell until continued */
+ signal(SIGTTIN,SIG_DFL);
+@@ -833,7 +835,9 @@ static void job_set(register struct proc
+ if((pw-p_flagP_STOPPED) || tcgetpgrp(job.fd) == shp-gd-pid)
+ tcsetpgrp(job.fd,pw-p_fgrp);
+ /* if job is stopped, resume it in the background */
+- job_unstop(pw);
++ if(!shp-forked)
++ job_unstop(pw);
++ shp-forked = 0;
+ #endif/* SIGTSTP */
+ }
+
+@@ -1104,7 +1110,7 @@ static struct process *job_bystring(regi
int job_kill(register struct process *pw,register int sig)
{
@@ -9,7 +45,7 @@
register pid_t pid;
register int r;
const char *msg;
-@@ -1116,6 +1116,7 @@ int job_kill(register struct process *pw
+@@ -1117,6 +1123,7 @@ int job_kill(register struct process *pw
errno = ECHILD;
if(pw==0)
goto error;
@@ -17,3 +53,11 @@
pid = pw-p_pid;
#if SHOPT_COSHELL
if(pw-p_cojob)
+@@ -2043,6 +2050,7 @@ void job_fork(pid_t parent)
+ job.in_critical = 0;
+ break;
+ default:
++ job_chksave(parent);
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-11-02 16:40:43
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-10-26 17:11:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-11-02
16:40:44.0 +0100
@@ -1,0 +2,5 @@
+Fri Oct 26 15:05:09 UTC 2012 - co...@suse.com
+
+- add explicit buildrequire on grof for man pages
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.Z4wJGr/_old 2012-11-02 16:40:48.0 +0100
+++ /var/tmp/diff_new_pack.Z4wJGr/_new 2012-11-02 16:40:48.0 +0100
@@ -35,6 +35,7 @@
BuildRequires: flex
BuildRequires: gdbm-devel
BuildRequires: glibc-devel
+BuildRequires: groff
BuildRequires: ncurses-devel
BuildRequires: procps
BuildRequires: psmisc
@@ -65,7 +66,7 @@
Version:93u
Release:0
Summary:Korn Shell
-License:CPL-1.0 ; EPL-1.0
+License:CPL-1.0 and EPL-1.0
Group: System/Shells
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.%{date}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-10-26 17:11:32
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-10-19 13:32:07.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-10-26
17:11:33.0 +0200
@@ -1,0 +2,22 @@
+Thu Oct 25 12:09:48 UTC 2012 - wer...@suse.de
+
+- Make last patch smart that is use /dev/shm for temporary file
+ descriptors
+
+---
+Tue Oct 23 13:23:12 UTC 2012 - wer...@suse.de
+
+- Add a workaround for filled /tmp file systems (bnc#786134)
+- Check for subshell if tmp file can be used otherwise use a
+ a pipe (bnc#786134)
+- Restore shell variables before any outpur will be placed in
+ a temp file or buffer (bnc#786134)
+
+---
+Fri Oct 19 15:06:50 UTC 2012 - wer...@suse.de
+
+- Be able to export justified and zerofilled variables (bnc#785360)
+- This requires that variables with this attributes should be really
+ cleared if unset
+
+---
New:
ksh93-pathtemp.dif
ksh93-zerofill.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.cuvVDR/_old 2012-10-26 17:11:36.0 +0200
+++ /var/tmp/diff_new_pack.cuvVDR/_new 2012-10-26 17:11:36.0 +0200
@@ -111,6 +111,8 @@
Patch26:ksh93-read-dont-ignore-esc.dif
Patch27:astksh_builtin_poll20120806_001.diff
Patch28:ksh93-env.dif
+Patch29:ksh93-zerofill.dif
+Patch30:ksh93-pathtemp.dif
Patch42:ksh-locale.patch
%description
@@ -195,6 +197,8 @@
%patch26
%patch27
%patch28
+%patch29
+%patch30
%build
#
++ ksh93-pathtemp.dif ++
--- src/cmd/ksh93/bltins/trap.c
+++ src/cmd/ksh93/bltins/trap.c 2012-10-23 15:45:37.0 +
@@ -102,6 +102,7 @@ int b_trap(int argc,char *argv[],Shbltin
/* internal traps */
if(sigSH_TRAP)
{
+ char **trap =
(shp-st.otrap?shp-st.otrap:shp-st.trap);
sig = ~SH_TRAP;
if(sigSH_DEBUGTRAP)
{
@@ -110,10 +111,11 @@ int b_trap(int argc,char *argv[],Shbltin
}
if(pflag)
{
- if(arg=shp-st.trap[sig])
+ if(arg=trap[sig])
sfputr(sfstdout,sh_fmtq(arg),'\n');
continue;
}
+ shp-st.otrap = 0;
if(shp-st.trap[sig])
free(shp-st.trap[sig]);
shp-st.trap[sig] = 0;
@@ -402,7 +404,7 @@ static void sig_list(register Shell_t *s
}
for(sig=SH_DEBUGTRAP; sig=0; sig--)
{
- if(!(trap=shp-st.trap[sig]))
+
if(!(trap=shp-st.otrap?shp-st.otrap[sig]:shp-st.trap[sig]))
continue;
sfprintf(sfstdout,trapfmt,sh_fmtq(trap),traps[sig]);
}
--- src/cmd/ksh93/include/defs.h
+++ src/cmd/ksh93/include/defs.h2012-10-23 15:42:45.0 +
@@ -90,6 +90,7 @@ struct sh_scoped
int ioset;
unsigned short trapmax;
char*trap[SH_DEBUGTRAP+1];
+ char**otrap;
char**trapcom;
char**otrapcom;
void*timetrap;
--- src/cmd/ksh93/include/shnodes.h
+++ src/cmd/ksh93/include/shnodes.h 2012-10-23 14:23:06.0 +
@@ -211,7 +211,7 @@ union Shnode_u
extern voidsh_freeup(Shell_t*);
extern voidsh_funstaks(struct slnod*,int);
-extern Sfio_t *sh_subshell(Shell_t*,Shnode_t*, int, int);
+extern Sfio_t *sh_subshell(Shell_t*,Shnode_t*, volatile int,
int);
#if defined(__EXPORT__) defined(_BLD_DLL) defined(_BLD_shell)
__EXPORT__
#endif
--- src/cmd/ksh93/sh/subshell.c
+++ src/cmd/ksh93/sh/subshell.c 2012-10-25 10:09:34.574345265 +
@@ -455,7 +455,7 @@ void sh_subjobcheck(pid_t pid)
* output of command t. Otherwise, NULL will be returned.
*/
-Sfio_t *sh_subshell(Shell_t *shp,Shnode_t *t, int
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-10-19 13:32:05
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-09-23 21:06:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-10-19
13:32:07.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 17 09:22:34 UTC 2012 - wer...@suse.de
+
+- Do not chrash if the value of an environment variable is NULL (bnc#785266)
+
+---
New:
ksh93-env.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.tsQ6i7/_old 2012-10-19 13:32:10.0 +0200
+++ /var/tmp/diff_new_pack.tsQ6i7/_new 2012-10-19 13:32:10.0 +0200
@@ -110,6 +110,7 @@
Patch25:ksh93-vmleak.dif
Patch26:ksh93-read-dont-ignore-esc.dif
Patch27:astksh_builtin_poll20120806_001.diff
+Patch28:ksh93-env.dif
Patch42:ksh-locale.patch
%description
@@ -193,6 +194,7 @@
%patch25
%patch26
%patch27
+%patch28
%build
#
++ ksh93-env.dif ++
--- src/cmd/ksh93/sh/name.c
+++ src/cmd/ksh93/sh/name.c 2012-10-16 12:12:42.846844975 +
@@ -2123,7 +2123,7 @@ static void attstore(register Namval_t *
if((flag(NV_UTOL|NV_LTOU|NV_INTEGER)) == (NV_UTOL|NV_LTOU))
{
data = (void*)nv_mapchar(np,0);
- if(strcmp(data,e_tolower) strcmp(data,e_toupper))
+ if(data strcmp(data,e_tolower) strcmp(data,e_toupper))
return;
}
flag =
(NV_RDONLY|NV_UTOL|NV_LTOU|NV_RJUST|NV_LJUST|NV_ZFILL|NV_INTEGER);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-09-23 21:06:29 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is ksh, Maintainer is wer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-07-30 20:31:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-09-23 21:06:33.0 +0200 @@ -1,0 +2,5 @@ +Tue Sep 18 14:18:09 UTC 2012 - wer...@suse.de + +- Add polling builtin patch (bnc #779888) + +--- New: astksh_builtin_poll20120806_001.diff Other differences: -- ++ ksh.spec ++ --- /var/tmp/diff_new_pack.Q46vEQ/_old 2012-09-23 21:06:35.0 +0200 +++ /var/tmp/diff_new_pack.Q46vEQ/_new 2012-09-23 21:06:35.0 +0200 @@ -109,6 +109,7 @@ Patch24:ksh93-builtin.dif Patch25:ksh93-vmleak.dif Patch26:ksh93-read-dont-ignore-esc.dif +Patch27:astksh_builtin_poll20120806_001.diff Patch42:ksh-locale.patch %description @@ -191,6 +192,7 @@ %patch24 %patch25 %patch26 +%patch27 %build # ++ astksh_builtin_poll20120806_001.diff ++ 893 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-07-30 20:31:28
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-06-06 18:02:36.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-07-30
20:31:29.0 +0200
@@ -1,0 +2,6 @@
+Fri Jul 13 12:47:35 UTC 2012 - ag...@suse.com
+
+- Fix qemu-user build by not evaluating ps output that doesn't reflect
+ what the virtual processes see
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.OHyXU9/_old 2012-07-30 20:31:43.0 +0200
+++ /var/tmp/diff_new_pack.OHyXU9/_new 2012-07-30 20:31:43.0 +0200
@@ -207,6 +207,12 @@
((IGNORED SIGMASK)) let ++usesigexec || true
test -t 0 || let ++usesigexec
+%if 0%{?qemu_user_space_build:1}
+ # agraf: In a qemu user space build, ps can not find the actual sigmask
+ #of processes, so we run into an endless loop. Disable sigexec.
+ usesigexec=0
+%endif
+
if ((usesigexec 0)) ; then
${CC:-gcc} ${RPM_OPT_FLAGS} -o sigexec %{S:42} -lutil
for fd in /proc/$$/fd/*; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2012-06-06 18:02:29
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-05-26 13:09:20.0
+0200
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-06-06
18:02:36.0 +0200
@@ -1,0 +2,5 @@
+Wed Jun 6 12:16:52 UTC 2012 - wer...@suse.de
+
+- Do not ignore backslashes/escapes for read builtin (bnc#765171)
+
+---
New:
ksh93-read-dont-ignore-esc.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.BNN1sU/_old 2012-06-06 18:02:38.0 +0200
+++ /var/tmp/diff_new_pack.BNN1sU/_new 2012-06-06 18:02:38.0 +0200
@@ -108,6 +108,7 @@
Patch23:ksh93-foreground-prgrp.dif
Patch24:ksh93-builtin.dif
Patch25:ksh93-vmleak.dif
+Patch26:ksh93-read-dont-ignore-esc.dif
Patch42:ksh-locale.patch
%description
@@ -189,6 +190,7 @@
%patch23
%patch24
%patch25
+%patch26
%build
#
++ ksh93-read-dont-ignore-esc.dif ++
--- src/cmd/ksh93/bltins/read.c
+++ src/cmd/ksh93/bltins/read.c 2012-06-04 09:58:53.848644056 +0200
@@ -570,7 +570,13 @@ int sh_readline(register Shell_t *shp,ch
case S_QUOTE:
c = shp-ifstable[*cp++];
inquote = !inquote;
- goto skip;
+ if(val)
+ {
+ stakputs(val);
+ use_stak = 1;
+ *val = 0;
+ }
+ continue;
case S_ESC:
/* process escape character */
if((c = shp-ifstable[*cp++]) == S_NL)
@@ -582,6 +588,7 @@ int sh_readline(register Shell_t *shp,ch
{
stakputs(val);
use_stak = 1;
+ was_escape = 1;
*val = 0;
}
continue;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-05-26 13:09:18 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is ksh, Maintainer is wer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2012-03-26 14:01:25.0 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-05-26 13:09:20.0 +0200 @@ -1,0 +2,7 @@ +Wed May 23 10:33:09 UTC 2012 - wer...@suse.de + +- Better check on update for postun scriptlet and error correct with + an posttrans scriptlet, that is do not remove /etc/ksh.kshrc on + an update of an older ksh version (bnc#759730) + +--- Other differences: -- ++ ksh.spec ++ --- /var/tmp/diff_new_pack.jsBkoF/_old 2012-05-26 13:09:21.0 +0200 +++ /var/tmp/diff_new_pack.jsBkoF/_new 2012-05-26 13:09:21.0 +0200 @@ -723,7 +723,7 @@ %endif %postun -if test ! -x bin/ksh ; then +if test $1 -eq 0 -a ! -x bin/ksh ; then if test ! -x bin/pdksh ; then rm -f etc/ksh.kshrc fi @@ -732,6 +732,11 @@ %endif fi +%posttrans +if test -x bin/ksh -o -x bin/pdksh ; then +test -e etc/bash.bashrc ln -sf bash.bashrc etc/ksh.kshrc || true +fi + %files -f ksh.lang %defattr(-,root,root) %if %use_suid_exe -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2011-12-27 18:35:53
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2011-11-18 15:46:03.0
+0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2011-12-27
18:35:54.0 +0100
@@ -1,0 +2,5 @@
+Sun Dec 4 23:00:26 UTC 2011 - ag...@suse.com
+
+- Don't run tests in qemu - they fail
+
+---
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.7nzhZC/_old 2011-12-27 18:35:56.0 +0100
+++ /var/tmp/diff_new_pack.7nzhZC/_new 2011-12-27 18:35:56.0 +0100
@@ -386,6 +386,7 @@
SHELL=${root}/bin/ksh.test
SHCOMP=${root}/bin/shcomp.test
export PATH SHCOMP SHELL
+%if !0%{?qemu_user_space_build:1}
pushd ${test}
typeset -i failed=0
ln -sf ${root}/lib ${test}/../
@@ -400,6 +401,7 @@
fi
killall -q -s 9 ${root}/bin/ksh.test || true
popd
+%endif
mkdir -p share/locale/C/LC_MESSAGES
sed -rn \@mamake -C cmd/ksh93@,\@mamake -C@ {
s@^\+ g?cc@$SHELL msgcc -M-set=ast@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in
at 2011-12-06 18:22:04
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
Package is ksh, Maintainer is wer...@suse.com
Changes:
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.8jDLsn/_old 2011-12-06 18:38:54.0 +0100
+++ /var/tmp/diff_new_pack.8jDLsn/_new 2011-12-06 18:38:54.0 +0100
@@ -27,7 +27,7 @@
BuildRequires: update-alternatives
%endif
Url:http://www.research.att.com/~gsf/download/
-License:Common Public License Version 1.0 (CPL1.0)
+License:CPL-1.0
Group: System/Shells
Requires(post): /bin/ln /bin/rm /etc/bash.bashrc /bin/true
Requires(postun): /bin/ln /bin/rm /etc/bash.bashrc /bin/true
@@ -90,7 +90,7 @@
Phong Vo k...@research.att.com
%package -n ksh-devel
-License:Common Public License Version 1.0 (CPL1.0)
+License:CPL-1.0
Summary:Korn Shell development environment
Group: Development/Libraries/C and C++
Requires: ksh = %{version}-%{release}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2011-11-18 15:45:43 Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) Package is ksh, Maintainer is wer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2011-09-23 02:07:19.0 +0200 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2011-11-18 15:46:03.0 +0100 @@ -1,0 +2,23 @@ +Tue Aug 30 16:44:06 UTC 2011 - wer...@suse.de + +- Implement a patch for both regressions reported here + mailman.research.att.com/pipermail/ast-developers/2011q3/000951.html + +--- +Mon Aug 15 16:46:10 UTC 2011 - wer...@suse.de + +- Add patch from mailing list to avoid stupid crahs on empty job list. + +--- +Fri Jul 22 14:56:27 UTC 2011 - wer...@suse.de + +- Fix a typo in the patch + +--- +Fri Jul 22 11:29:02 UTC 2011 - wer...@suse.de + +- Add and modify a patch from David korn to be able to handle multi + byte characters at the boundary of the buffer used for parsing + here documents (bnc#705032) + +--- @@ -23,0 +47,47 @@ +Thu Jun 30 16:04:22 CEST 2011 - wer...@suse.de + +- Update to 2011-06-30 of ksh93u which includes our patches for + several problems (e.g. Shift.JIS, S390, bnc#697394): + 11-06-22 The shell compiler now supports process substitution. + 11-06-22 +Added code to support process substitution on systems that do + not supply the /dev/fd directory. + 11-06-21 Fixed extraneous jobs Done messages when builin is at the end of a + pipeline. + 11-06-20 Fixed two regression tests. + 11-06-20 Fixed a bug introduced on last update. + 11-06-14 A bug with pipefail in which the shell would wait for background + jobs to complete has been fixed. + 11-06-09 A bug which caused the options.sh regression test to fail on OS390 + Linux has been fixed. The bug could also have affected other systems. + 11-06-07 A number of changes to support the still undocuments namespace option + have been added. + 11-06-06 A bug in which command substitution of eval would hang when it had + standard error redirected to standard output has been fixed. + 11-06-01 A bug in case statement fall through (;) ignoring set -e was fixed. + 11-06-01 A bug in which creating a left or right justified upper or lowercase + variable with an empty string has been fixed. + 11-06-01 A bug in which the .paths directory wasn't read when a subshell was + executed before any other command has been fixed. + 11-05-31 The shell now gives an error when a type variable is assigned to + an array instance when the array has been declared a compound variable + array. + 11-05-31 A bug in which typeset -m of an array instance did not remove the + original instance has been fixed. + 11-05-28 A bug in which typeset -m dest=src fails when src and are passed as + name references was fixed. + 11-05-28 A bug in which typeset -m c.board[1][i]=el, where el is a compound + variable core dumps has been fixed. + 11-05-28 Two bugs in the display of arrays of compound variables with print -v + have been fixed. + 11-05-27 A bug with command substitution with the shift jis locale has been + fixed. + 11-05-25 A bug in which unset -f foo, called within function foo could cause + the shell to core dump has been fixed. + 11-05-24 A bug in unsetting arrays of compound variables that could lead to + a core dump has been fixed. + 11-05-24 A scoping bug in with typeset -m for variables passed as references + has been fixed. + 11-05-09 A bug in which 'typeset +p array[$i]' in a subshell could cause an + exception has been fixed. + +--- @@ -58,0 +129,375 @@ + +--- +Thu May 05 15:44:33 CEST 2011 - wer...@suse.de + +- Update to 2011-05-05 of ksh93u which includes various fixes for + e.g. bnc#690623, bnc#661875, and bnc#636389, from RELEASE notes: + 11-05-03 Two more scoping bug with name references and read -C were fixed. + 11-05-03 A potential race condition which occurs when here-documents are + processed in asynchronous blocks has been eliminated. + 11-05-02 Another scoping bug with name references defined in a function has + been fixed. + 11-05-02 A bug in which the shell discards saved exit status of a job if it is + followed by a
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Fri Jul 8 14:58:28 CEST 2011.
--- ksh/ksh.changes 2011-07-04 17:44:28.0 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-07-07
15:17:42.0 +0200
@@ -1,0 +2,17 @@
+Thu Jul 7 12:48:24 UTC 2011 - wer...@suse.de
+
+- Check for ascii8 troff device, if not available use utf8
+
+---
+Wed Jul 6 14:15:44 UTC 2011 - wer...@suse.de
+
+- Extract messages from ksh source code automagic by using msgcc and
+ libpp from upstream ast-base packages (realted to bnc#703854) only
+ missing are the translations for those messages
+
+---
+Tue Jul 5 15:17:58 UTC 2011 - wer...@suse.de
+
+- Drop locale support as it is out of sync since year 2000 (bnc#703854)
+
+---
calling whatdependson for head-i586
Old:
ast-ksh-locale.2010-02-02.tar.bz2
New:
ast-msgcc.2010-06-21.tar.bz2
ksh-locale.patch
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.3JCv9J/_old 2011-07-08 14:36:40.0 +0200
+++ /var/tmp/diff_new_pack.3JCv9J/_new 2011-07-08 14:36:40.0 +0200
@@ -37,12 +37,12 @@
%endif
AutoReqProv:on
Version:93t
-Release:200
+Release:202
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
Source1:ast-ksh.2010-06-21.tar.bz2
-Source2:ast-ksh-locale.2010-02-02.tar.bz2
+Source2:ast-msgcc.2010-06-21.tar.bz2
Source3:CPL
Source10: leak1.sh
Source11: leak2.sh
@@ -78,8 +78,9 @@
Patch24:ksh93-pipe.dif
Patch25:ksh93-argv.dif
Patch26:ksh93-unset-f.dif
+Patch42:ksh-locale.patch
%global use_suid_exe 0
-%global use_locale 1
+%global use_locale 0
%global debug_memleak 0
%description
@@ -125,6 +126,7 @@
find share/ -type d -a -empty | xargs -r rm -vrf
find share/ -type d -a -empty | xargs -r rm -vrf
%patch
+%patch42
%patch1
%ifarch %arm
%patch2
@@ -157,7 +159,14 @@
%patch26
%build
+ AR=ar
+ CC=gcc
+ PATH=${PWD}:$PATH
+ LANG=POSIX
TMPDIR=$(mktemp -d /tmp/ksh-build.XX) || exit 1
+ SUSE_ASNEEDED=0
+ export AR CC PATH LANG TMPDIR SUSE_ASNEEDED
+ #
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
typeset -i SIGPIPE=0x1000
if ((IGNORED SIGPIPE)) ; then
@@ -198,9 +207,7 @@
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this
# comment and the line below.
- export SUSE_ASNEEDED=0
test -n ${!LC_*} unset ${!LC_*}
- CC=gcc
cflags ()
{
local flag=$1; shift
@@ -226,9 +233,6 @@
esac
}
#
- LANG=POSIX
- export LANG
- #
# If _you_ are knowing how to fix this in the autogenerated
# sources of ksh/ast without breaking them, then let me know.
#
@@ -321,7 +325,8 @@
mam_cc_L=use
mam_cc_OPTIMIZE=-pipe
export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
- bin/package make CCFLAGS=$RPM_OPT_FLAGS HOSTTYPE=$HOSTTYPE
+ printenv
+ bin/package make CCFLAGS=$RPM_OPT_FLAGS HOSTTYPE=$HOSTTYPE AR=$AR
CC=$CC
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
log=${root}/lib/package/gen/make.out
@@ -388,6 +393,7 @@
${ksh}-Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
${shcomp} -Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
${suidex} -Wl,-rpath-link,${root}/lib -Wl,-rpath,/%{_lib}/ast
+ popd
OPATH=$PATH
OSHELL=$SHELL
PATH=$PATH:${root}/bin
@@ -407,6 +413,18 @@
fi
killall -q -s 9 ${root}/bin/ksh.test || true
popd
+ mkdir -p share/locale/C/LC_MESSAGES
+ sed -rn \@mamake -C cmd/ksh93@,\@mamake -C@ {
+ s@^\+ g?cc@$SHELL msgcc -M-set=ast@
+ s@[[:blank:]]-c[[:blank:]]([^[:blank:]\.]+/([^[:blank:]\.\/]+))\.c@ -c
\1\.c -o msgs/\2\.mso@p
+ } ${root}/lib/package/gen/make.out src/cmd/ksh93/doit
+ pushd src/cmd/ksh93
+ mkdir msgs
+ $SHELL -x ./doit
+ $SHELL -x msgcc -o libshell.msg msgs/*.mso
+ rm -rf msgs/
+ popd
+ msggen share/locale/C/LC_MESSAGES/libshell src/cmd/ksh93/libshell.msg
pushd ${root}/bin
PATH=$PATH:.
set -- $(shcomp.test --version 21)
@@ -416,7 +434,6 @@
popd
SHELL=$OSHELL
PATH=$OPATH
- popd
%install
root=$(echo ${PWD}/arch/linux*)
@@ -430,9 +447,7 @@
mkdir -p %{buildroot}%{_mandir}
mkdir%{buildroot}%{_mandir}/man1
mkdir%{buildroot}%{_mandir}/man3
-%if %use_locale
mkdir -p %{buildroot}%{_datadir}/locale
-%endif
mkdir -p %{buildroot}%{_datadir}/ksh/fun
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Tue Jul 5 10:15:13 CEST 2011.
--- ksh/ksh.changes 2011-06-17 12:32:42.0 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-07-04
17:44:28.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 4 15:19:20 UTC 2011 - wer...@suse.de
+
+- Avoid crash on unset of function within the same function
+
+---
calling whatdependson for head-i586
New:
ksh93-unset-f.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.FXatdm/_old 2011-07-05 10:14:48.0 +0200
+++ /var/tmp/diff_new_pack.FXatdm/_new 2011-07-05 10:14:48.0 +0200
@@ -37,7 +37,7 @@
%endif
AutoReqProv:on
Version:93t
-Release:198
+Release:200
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
@@ -77,6 +77,7 @@
Patch23:ksh93-array.dif
Patch24:ksh93-pipe.dif
Patch25:ksh93-argv.dif
+Patch26:ksh93-unset-f.dif
%global use_suid_exe 0
%global use_locale 1
%global debug_memleak 0
@@ -153,6 +154,7 @@
%patch23
%patch24
%patch25
+%patch26
%build
TMPDIR=$(mktemp -d /tmp/ksh-build.XX) || exit 1
++ ksh93-unset-f.dif ++
--- src/cmd/ksh93/sh/xec.c
+++ src/cmd/ksh93/sh/xec.c 2011-07-04 15:09:52.252426415 +
@@ -2780,7 +2780,8 @@ int sh_funscope(int argn, char *argv[],i
jmpval = sigsetjmp(buff.buff,0);
if(!fun)
{
- shp-st.filename = fp-node-nvalue.rp-fname;
+ if (fp-node-nvalue.rp)
+ shp-st.filename = fp-node-nvalue.rp-fname;
shp-st.funname = nv_name(fp-node);
shp-last_root = nv_dict(DOTSHNOD);
nv_putval(SH_PATHNAMENOD,shp-st.filename,NV_NOFREE);
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Fri Jun 17 15:26:20 CEST 2011.
--- ksh/ksh.changes 2011-06-01 11:33:24.0 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-06-17
12:32:42.0 +0200
@@ -1,0 +2,18 @@
+Tue Jun 14 11:36:28 UTC 2011 - wer...@suse.de
+
+- Fix off by one error which should make timetype.sh work now
+- Update the array fix as well as the pipe fix
+- This also fixes bnc#677790
+
+---
+Fri Jun 10 19:11:07 CEST 2011 - wer...@suse.de
+
+- Avoid redirection in subshell if an eval was used (bnc#697394)
+
+---
+Wed Jun 8 15:14:46 CEST 2011 - wer...@suse.de
+
+- Extend Shift.JIS patch to avoid breakage of the parsers above
+- Avoid mounting 3D file system as this does not exist on linux
+
+---
calling whatdependson for head-i586
New:
ksh93-argv.dif
ksh93-pipe.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.B6V6VG/_old 2011-06-17 15:24:36.0 +0200
+++ /var/tmp/diff_new_pack.B6V6VG/_new 2011-06-17 15:24:36.0 +0200
@@ -37,7 +37,7 @@
%endif
AutoReqProv:on
Version:93t
-Release:196
+Release:198
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
@@ -75,6 +75,8 @@
Patch21:ksh93-export.dif
Patch22:ksh93-eintr.dif
Patch23:ksh93-array.dif
+Patch24:ksh93-pipe.dif
+Patch25:ksh93-argv.dif
%global use_suid_exe 0
%global use_locale 1
%global debug_memleak 0
@@ -149,11 +151,11 @@
%patch21
%patch22
%patch23
+%patch24
+%patch25
%build
TMPDIR=$(mktemp -d /tmp/ksh-build.XX) || exit 1
- mkdir ${TMPDIR}/bin || exit 1
- PATH=${TMPDIR}/bin:$PATH
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
typeset -i SIGPIPE=0x1000
if ((IGNORED SIGPIPE)) ; then
@@ -243,6 +245,7 @@
feature=${TMPDIR:-/tmp}/feature.h
set -C
(cat $feature)-'EOF'
+ #define SHOPT_FS_3D 0
#define SHOPT_SYSRC 1
#define SHOPT_REMOTE1
#define SHOPT_CMDLIB_BLTIN 1
@@ -257,32 +260,40 @@
cat $feature
#
#
- echo 'int main () { return !(sizeof(void*) = 8); }' | $CC -x c -o test64 -
- if ./test64 ; then
- LARGEFILE=
- else
- LARGEFILE=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- fi
- rm -f ./test64
- case $RPM_ARCH in
- ia64) RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
- s390*) RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
- ppc*|powerpc*)
-RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
- esac
+ LARGEFILE=$(getconf LFS_CFLAGS)
case $RPM_ARCH in
+ i[3456]86)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O2} -m32
+HOSTTYPE=linux.i386
+;;
+ x86_64)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O2} -m64
+HOSTTYPE=linux.i386-64
+;;
+ ia64)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O}
+HOSTTYPE=linux.ia64
+;;
+ s390)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} -m31
+HOSTTYPE=linux.s390
+;;
+ s390*)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} -m64
+HOSTTYPE=linux.s390-64
+;;
ppc|powerpc)
-set -C
-(cat ${TMPDIR:-/tmp}/gcc)-EOF
- #!/bin/sh
- case $@ in
- *-dumpmachine*)
- echo powerpc-suse-linux ;;
- *) exec -a gcc gcc ${1+$@}
- esac
- EOF
-set +C
-chmod +x ${TMPDIR:-/tmp}/gcc
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} -mno-powerpc64
+HOSTTYPE=linux.powerpc
+;;
+ ppc64|powerpc64)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} -mpowerpc64
+HOSTTYPE=linux.powerpc64
+;;
+ *)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O}
+HOSTTYPE=linux.$RPM_ARCH
+;;
esac
RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS}|sed -r 's/[[:blank:]]+-g[0-9]?/
-g2/g')
UNIVERSE=att
@@ -305,7 +316,6 @@
cflags -Wl,-rpath,/%{_lib}/ast LDSOFLG
RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE $LARGEFILE
RPM_OPT_FLAGS=$RPM_OPT_FLAGS $IGNORE $FEATURE
- HOSTTYPE=linux.${RPM_ARCH}
mam_cc_L=use
mam_cc_OPTIMIZE=-pipe
export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
++ ksh93-argv.dif ++
--- src/cmd/ksh93/sh/xec.c
+++ src/cmd/ksh93/sh/xec.c 2011-06-14 13:31:32.471925963 +0200
@@ -2914,7 +2914,7 @@ int sh_fun(Namval_t *np, Namval_t *nq, c
longmode;
char*prefix = shp-prefix;
int n=0;
- char *av[2];
+ char *av[3];
Fcin_t save;
fcsave(save);
if((offset=staktell())0)
@@ -2922,7
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Wed Jun 1 12:46:35 CEST 2011.
--- ksh/ksh.changes 2011-05-24 18:36:49.0 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-06-01
11:33:24.0 +0200
@@ -1,0 +2,6 @@
+Wed Jun 1 11:23:03 CEST 2011 - wer...@suse.de
+
+- Correct timetype.sh ... nevertheless typeset -T does not work
+ with array types as this requires ksh93u
+
+---
calling whatdependson for head-i586
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.dWN5ez/_old 2011-06-01 12:46:13.0 +0200
+++ /var/tmp/diff_new_pack.dWN5ez/_new 2011-06-01 12:46:13.0 +0200
@@ -37,7 +37,7 @@
%endif
AutoReqProv:on
Version:93t
-Release:194
+Release:196
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
++ ksh93.dif ++
--- /var/tmp/diff_new_pack.dWN5ez/_old 2011-06-01 12:46:13.0 +0200
+++ /var/tmp/diff_new_pack.dWN5ez/_new 2011-06-01 12:46:13.0 +0200
@@ -246,6 +246,17 @@
done /dev/null
EOF
} 2 /dev/null
+--- src/cmd/ksh93/tests/timetype.sh
src/cmd/ksh93/tests/timetype.sh2011-05-25 07:45:35.763926377 +
+@@ -58,7 +58,7 @@
+ [[ ${tt[0]} == *+00:00 ]] || err_exit 'tt[0] is not yesterday'
+ [[ ${tt[1]} == *+00:00 ]] || err_exit 'tt[1] is not today'
+ [[ ${tt[2]} == *+00:00 ]] || err_exit 'tt[2] is not tomorrow'
+-[[ ${tt[3]} == *+14:00 ]] || err_exit 'tt[0] is not 2pm'
++[[ ${tt[3]} == *+14:00 ]] || err_exit 'tt[3] is not 2pm'
+ unset tt
+ Time_t tt=('2008-08-11+00:00:00,yesterday' '2008-08-11+00:00:00,today'
'2008-08-11+00:00:00,tomorrow')
+ tt[3]=9am
--- src/lib/libast/disc/memfatal.c
+++ src/lib/libast/disc/memfatal.c 2009-07-09 13:30:39.0 +
@@ -72,7 +72,7 @@ memfatal(void)
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Thu May 26 11:07:15 CEST 2011.
--- ksh/ksh.changes 2011-05-13 17:47:14.0 +0200
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-05-24
18:36:49.0 +0200
@@ -1,0 +2,7 @@
+Tue May 24 18:34:36 CEST 2011 - wer...@suse.de
+
+- gcc dumps out poerpc64 even on powerpc which does break the
+ binary in a very special way e.g. in getopt(3)
+- do not use CC but CCFLAGS and HOSTTYPE at make time
+
+---
calling whatdependson for head-i586
New:
ksh93-array.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.gLuGKV/_old 2011-05-26 10:59:16.0 +0200
+++ /var/tmp/diff_new_pack.gLuGKV/_new 2011-05-26 10:59:16.0 +0200
@@ -37,7 +37,7 @@
%endif
AutoReqProv:on
Version:93t
-Release:192
+Release:194
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
@@ -74,6 +74,7 @@
Patch20:ksh93-argv0.dif
Patch21:ksh93-export.dif
Patch22:ksh93-eintr.dif
+Patch23:ksh93-array.dif
%global use_suid_exe 0
%global use_locale 1
%global debug_memleak 0
@@ -147,8 +148,12 @@
%patch20
%patch21
%patch22
+%patch23
%build
+ TMPDIR=$(mktemp -d /tmp/ksh-build.XX) || exit 1
+ mkdir ${TMPDIR}/bin || exit 1
+ PATH=${TMPDIR}/bin:$PATH
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
typeset -i SIGPIPE=0x1000
if ((IGNORED SIGPIPE)) ; then
@@ -163,7 +168,7 @@
set -- $(readlink $fd)
exec -a $SHELL ./sigexec $SHELL ${1+$@}
fi
- nobuiltin=$(mktemp -u /tmp/nobuiltin.XX) || exit 1
+ nobuiltin=${TMPDIR:-/tmp}/nobuiltin
set -C
(cat-EOF
-fno-builtin-putenv
@@ -235,8 +240,7 @@
# Do not use -DSHOPT_SPAWN=1 and/or -DSHOPT_AMP=1 this would cause
# errors due race conditions while executing the test suite.
#
- feature=$(mktemp -u /tmp/feature.XX) || exit 1
- feature=${feature}.h
+ feature=${TMPDIR:-/tmp}/feature.h
set -C
(cat $feature)-'EOF'
#define SHOPT_SYSRC 1
@@ -263,9 +267,24 @@
case $RPM_ARCH in
ia64) RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
s390*) RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
- ppc*) RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
+ ppc*|powerpc*)
+RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-O[s0-9]/-O} ;;
esac
- RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS}|sed -r 's/[[:blank:]]+-g[0-9]?//g2')
+ case $RPM_ARCH in
+ ppc|powerpc)
+set -C
+(cat ${TMPDIR:-/tmp}/gcc)-EOF
+ #!/bin/sh
+ case $@ in
+ *-dumpmachine*)
+ echo powerpc-suse-linux ;;
+ *) exec -a gcc gcc ${1+$@}
+ esac
+ EOF
+set +C
+chmod +x ${TMPDIR:-/tmp}/gcc
+ esac
+ RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS}|sed -r 's/[[:blank:]]+-g[0-9]?/
-g2/g')
UNIVERSE=att
LDFLAGS=-lm
LDSOFLG=
@@ -275,7 +294,7 @@
cflags -fno-strict-aliasing RPM_OPT_FLAGS
cflags -fno-zero-initialized-in-bss RPM_OPT_FLAGS
cflags -fno-delete-null-pointer-checks RPM_OPT_FLAGS
- cflags -gRPM_OPT_FLAGS
+ cflags -g2 RPM_OPT_FLAGS
cflags -pipe RPM_OPT_FLAGS
cflags -Wl,-O2 LDFLAGS
cflags -Wl,--hash-size=16699 LDFLAGS
@@ -286,14 +305,11 @@
cflags -Wl,-rpath,/%{_lib}/ast LDSOFLG
RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE $LARGEFILE
RPM_OPT_FLAGS=$RPM_OPT_FLAGS $IGNORE $FEATURE
- HOSTTYPE=${RPM_ARCH%%*-linux*}
+ HOSTTYPE=linux.${RPM_ARCH}
mam_cc_L=use
mam_cc_OPTIMIZE=-pipe
export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
- for mam in $(find ${PWD}/ -name Mamfile); do
- sed -ri '/^exec.*\$\{CC\}/{ s/(\$\{CC\})/\1 \$\{RPM_OPT_FLAGS\}/g; }'
$mam
- done
- bin/package make CC=$CC
+ bin/package make CCFLAGS=$RPM_OPT_FLAGS HOSTTYPE=$HOSTTYPE
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
log=${root}/lib/package/gen/make.out
@@ -477,12 +493,14 @@
cat src/cmd/ksh93/sh.memo | sed 's/\\f5/\\fB/g;s/^\.H/\.P\n\.H/g' |
troff -Tascii8 -t -mm | grotty -bou MEMORANDUM
cp %{S:21} .
%if %use_suid_exe
+ set -C
(cat %{buildroot}%{_sysconfdir}/permissions.d/ksh) -EOF
/%{_lib}/ast/bin/suid_exec root:root 4755
EOF
(cat %{buildroot}%{_sysconfdir}/permissions.d/ksh.paranoid) -EOF
/%{_lib}/ast/bin/suid_exec root:root 0755
EOF
+ set +C
%endif
%post
++ ksh93-array.dif ++
--- src/cmd/ksh93/sh/array.c
+++ src/cmd/ksh93/sh/array.c2011-05-20 12:42:14.555927664 +
@@ -410,7 +410,7 @@ static Namfun_t *array_clone(Namval_t *n
mq = 0;
commit ksh for openSUSE:Factory
Hello community,
here is the log from the commit of package ksh for openSUSE:Factory
checked in at Mon May 16 10:28:37 CEST 2011.
--- ksh/ksh.changes 2011-03-04 16:42:44.0 +0100
+++ /mounts/work_src_done/STABLE/ksh/ksh.changes2011-05-13
17:47:14.0 +0200
@@ -1,0 +2,6 @@
+Fri May 13 15:29:04 UTC 2011 - wer...@suse.de
+
+- Add workaround to enforce synchronization on here documents done
+ for forked sub shell or processes (bnc#690623)
+
+---
calling whatdependson for head-i586
New:
ksh93-eintr.dif
Other differences:
--
++ ksh.spec ++
--- /var/tmp/diff_new_pack.vplzoz/_old 2011-05-16 10:24:21.0 +0200
+++ /var/tmp/diff_new_pack.vplzoz/_new 2011-05-16 10:24:21.0 +0200
@@ -37,7 +37,7 @@
%endif
AutoReqProv:on
Version:93t
-Release:190
+Release:192
Summary:Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: INIT.2010-06-21.tar.bz2
@@ -73,6 +73,7 @@
Patch19:ksh93-fdleak.dif
Patch20:ksh93-argv0.dif
Patch21:ksh93-export.dif
+Patch22:ksh93-eintr.dif
%global use_suid_exe 0
%global use_locale 1
%global debug_memleak 0
@@ -145,6 +146,7 @@
%patch19
%patch20
%patch21
+%patch22
%build
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
++ ksh93-eintr.dif ++
--- src/cmd/ksh93/sh/io.c
+++ src/cmd/ksh93/sh/io.c 2011-05-03 15:15:18.283926707 +0200
@@ -403,6 +403,7 @@
shp-sftable[2] = sfstderr;
sfnotify(sftrack);
sh_iostream(shp,0);
+ sh_iostream(shp,1);
/* all write steams are in the same pool and share outbuff */
shp-outpool = sfopen(NIL(Sfio_t*),NIL(char*),sw); /* pool
identifier */
shp-outbuff = (char*)malloc(IOBSIZE+4);
@@ -608,7 +609,8 @@
}
if(sp)
shp-sftable[f1] = 0;
- sh_close(f1);
+ if(shp-fdstatus[f1]!=IOCLOSE)
+ sh_close(f1);
}
return(f2);
}
@@ -1022,6 +1024,8 @@
memset(ap, 0, ARGVAL);
if(iofIOPUT)
ap-argflag = ARG_RAW;
+ else if(shp-subshell)
+ sh_subtmpfile(shp);
ap-argchn.ap = (struct argnod*)fname;
ap = sh_argprocsub(shp,ap);
fname = ap-argval;
@@ -2148,13 +2152,18 @@
static ssize_t subread(Sfio_t* sp,void* buff,register size_t size,Sfdisc_t*
handle)
{
register struct subfile *disp = (struct subfile*)handle;
+ ssize_t n;
NOT_USED(sp);
+ sfseek(disp-oldsp,disp-offset,SEEK_SET);
if(disp-left == 0)
return(0);
if(size disp-left)
size = disp-left;
disp-left -= size;
- return(sfread(disp-oldsp,buff,size));
+ n = sfread(disp-oldsp,buff,size);
+ if(size0)
+ disp-offset += size;
+ return(n);
}
/*
--- src/cmd/ksh93/sh/subshell.c
+++ src/cmd/ksh93/sh/subshell.c 2011-04-29 15:34:13.747926082 +0200
@@ -235,7 +235,7 @@
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 sp-var!=shp-var_base
shp-last_root==shp-var_tree)
+ if(sp-var!=shp-var_tree shp-last_root==shp-var_tree)
return(np);
if((ap=nv_arrayptr(np)) (mp=nv_opensub(np)))
{
--- src/cmd/ksh93/sh/xec.c
+++ src/cmd/ksh93/sh/xec.c 2011-05-03 15:02:23.411926136 +0200
@@ -53,6 +53,7 @@
#define SH_NTFORK SH_TIMING
#define NV_BLTPFSH NV_ARRAY
+#define HERE_MEM 0x1000
#if _lib_nice
extern int nice(int);
@@ -2606,6 +2607,7 @@
pid_t sh_fork(int flags, int *jobid)
{
+ Sfio_t* aux_heredocs = NIL(Sfio_t*);
register pid_t parent;
register int sig;
#if SHOPT_FASTPIPE
@@ -2625,7 +2627,23 @@
sh.trapnote = ~SH_SIGTERM;
job_fork(-1);
sh.savesig = -1;
+ if (sh.heredocs)
+ {
+ aux_heredocs = sftmp(HERE_MEM);
+ if (aux_heredocs)
+ {
+ sfseek(sh.heredocs,(off_t)0,SEEK_SET);
+ sfmove(sh.heredocs,aux_heredocs,(Sfoff_t)(-1),-1);
+ sfsync(aux_heredocs);
+ }
+ }
while(_sh_fork(parent=fork(),flags,jobid) 0);
+ if (aux_heredocs)
+ {
+ if (!parent)
+ sfswap(aux_heredocs,sh.heredocs);
+ sfclose(aux_heredocs);
+ }
sh_stats(STAT_FORKS);
sig =
