- last change reverted. this is not a bashism. ksh bug?

  testcase:
   echo '[ "foo" = "bar" -a "-u" = "zoo" ]'|/bin/sh
   /bin/sh: <stdin>[1]: [: zoo: unexpected operator/operand

Changed files:
    klibc-kill_bashism.patch -> 1.2
    klibc.spec -> 1.42

diff --git a/klibc-kill_bashism.patch b/klibc-kill_bashism.patch
deleted file mode 100644 (file)
index 4c0dc13..0000000
--- a/klibc-kill_bashism.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- klibc-1.1.1/ash/mkbuiltins.orig    2005-09-06 22:49:34.000000000 +0200
-+++ klibc-1.1.1/ash/mkbuiltins 2005-09-30 14:40:07.850154750 +0200
-@@ -108,7 +108,7 @@
-       }
-       echo 'int '"$func"'(int, char **);' >&4
-       while
--              [ $# != 0 -a "$1" != '#' ]
-+              [ $# != 0 ] && [ "$1" != '#' ]
-       do
-               [ "$1" = '-s' ] && {
-                       specials="$specials $2 $func"

diff --git a/klibc.spec b/klibc.spec
index 2f96642f7a0ba07005728500684bac7fff530490..8086bbeeed50adbce00db177529c04fe066f1c31 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -18,7 +18,6 @@ Source0:      http://www.kernel.org/pub/linux/libs/klibc/Testing/%{name}-%{version}.t
 Patch0:                %{name}-ksh-quotation.patch
 Patch1:                %{name}-klcc.patch
 Patch2:                %{name}-fstype_jfs.patch
-Patch3:                %{name}-kill_bashism.patch
 URL:           http://www.zytor.com/mailman/listinfo/klibc/
 %{?with_dist_kernel:BuildRequires:     kernel-headers >= 2.4}
 BuildRequires: rpmbuild(macros) >= 1.153
@@ -93,7 +92,6 @@ Narz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p1
 
 %build
 cd include