[ksh/f16] ksh updated to 2012-08-01
Michal Hlavinka
mhlavink at fedoraproject.org
Wed Aug 8 12:30:15 UTC 2012
commit ed81ae575c1194948ffe5e62f291d00b87d3e57f
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Wed Aug 8 14:29:49 2012 +0200
ksh updated to 2012-08-01
ksh-20070328-builtins.patch | 10 +++++-----
ksh-20100826-fixregr.patch | 23 ++++++++++++++++-------
ksh-20110630-ddotfix.patch | 12 ------------
ksh-20110630-dontstop.patch | 21 ---------------------
ksh-20110630-fixkill.patch | 20 --------------------
ksh-20110630-histfix.patch | 21 ---------------------
ksh-20110630-ifsfix.patch | 23 -----------------------
ksh-20110630-tmoutfix.patch | 12 ------------
ksh-20120101-oopfix.patch | 12 ------------
ksh-20120214-fdleak.patch | 11 -----------
ksh.spec | 38 ++++++++------------------------------
sources | 4 ++--
12 files changed, 31 insertions(+), 176 deletions(-)
---
diff --git a/ksh-20070328-builtins.patch b/ksh-20070328-builtins.patch
index e50470a..5c6b21c 100644
--- a/ksh-20070328-builtins.patch
+++ b/ksh-20070328-builtins.patch
@@ -1,8 +1,8 @@
-diff -up ksh-20100924/src/cmd/ksh93/data/builtins.c.builtins ksh-20100924/src/cmd/ksh93/data/builtins.c
---- ksh-20100924/src/cmd/ksh93/data/builtins.c.builtins 2010-08-10 20:58:54.000000000 +0200
-+++ ksh-20100924/src/cmd/ksh93/data/builtins.c 2010-10-08 18:08:35.118675557 +0200
-@@ -125,20 +125,28 @@ const struct shtable3 shtab_builtins[] =
- #ifdef SHOPT_CMDLIB_HDR
+diff -up ksh-20120620/src/cmd/ksh93/data/builtins.c.builtins ksh-20120620/src/cmd/ksh93/data/builtins.c
+--- ksh-20120620/src/cmd/ksh93/data/builtins.c.builtins 2012-06-19 10:02:12.000000000 +0200
++++ ksh-20120620/src/cmd/ksh93/data/builtins.c 2012-06-22 12:35:05.587717588 +0200
+@@ -131,20 +131,28 @@ const struct shtable3 shtab_builtins[] =
+ #undef mktemp /* undo possible map-libc mktemp => _ast_mktemp */
#include SHOPT_CMDLIB_HDR
#else
+#if 1
diff --git a/ksh-20100826-fixregr.patch b/ksh-20100826-fixregr.patch
index 1b7fdbe..87cb13c 100644
--- a/ksh-20100826-fixregr.patch
+++ b/ksh-20100826-fixregr.patch
@@ -1,7 +1,7 @@
-diff -up ksh-20101122/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20101122/src/cmd/ksh93/tests/builtins.sh
---- ksh-20101122/src/cmd/ksh93/tests/builtins.sh.fixregr 2010-10-27 08:52:38.000000000 +0200
-+++ ksh-20101122/src/cmd/ksh93/tests/builtins.sh 2010-11-26 10:17:05.653551931 +0100
-@@ -291,9 +291,9 @@ then err_exit "printf '%..*s' not workin
+diff -up ksh-20120801/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20120801/src/cmd/ksh93/tests/builtins.sh
+--- ksh-20120801/src/cmd/ksh93/tests/builtins.sh.fixregr 2012-07-16 17:23:56.000000000 +0200
++++ ksh-20120801/src/cmd/ksh93/tests/builtins.sh 2012-08-08 12:29:00.733243019 +0200
+@@ -303,9 +303,9 @@ then err_exit "printf '%..*s' not workin
fi
[[ $(printf '%q\n') == '' ]] || err_exit 'printf "%q" with missing arguments'
# we won't get hit by the one second boundary twice, right?
@@ -14,9 +14,9 @@ diff -up ksh-20101122/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20101122/src/c
behead()
{
read line
-diff -up ksh-20101122/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101122/src/cmd/ksh93/tests/locale.sh
---- ksh-20101122/src/cmd/ksh93/tests/locale.sh.fixregr 2010-11-13 01:29:23.000000000 +0100
-+++ ksh-20101122/src/cmd/ksh93/tests/locale.sh 2010-11-26 10:08:17.334737934 +0100
+diff -up ksh-20120801/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20120801/src/cmd/ksh93/tests/locale.sh
+--- ksh-20120801/src/cmd/ksh93/tests/locale.sh.fixregr 2012-06-26 21:57:46.000000000 +0200
++++ ksh-20120801/src/cmd/ksh93/tests/locale.sh 2012-08-08 12:29:20.039405240 +0200
@@ -104,6 +104,7 @@ if (( $($SHELL -c $'export LC_ALL='$loca
then LC_ALL=$locale $SHELL -c b1=$'"\342\202\254\342\202\254\342\202\254\342\202\254w\342\202\254\342\202\254\342\202\254\342\202\254"; [[ ${b1:4:1} == w ]]' || err_exit 'multibyte ${var:offset:len} not working correctly'
fi
@@ -57,3 +57,12 @@ diff -up ksh-20101122/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101122/src/cmd
printf 'f1\357\274\240f2\n' > input1
printf 't2\357\274\240f1\n' > input2
+@@ -336,7 +340,7 @@ then LC_ALL=en_US.UTF-8
+ [[ $(print -r -- "$x") == $'hello\u[20ac]\xee world' ]] || err_exit '%q with unicode and non-unicode not working'
+ if [[ $(whence od) ]]
+ then got='68 65 6c 6c 6f e2 82 ac ee 20 77 6f 72 6c 64 0a'
+- [[ $(print -r -- "$x" | od -An -tx1) == "$got" ]] || err_exit "incorrect string from printf %q"
++ [[ $(print -r -- "$x" | od -An -tx1) =~ $got ]] || err_exit "incorrect string from printf %q"
+ fi
+
+ fi
diff --git a/ksh.spec b/ksh.spec
index 522d5db..0f88443 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -1,12 +1,12 @@
-%global releasedate 2011-06-30
+%global releasedate 2012-08-01
Name: ksh
Summary: The Original ATT Korn Shell
URL: http://www.kornshell.com/
Group: System Environment/Shells
License: CPL
-Version: 20110630
-Release: 8%{?dist}
+Version: 20120801
+Release: 1%{?dist}
Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
Source3: kshrc.rhs
@@ -20,23 +20,6 @@ Patch1: ksh-20070328-builtins.patch
#fix regression test suite to be usable during packagebuild - Fedora/RHEL specific
Patch2: ksh-20100826-fixregr.patch
-# for ksh < 2011-08-03
-Patch3: ksh-20110630-ifsfix.patch
-
-# sent upstream, for ksh <= 2011-08-12
-Patch4: ksh-20110630-fixkill.patch
-
-Patch5: ksh-20110630-tmoutfix.patch
-
-Patch7: ksh-20110630-dontstop.patch
-
-Patch8: ksh-20110630-ddotfix.patch
-
-Patch9: ksh-20110630-histfix.patch
-
-Patch10: ksh-20120101-oopfix.patch
-Patch11: ksh-20120214-fdleak.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Conflicts: pdksh
Requires: coreutils, glibc-common, diffutils
@@ -57,14 +40,6 @@ with "sh" (the Bourne Shell).
%setup -q -T -D -a 1
%patch1 -p1 -b .builtins
%patch2 -p1 -b .fixregr
-%patch3 -p1 -b .ifsfix
-%patch4 -p1 -b .fixkill
-%patch5 -p1 -b .tmoutfix
-%patch7 -p1 -b .dontstop
-%patch8 -p1 -b .ddotfix
-%patch9 -p1 -b .histfix
-%patch10 -p1 -b .oopfix
-%patch11 -p1 -b .fdleak
#/dev/fd test does not work because of mock
sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options
@@ -73,12 +48,12 @@ sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options
./bin/package
./bin/package make mamake ||:
./bin/package make mamake ||:
-export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unknown-pragmas -Wno-parentheses -Wno-unused"
export CC=gcc
./bin/package "make"
#missing in latest tarball
-#cp lib/package/LICENSES/ast LICENSE
+#cp lib/package/LICENSES/epl LICENSE
%install
rm -rf $RPM_BUILD_ROOT
@@ -152,6 +127,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 08 2012 Michal Hlavinka <mhlavink at redhat.com> - 20120801-1
+- ksh updated to 2012-08-01
+
* Mon Feb 27 2012 Michal Hlavinka <mhlavink at redhat.com> - 20110630-8
- fix file descriptor leak
diff --git a/sources b/sources
index a034c80..935961b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5f07713ecdb7dc2caa1def00672b308a ast-ksh.2011-06-30.tgz
-de7e347b8e33130daad338a1e29112ff INIT.2011-06-30.tgz
+3a6e2d01b1b049bdef968dc5a24c1ea7 ast-ksh.2012-08-01.tgz
+af699318bea7398f0f413b839bfcd762 INIT.2012-08-01.tgz
More information about the scm-commits
mailing list