Newer patch from upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 37 insertions, 20 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 885073bbdf99..244a41ef3d3b 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.205 2009/02/25 22:46:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.206 2009/02/26 20:26:28 vapier Exp $
+
+  26 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  files/bash-4.0-declare-identifier.patch:
+  Newer patch from upstream.
 
   25 Feb 2009; Mike Frysinger <vapier@gentoo.org>
   +files/bash-4.0-pipeline-reserved-word.patch, bash-4.0.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 00a62fa3111c..1e7a1e20a3b2 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,7 +21,7 @@ AUX bash-3.2-redisplay-cursor.patch 685 RMD160 80fd6fc3eefb4cb589132f8b462b79c3e
 AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f796c65f5 SHA1 ff136654614731ec3252ee5f34235138f0bf381e SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 AUX bash-4.0-comsub-backslash-metacharacters.patch 750 RMD160 f297b78a482a8b3b481aa67889609d98826a4619 SHA1 eaf09f94c7745e43cdc64799ab858e9fb3a12e60 SHA256 7ab73ffde1b86d4286b180c6c968ce717908b404a46322c4d1cdb82c398eb03c
-AUX bash-4.0-declare-identifier.patch 420 RMD160 6786312b4def1651c576862d7aeec7e28bab2162 SHA1 500cb39a986140dd882577ea60d81855a4c7ecb3 SHA256 02d47277e9f323ee032b13f805230f716b76bd81380eaf001078042d19473fb5
+AUX bash-4.0-declare-identifier.patch 1144 RMD160 192eb95635a40d434a74cc97f2eb59e93bbacac5 SHA1 7ace6f35c12a453ae88d35b2308ef4e9e9cc868d SHA256 79a705ab4c658ca84bf4ee0eb80bef639d6137e9c271eac5cb9f124372ed4c11
 AUX bash-4.0-exit-checkjobs.patch 549 RMD160 11158eb2bb4cb8fb0ac53db23b2d4d4cf54f6dc6 SHA1 ff51cc138c5c174829931641a61c2f86fa96d4aa SHA256 7732484a8a014c7fa23f4aa44aeb53671c1967bf373e132de8435d0fe538024a
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
@@ -108,12 +108,12 @@ EBUILD bash-3.2_p39.ebuild 5950 RMD160 22536f34ab6d2eb7d2475c1e4e4cdaacc451df4b
 EBUILD bash-3.2_p48-r1.ebuild 6124 RMD160 c3b16af5c8d019cb58c57a45ad5be2b9d93b4f2a SHA1 3e8e9ce6957f67abce65678f501883b4cf3b8ad4 SHA256 2895b32812a63c6208bb2a11ef60911751e09dbd42db39dae2d2acd90f9faba6
 EBUILD bash-3.2_p48.ebuild 5961 RMD160 9ab905aeac020d82d8369a4853ac208afd4f7b17 SHA1 382b66ff687601decb3bbed25bf0465a2f7fbe93 SHA256 8794b417a6be993a370d2ca7a6bacfef66bb003e06ea410bdedf5b0a33666f65
 EBUILD bash-4.0.ebuild 5807 RMD160 fdd6d660576705362497029e22b1e689057aa8d4 SHA1 4f43fb78762044e18af95bd46754a46c5eec0962 SHA256 eb480383f8ce1470fcb2dec01b2bcdb1657ebeaf8c4c4e5f6278c9b185b5dba8
-MISC ChangeLog 33342 RMD160 c071c708c0de43d2239485309d99a29b79697446 SHA1 d8fab0b6e0a4ebc7c0d624b9a63f09cafe64f68d SHA256 58d7666d9d15b6b4e559dcefa2f4e07f5a3d9732ab53f8425342e4e580650a66
+MISC ChangeLog 33465 RMD160 9e5446eea78de97d31b62bebc027e4da2b77331f SHA1 495b67c5819ff2c8358be44989f8e7debbf3eb99 SHA256 9732c594263f60018cd0378cc1749e72a3ae9dd33fb7b60707206e718fa6d001
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmlylcACgkQn/5bYzqsSmGdJgCfX/Kh2zPlFzXSTH+HXpnPyL5i
-6ZgAn3hEp79metY6RniQEBL3SGdXmBKQ
-=sECg
+iEYEARECAAYFAkmm+vkACgkQn/5bYzqsSmGroACeIT/rwoEFqLTFn5Ahi4///26T
+x44An24KwdZKaP2fvP2sWgKMjA3X9syG
+=zaeD
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bash-4.0-declare-identifier.patch b/app-shells/bash/files/bash-4.0-declare-identifier.patch
index 30c17e337c8c..e8a5b4fd73ac 100644
--- a/app-shells/bash/files/bash-4.0-declare-identifier.patch
+++ b/app-shells/bash/files/bash-4.0-declare-identifier.patch
@@ -1,18 +1,31 @@
 http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00206.html
 
 *** ../bash-4.0/builtins/declare.def	2009-01-04 14:32:22.000000000 -0500
---- builtins/declare.def	2009-02-25 09:41:35.000000000 -0500
+--- builtins/declare.def	2009-02-26 11:40:16.000000000 -0500
 ***************
-*** 288,291 ****
---- 288,297 ----
-  	    }
-  	}
-+       else if (legal_identifier (name) == 0)
-+ 	{
-+ 	  sh_invalidid (name);
-+ 	  assign_error++;
-+ 	  NEXT_VARIABLE ();
-+ 	}
-        else
-  	value = "";
-
+*** 296,299 ****
+--- 296,306 ----
+        if (t = strchr (name, '['))	/* ] */
+  	{
++ 	  /* If offset != 0 we have already validated any array reference */
++ 	  if (offset == 0 && valid_array_reference (name) == 0)
++ 	    {
++ 	      sh_invalidid (name);
++ 	      assign_error++;
++ 	      NEXT_VARIABLE ();
++ 	    }
+  	  subscript_start = t;
+  	  *t = '\0';
+***************
+*** 485,489 ****
+  	  /* declare -a name[[n]] or declare name[n] makes name an indexed
+  	     array variable. */
+! 	  else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0)
+  	    var = convert_var_to_array (var);
+  #endif /* ARRAY_VARS */
+--- 492,496 ----
+  	  /* declare -a name[[n]] or declare name[n] makes name an indexed
+  	     array variable. */
+! 	  else if ((making_array_special || (flags_on & att_array)) && array_p (var) == 0 && assoc_p (var) == 0)
+  	    var = convert_var_to_array (var);
+  #endif /* ARRAY_VARS */