From 3a9a1f3a997a9fa01edd3a549a70478dbba576b4 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Mon, 1 Nov 2010 09:55:26 +0100
Subject: [PATCH] - ksh updated to 2010-10-26

---
 .gitignore                 |  2 ++
 ksh-20100826-fixregr.patch | 26 ++++++++++----------------
 ksh.spec                   |  7 +++++--
 sources                    |  4 ++--
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 332e4f1..6c00c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ INIT.2010-07-01.tgz
 /INIT.2010-09-24.tgz
 /ast-ksh.2010-10-10.tgz
 /INIT.2010-10-10.tgz
+/ast-ksh.2010-10-26.tgz
+/INIT.2010-10-26.tgz
diff --git a/ksh-20100826-fixregr.patch b/ksh-20100826-fixregr.patch
index 68fc0a9..9b7cc35 100644
--- a/ksh-20100826-fixregr.patch
+++ b/ksh-20100826-fixregr.patch
@@ -1,6 +1,6 @@
-diff -up ksh-20100924/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20100924/src/cmd/ksh93/tests/builtins.sh
---- ksh-20100924/src/cmd/ksh93/tests/builtins.sh.fixregr	2010-09-30 08:49:58.225268051 +0200
-+++ ksh-20100924/src/cmd/ksh93/tests/builtins.sh	2010-09-30 08:53:58.429519220 +0200
+diff -up ksh-20101026/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20101026/src/cmd/ksh93/tests/builtins.sh
+--- ksh-20101026/src/cmd/ksh93/tests/builtins.sh.fixregr	2010-10-27 08:52:38.000000000 +0200
++++ ksh-20101026/src/cmd/ksh93/tests/builtins.sh	2010-11-01 08:49:42.135892758 +0100
 @@ -293,7 +293,7 @@ fi
  # we won't get hit by the one second boundary twice, right?
  [[ $(printf '%T\n' now) == "$(date)" ]] ||
@@ -10,10 +10,10 @@ diff -up ksh-20100924/src/cmd/ksh93/tests/builtins.sh.fixregr ksh-20100924/src/c
  behead()
  {
  	read line
-diff -up ksh-20100924/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20100924/src/cmd/ksh93/tests/locale.sh
---- ksh-20100924/src/cmd/ksh93/tests/locale.sh.fixregr	2010-09-07 20:21:44.000000000 +0200
-+++ ksh-20100924/src/cmd/ksh93/tests/locale.sh	2010-09-30 08:57:41.512270429 +0200
-@@ -103,6 +103,7 @@ if	(( $($SHELL -c $'export LC_ALL='$loca
+diff -up ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20101026/src/cmd/ksh93/tests/locale.sh
+--- ksh-20101026/src/cmd/ksh93/tests/locale.sh.fixregr	2010-10-26 12:12:34.000000000 +0200
++++ ksh-20101026/src/cmd/ksh93/tests/locale.sh	2010-11-01 09:37:38.719975976 +0100
+@@ -105,6 +105,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
  
@@ -21,7 +21,7 @@ diff -up ksh-20100924/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20100924/src/cmd
  #$SHELL -c 'export LANG='$locale'; printf "\u[20ac]\u[20ac]" > $tmp/two_euro_chars.txt'
  printf $'\342\202\254\342\202\254' > $tmp/two_euro_chars.txt
  exp="6 2 6"
-@@ -110,16 +111,16 @@ set -- $($SHELL -c "
+@@ -112,11 +113,11 @@ set -- $($SHELL -c "
  	unset LC_CTYPE
  	export LANG=$locale
  	export LC_ALL=C
@@ -36,13 +36,7 @@ diff -up ksh-20100924/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20100924/src/cmd
  ")
  got=$*
  [[ $got == $exp ]] || err_exit "command wc LC_ALL default failed -- expected '$exp', got '$got'"
- set -- $($SHELL -c "
--	if	builtin -f cmd wc 2>/dev/null
-+	if	builtin wc 2>/dev/null
- 	then	unset LC_CTYPE
- 		export LANG=$locale
- 		export LC_ALL=C
-@@ -133,6 +134,8 @@ set -- $($SHELL -c "
+@@ -135,6 +136,8 @@ set -- $($SHELL -c "
  got=$*
  [[ $got == $exp ]] || err_exit "builtin wc LC_ALL default failed -- expected '$exp', got '$got'"
  
@@ -51,7 +45,7 @@ diff -up ksh-20100924/src/cmd/ksh93/tests/locale.sh.fixregr ksh-20100924/src/cmd
  # multibyte char straddling buffer boundary
  
  {
-@@ -189,6 +192,7 @@ do	exp=$1
+@@ -191,6 +194,7 @@ do	exp=$1
  done
  
  # setocale(LC_ALL,"") after setlocale() initialization
diff --git a/ksh.spec b/ksh.spec
index 8fc2bb5..7e5bf20 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -1,11 +1,11 @@
-%global       releasedate 2010-10-10
+%global       releasedate 2010-10-26
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
 URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      CPL
-Version:      20101010
+Version:      20101026
 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
@@ -116,6 +116,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Nov 01 2010 Michal Hlavinka <mhlavink@redhat.com> - 20101026-1
+- ksh updated to 2010-10-26
+
 * Tue Oct 12 2010 Michal Hlavinka <mhlavink@redhat.com> - 20101010-1
 - ksh updated to 2010-10-10
 
diff --git a/sources b/sources
index fda892b..e521835 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-778a53ed17760bb9c40b4cfc4d275eeb  ast-ksh.2010-10-10.tgz
-13fc55fe88fde0e1a58c91db835d5440  INIT.2010-10-10.tgz
+36364da442036228ff000eeadd8fdf3a  ast-ksh.2010-10-26.tgz
+db3454fa216c67bb68b5f9d9f8b31c0b  INIT.2010-10-26.tgz