diff --git a/.gitignore b/.gitignore index a8a294e..f32373a 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,5 @@ INIT.2010-07-01.tgz /INIT.2012-06-28.tgz /ast-ksh.2012-07-27.tgz /INIT.2012-07-27.tgz +/ast-ksh.2012-08-01.tgz +/INIT.2012-08-01.tgz 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 e12df8f..194df1c 100644 --- a/ksh.spec +++ b/ksh.spec @@ -1,11 +1,11 @@ -%global releasedate 2012-07-27 +%global releasedate 2012-08-01 Name: ksh Summary: The Original ATT Korn Shell URL: http://www.kornshell.com/ Group: System Environment/Shells License: EPL -Version: 20120727 +Version: 20120801 Release: 3%{?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 @@ -53,7 +53,7 @@ export CCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-unknown-pragmas -Wno-pa export CC=gcc ./bin/package "make" -cp lib/package/LICENSES/epl LICENSE +#cp lib/package/LICENSES/epl LICENSE %install rm -rf $RPM_BUILD_ROOT @@ -118,7 +118,8 @@ fi %files %defattr(-, root, root,-) -%doc src/cmd/ksh93/COMPATIBILITY src/cmd/ksh93/RELEASE src/cmd/ksh93/TYPES LICENSE +%doc src/cmd/ksh93/COMPATIBILITY src/cmd/ksh93/RELEASE src/cmd/ksh93/TYPES +# LICENSE file is missing, temporarily? /bin/ksh /usr/bin/shcomp %{_mandir}/man1/* @@ -127,9 +128,13 @@ fi %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf %clean - rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 14 2012 Michal Hlavinka - 20120801-3 +- ksh updated to 2012-08-01 +- skip some release numbers to fix update path + * Fri Sep 14 2012 Michal Hlavinka - 20120727-3 - fix typo in binfmt config file - register binary format after package installation diff --git a/sources b/sources index 08bf06a..935961b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -727e1458ff8fa62d6cd73883e408d5ed ast-ksh.2012-07-27.tgz -5b0c5716378309aaa0d4364a629f3426 INIT.2012-07-27.tgz +3a6e2d01b1b049bdef968dc5a24c1ea7 ast-ksh.2012-08-01.tgz +af699318bea7398f0f413b839bfcd762 INIT.2012-08-01.tgz