Add fix from upstream for quoting issues.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 27 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 90f0d8f1f216..3218a756252c 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.283 2011/03/02 02:28:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.284 2011/03/03 21:18:30 vapier Exp $
+
+  03 Mar 2011; Mike Frysinger <vapier@gentoo.org> bash-4.2_p6.ebuild,
+  +files/bash-4.2-expand-string-unsplit.patch:
+  Add fix from upstream for quoting issues.
 
 *bash-4.2_p6 (02 Mar 2011)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 5d2672c103cf..e8048be28e5f 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,6 +25,7 @@ AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea
 AUX bash-4.0-parallel-build.patch 2237 RMD160 82aa28d48f12978cbaea7ebed987d13f5368c2c8 SHA1 c82d0c9ca049fe3c53418f4a3b399a840bbcdc90 SHA256 65db03b0c0b8e2fd917f049e9e84f7b2b234b3e9e37f395d4d8984194b392a56
 AUX bash-4.1-fbsd-eaccess.patch 843 RMD160 50e06a8ec83fa756a9749ab5011696e737731afe SHA1 9468675bdb345c01f6a285d76526e851de63a895 SHA256 42a4ee58b0d2fd529e25fcc3ca10d17bbac2c91fd8bcb191d70c788f0b55fb95
 AUX bash-4.1-parallel-build.patch 829 RMD160 371bd2d62a0b70c4305697975780165e02f2b38d SHA1 9978a6ed4668509660491799bbbc5b7d6ad2cbd9 SHA256 0da60b91e4fb2326137a4dde6d8937592b6efea45de51194ca1770127637e652
+AUX bash-4.2-expand-string-unsplit.patch 392 RMD160 3702ee5279d46e61f505494fc5397e21174fcdd9 SHA1 3b06280fef153be15553665ca71c5cf25d9e6bc1 SHA256 22f7c9898b1b9df83bbe1bf7cde7454227806ebd000ccf82c5a43080eb549034
 AUX bash-4.x-deferred-heredocs.patch 1255 RMD160 69e3554d225e5a85be3f874b0bb0139c0e24c9b9 SHA1 b8d492af021ae59c9799dfbb169842c23ed9f826 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2798 RMD160 c63f6e79fe3e5c12a42f65379aa2de1d2a6437cf SHA1 d1fb11d9b32cd6a448ce969d72949677caea436b SHA256 537fb02f97da09b91f9e3c1b7624e43dbf650536d6a6b3a18e9003a57f610c32
@@ -165,13 +166,13 @@ EBUILD bash-4.0_p38.ebuild 5561 RMD160 965176e3361d1d0cac9b013152ec2eb6db274a44
 EBUILD bash-4.1_p10.ebuild 5599 RMD160 6a5c4eeb85c6bc2b6ccac227ff5f6d30a88e470b SHA1 61adef2a439365d91baea4a52c79460ffb319f03 SHA256 ebac02b1d21ceaa65556c7eda49c31933d46e3c34d6bed792d10ec4602440826
 EBUILD bash-4.1_p7.ebuild 5588 RMD160 b51148bc278822a53866104fe4c104100c6c7e95 SHA1 ed195b310adabc1a8e7d04d513c058e5dbdfe5fe SHA256 792f06f27d7d8b3186b4368ac1f54d145724120e7f369dfe92f7df1754b83faa
 EBUILD bash-4.1_p9.ebuild 5586 RMD160 f0d3d2a6f73d5ebe6979ff82e55edb1ccbb8fca2 SHA1 08f3b13848d1c00d92c5c8deb8c00885448211eb SHA256 717c934a98b0b5f564f4f06988828831de3b5b3247f49b07ed6325d476342ac3
-EBUILD bash-4.2_p6.ebuild 5334 RMD160 d80e24ded2e341b1dce30499de14e4f545bb086d SHA1 ef0314fe972faf5d19d47894339758692fbdd958 SHA256 5158681b957e3d8f1ae7fae3fce453584c612535e3e85c3ba5402500c14fe62c
-MISC ChangeLog 43799 RMD160 9111eefc782033744782d30482c420d4e1de43e2 SHA1 2b2ab2ec553250e9b833f93bfcb298aa2de43536 SHA256 aaebf22510ff736bbbc0c4b8eec651023bd619bd1d891db96058c35832a22d56
+EBUILD bash-4.2_p6.ebuild 5395 RMD160 82e7c400cf3b9ef9991a3ce72dd8203b0f83a18c SHA1 daac6b804d4dac54e97289f81ec3b8ec8020f260 SHA256 777685eef4d3fdbd3b4b09fbe46af881f316d5aa153a04e490527f1c05d10dc4
+MISC ChangeLog 43961 RMD160 0d2020ce23d0221ec8b51693e616a2f9890e3f7a SHA1 aef38c67c0ef206351ca81819f6872fb0aa89f03 SHA256 f0f9b96bcab96f9925f2e0ff60abcb23254af20d2c2dd4a34ff90883871cdb2e
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1tq1cACgkQaC/OocHi7JYImAD/dnlTNwcPgBI0wh+yRODfmCd3
-4hGqd5SGS334p3+Onn4A/0gD2wAwqK7nmN5VyHQi98b6HFUNBIMVHK5ynHFwQS01
-=IniX
+iF4EAREIAAYFAk1wBasACgkQaC/OocHi7JY8ZwD/dZk/DqGb82OGIV88WAEFonh2
+ER/1qI6/hRVUSQF5S+YA/3MPGydp4pqED50NXFJJxmsDcTH3uiFQTHemLau1Q4i/
+=Y3O2
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p6.ebuild b/app-shells/bash/bash-4.2_p6.ebuild
index d1fe6f02b3fa..827c372c88d8 100644
--- a/app-shells/bash/bash-4.2_p6.ebuild
+++ b/app-shells/bash/bash-4.2_p6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p6.ebuild,v 1.1 2011/03/02 02:28:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p6.ebuild,v 1.2 2011/03/03 21:18:30 vapier Exp $
 
 EAPI="1"
 
@@ -69,6 +69,8 @@ src_unpack() {
 	cd lib/readline
 	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
 	cd ../..
+
+	epatch "${FILESDIR}"/${PN}-4.2-expand-string-unsplit.patch
 }
 
 src_compile() {
diff --git a/app-shells/bash/files/bash-4.2-expand-string-unsplit.patch b/app-shells/bash/files/bash-4.2-expand-string-unsplit.patch
new file mode 100644
index 000000000000..75235c92cb28
--- /dev/null
+++ b/app-shells/bash/files/bash-4.2-expand-string-unsplit.patch
@@ -0,0 +1,13 @@
+*** ../bash-4.2-patched/subst.c	2011-02-25 12:03:58.000000000 -0500
+--- subst.c	2011-03-03 14:08:23.000000000 -0500
+***************
+*** 4609,4614 ****
+--- 4611,4617 ----
+    if (ifs_firstc == 0)
+  #endif
+      word->flags |= W_NOSPLIT;
++   word->flags |= W_NOSPLIT2;
+    result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
+    expand_no_split_dollar_star = 0;
+  
+