Finally the official patch to fix CVE-2014-7186 and CVE-2014-7187 is out (bug #523742). Committed straight to stable where previous -r1 version was stable

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x981CA6FC

11 files changed, 52 insertions, 533 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 7a17f327d6af..0b3d70bcaf78 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.403 2014/10/01 16:41:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.404 2014/10/01 20:47:24 polynomial-c Exp $
+
+*bash-4.3_p28 (01 Oct 2014)
+*bash-4.2_p51 (01 Oct 2014)
+*bash-4.1_p15 (01 Oct 2014)
+*bash-4.0_p42 (01 Oct 2014)
+*bash-3.2_p55 (01 Oct 2014)
+*bash-3.1_p21 (01 Oct 2014)
+
+  01 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-3.1_p19.ebuild,
+  +bash-3.1_p21.ebuild, -bash-3.2_p53.ebuild, +bash-3.2_p55.ebuild,
+  -bash-4.0_p40.ebuild, +bash-4.0_p42.ebuild, -bash-4.1_p13.ebuild,
+  -bash-4.1_p14-r1.ebuild, +bash-4.1_p15.ebuild, -bash-4.2_p49.ebuild,
+  -bash-4.2_p50-r1.ebuild, +bash-4.2_p51.ebuild, -bash-4.3_p27-r1.ebuild,
+  +bash-4.3_p28.ebuild, -files/bash-redir-stack-overflow.patch:
+  Finally the official patch to fix CVE-2014-7186 and CVE-2014-7187 is out (bug
+  #523742). Committed straight to stable where previous -r1 version was stable.
 
   01 Oct 2014; Sergey Popov <pinkbyte@gentoo.org> bash-4.2_p50-r1.ebuild:
   s390 stable, wrt bug #523742
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 215741a01c2a..8e9bfed4ab5d 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -33,7 +33,6 @@ AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3
 AUX bash-4.3-parse-time-keyword.patch 790 SHA256 44c83641d4f8e7357b0b63b1a5095e751643c30f84fdf5dbc868c9d4a200c15d SHA512 070ab4a46adec60434ef45e04ca0d453fd02c40da8db7051800160c8fa8d3846a6e6bf57db02c583fd699eab69fa03b268107dc58e3332d2f7ed66f00432d6cd WHIRLPOOL ab37acf37bf497bc7c041f341b44dbd755d6e0170d8b74436d79aa63aac1c3cf35c13bd0c56a4eae071639bac27ea81a194c691c42fd4089de8df859745caf5c
 AUX bash-4.3-term-cleanup.patch 2152 SHA256 9f2d0faac988273dd1d838e8904325d524c996c1560e805c184c5387e31ed28d SHA512 3c13505e292532f10f4ac98ffd0044438b4d77f76d199018f1ff914ed1eb454c2ca12c6ef6996746c6300e37a78a4a0d111ac65f1c8d6897cfbc70bea457adf3 WHIRLPOOL 1db7ca7f51f3ed040a25f24d24221f024baf3a786dbb0477ba62e94f8c64b12d7266045df76ca316e63c0af62232cdd8b77028a86708fe4877b3ff52bec40fe3
 AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe
-AUX bash-redir-stack-overflow.patch 4245 SHA256 f7ab753242d020ae80c0485a85c14a52821fc7f6c0909616fe34fe46311aa740 SHA512 8118abfcba39c24ccf84c4edb9dca3303727c4053fbe6adb2e911a392261da25bf1f8782eacc08abd685da4e0ad3cee13465a75199ae02f4c2f10133270d8b80 WHIRLPOOL 442c4780da5cd5780e8e6bd96585b5132751508d516ae98851e87baf31d504077c3247dfb45d2e30885c889c41e728a46b256d84db044be86da7aff99a753486
 AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
 AUX bashrc 2879 SHA256 72a0b0bf010e72667c229475961f56b3684e02bcf1ccb22da63564ea16c08b54 SHA512 cb89537d4f7bc03c0e05d339f0c6c63cbd61f7963d97d0af13fe3cc2e9ac74755573d8acb28f3c6133a7cbd8f9f6c6c745e0bc215702456b2892a9438876c8a2 WHIRLPOOL 2e6ca7bcb3c2fe0923320f43094f6a11729c128a2f78ba2d51adbb07eb477d3e0573a2af844939fbc8dc1aba52eaf9dce043592a8ceb893148ec855a852e7674
 AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf
@@ -65,6 +64,7 @@ DIST bash31-017 3640 SHA256 8fb3ac54b9536ad1ba829f229f1ab906ab2af005f2bfa733f268
 DIST bash31-018 3225 SHA256 80f15b2719f3acd746edbe828f23b80116ca033b870120301256131eaa5050b3 SHA512 c2e7535178c670fd08b59db763fe84ba272e630353a6ff9da0ed22be4d449dc971f92919945444862b3b9ed9a73a636d1232f55a5cea082b85874ff47e5433de WHIRLPOOL c0e6efaf966d0f4f72cc060f1bab52acd6461d81f8049abab73a6690d0310b4a135f3404a3d0ac3c1551ca853392bd9d5862649c86509550dbe686057aaec56b
 DIST bash31-019 1115 SHA256 ee870d33d922d5050a5722470ba6a8d6560ee9b34406c6f66c25351120256410 SHA512 302e291dad01724b030c68e42edb2ca3d49c242264ce4e89652fa18d1eb4b30ede500eb2c4f4fc7237b25eda87330ee289c7f52c19ee8d4a4c782612b2175efe WHIRLPOOL 0d46625911b2bb0a472c1d0344efdfc3f281b52dc5782c1410343be9b699bae5453a7388bfdc9967d3f7ecc5e5f567ba1969e08f27a919d61d3303b7995d177b
 DIST bash31-020 6617 SHA256 459b70fec9046c63bc7be02284fdd7b39ab2c40760e1f5499c396674ae2e691b SHA512 eea4f5bc08f17784b460e124559ab87756f27bacadabf012b38db2e9ba754ebc14b027b86ec2cb51ae40443909779fc6ecdc91dad7baa9a08cb754969ab6fc3d WHIRLPOOL 9b463a4195ec695ddb87f6cbe5468c7bb6373d6370ebdb4878479cdd8bef398c2c4469cf3dc0263f78ff78dc4d71de01b817c6fc61efbf2fff009b13de512542
+DIST bash31-021 4034 SHA256 3dedc495d48d78fe7756e651fec2bc280542209d33b91b7f2e031e38a7bcdd80 SHA512 ab5243b941e14b7ce59df754b6f9ff757f8a607f819fce55906e7bb860a11874d46558dd949fa51492ef77d334533bc8175f3c2fce61731313d33a0b1d7af616 WHIRLPOOL a86d2938220448a3f9e0e97dd01a23192790b56ac5c6547343eaeefee034e059e6872b1c8da764689cb9793de13fda7268ed9204c4a4f06c8170439b06e5147a
 DIST bash32-001 1539 SHA256 beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa SHA512 14d0b34dec1b285b46bfdcdf18b98aa9412afe14dcd330a6e07d4295bda04c18251ad118b3560e2db3c981e0e32be6e20bac082bfefa071ea6e680f3d2010ffa WHIRLPOOL 5934d7d8ac9d6bac475672eee9abbd4da7cfb9baa2a45e565c43b5bfc6b98c411f5325fa9421041543d2b60626db97246195772ab5e479c620cc08e52a7adf1e
 DIST bash32-002 1524 SHA256 a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a SHA512 9b9483615a97bf3958f1efd055ecef6ee5f5e1b104d3d42a00a62c27e912aec4d3aff0b1a39de180fc20b12d2ddfbceeb595f2c3515eded40854f97ca0bfbc25 WHIRLPOOL 12a876c17e62afa67f8aeaf0001ae660ab0ceff7df1fe2f5c047cc66dcb66132d59ae2ca0f3091a120cd636c0bb3a78212bcb046867c822a06d79fb0c38fcd06
 DIST bash32-003 4599 SHA256 7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d SHA512 b489841a41789b93ef505b19da5f756a6ed981386f9ee57a94f13ed03892abb800e00eba012fb6a884d8e6b2ca7db9032069d04bb57916b062097c3a8d89ef23 WHIRLPOOL 3039e873a5cc785146832bf31a5677a70400d06553f09cdd6b39140e750dd48fdfe15d00faa35a78ab62f3daab3638ac3d464acfab6ee7ce44e8255ed19ada8e
@@ -119,6 +119,7 @@ DIST bash32-051 1371 SHA256 354886097cd95b4def77028f32ee01e2e088d58a98184fede9d3
 DIST bash32-052 3250 SHA256 a0eccf9ceda50871db10d21efdd74b99e35efbd55c970c400eeade012816bb61 SHA512 c52fa2692f264a6c49432b22cee9aaed3584f2357687028f4b96ba67104a3929b6136bb91ec64acb94fbc10c2de842372940f4ff450b9c534bdb28c627c55e66 WHIRLPOOL 685e9561e4c2559500649bdb7cdecc4b985f45f6a4bcb99d67229fe771fb2a1f4dc348045eadf478f5d627574c1f7984dde55951178331e7e8cf9a445ced7ac4
 DIST bash32-053 1115 SHA256 fe6f0e96e0b966eaed9fb5e930ca12891f4380f30f9e0a773d200ff2063a864e SHA512 46cc13432224bad89736de4543692431480505616df6240276cc37ef1ff405e99653880910b39982b2449184cd08dfbc34e17fe7e3ee506c2f2e546c4e825360 WHIRLPOOL 97e2d62126b1356f467092af8bfeba0c2fb19b502d75c7096f9131716f6c7858f5fd016cdc02763d14f693baa8f7be8ee8caac2a338a34fb993b0d9764102e9d
 DIST bash32-054 6617 SHA256 c6dab911e85688c542ce75afc175dbb4e5011de5102758e19a4a80dac1e79359 SHA512 76deccbd28e742c54b494316cf6debfa2681e9682b2cb34c9c105ee7a0a571e8e044c034f97e349b0eafdd919627c8ae2d4d26fa1100b6c9a38273d9a9e8852f WHIRLPOOL d6f80584e3a8b51304f25069506598045b14c14f9fab4d4a5c17f88768fa32ca500bfd4f9c6a5ee614d608f9dfffc23a251fe9635489d9900c47907b425f2e9e
+DIST bash32-055 4034 SHA256 c0e816700837942ed548da74e5917f74b70cbbbb10c9f2caf73e8e06a0713d0a SHA512 7be87eb61d5d619b8788d2e4298d59976aee90febf59b89dae2df1b43e85b3916c16b559b5169226dd99f1a86d1f2e01da2d682fedb78b97e8fbea58541759d8 WHIRLPOOL 4abcc5667b76135999b19f7bb6260fd19bc4bebbd8d0aa49d15470f0556b8599eda8f46d17bc91b008d9036dd3933c8a6d05b1b5ecc6af8e902c08f9f3bb3ba9
 DIST bash40-001 5156 SHA256 e3b514204e5da7bf1aecf7d0981514b2367d4b529da6d4a45d09dc29e2f0031b SHA512 2898b793404656d63739e478332789a6ba51844c3a388ca4a18e42953883065c3164cb90e525cc6ad8e59d1f47e7e8058ff7ca42194569729aebbbcb5e93dab0 WHIRLPOOL 747515eff1af46bbb1423086f4f852b93fa20963eddd1591ead15bec39f9e22e5e9db52cb6785b7afe90746a6b42c110ae0b4c3982fd0449001bad71633bc073
 DIST bash40-002 1220 SHA256 495117e566019b9cb0ab49504945b30cdda6e5b59597e43e18eae1f06b1d5cf4 SHA512 5af8cddc9ebff7433fc200780e46becca4b13a407c2b85aa08871e3a3019daab9787aeaacf4fd86ae3666119a3f35c8548ab488c72cef4fbaf991307d6bbd348 WHIRLPOOL b36c8bc8d6e7ac48029904a915a052817b3f4a2639ae93a55fee772e70b9af5e52144735a59142baee81c45d3f67fe31826513b5bdd00696fec30a1f4f926ec5
 DIST bash40-003 1749 SHA256 e300c40611b1e3775b7d1fb73bd770ad19973c22d7016d126af3304bae797bd8 SHA512 700821bfd1e890118c2c051a589911fff5ae2aae7ecf6aa6eb2da019ad45136ccc5bccf8103fc923a1b4bf0b1d2aa2e2d4e3cfc9a5cb0b5179f1221255e0de47 WHIRLPOOL bf67f7568ee25b37d663a68911033669c5013e3813ff00a926db2092517c196ef3088442e442475e5c61bf7748b0f62a2fed6be9b064b580fc4b93ccf96e6b54
@@ -160,6 +161,7 @@ DIST bash40-038 1620 SHA256 b31ea07d9ac47b261065265beb01a5420939447aa0932ff9f78b
 DIST bash40-039 3272 SHA256 09de2a4309fdcdff470754357073b6e9b1e4662add5981888acba27a53954a1e SHA512 3db7ab0fd9ab1e2fc8a4b457112053a3a04fbc2857161f765937753f75eab15595f0454bcfbf895c31774a5b5d96152b95a3d9009f53f8caa4df4854bc260769 WHIRLPOOL b0d4483ef339a8cb17a9fc65b0978890b1f96f04cc8d119963bc16b5c7b0d6a0b7f9c97566855ebd160bf6601c258a273b08f38d6a8532233956767cce5b235e
 DIST bash40-040 1173 SHA256 d71810ce346bfa8c6b77e5070e80207de4b8362678516be8febf50a7ec748039 SHA512 adcd63fd74f0d9c17cae0595bb6e8a3d678e296d5ab37b3c601af47cc64bae2c2a63367f32a9b93033423f819e0aa0fc4cbca7051003c296cf108133cef0ed92 WHIRLPOOL 1ce87e303522a56b2f2910a038f839c4c270278a09477a6dab001732b66fbf43cb1a4cb879fc911539fcd716ea9786284d1d4870baee7bc5175c72920604e885
 DIST bash40-041 6639 SHA256 9adecc88b5b3f2d87b8469d00d1b37624d38d6ca13227e787b46df723fab1c60 SHA512 bb71f3a26d6f0d099c69e3f4c5b25a4644f7c1217082fba65c999317ec5611edb8733057f973e84eb0ddfd3149cdedc1e1430f062a361523bc04a053e125de6e WHIRLPOOL 327f47ec9fb3816df7eef3d07487601a01f38b0af0aeeefe65bd9c604d693d0985f23ebba154cee3711f42b2d340432f20070e2c3a48ea0a144b8936ebe70988
+DIST bash40-042 4056 SHA256 8eccf5a7a67368c32b145d30a75aebc4530b1676f1ec300fcafb9a61e217acc6 SHA512 98bd4d05af90454b26831af690760544f3074854acf6fbecfab30258bd8aa8a010d05395867b7bb3c1bea80b3baeb6cde643c4ce99bfeaef65021ea7a088503c WHIRLPOOL d97c2ae7ce64433d8429f27e69d718fdd623a754838340fab46ea8d1e8b82ea5eb2f00eaa7f1cdce5d6b23c9465744df38e9fd9ab3378b2bad0521309c275c7c
 DIST bash41-001 1445 SHA256 a6e47fa108f853d0f0999520509c11680d37c8b7823b92b96d431766dd620278 SHA512 22ec94f2459a3bb966b16e8216a35cba0d58d532c553308191c2d9aabc2c38eedb0aa2fcf972f1f9ebd1681230a5a7d49764dd435991db69c0f025f6de9243f4 WHIRLPOOL 9ca873752e778c71aa300b51aaf0054af2b420a73060551b4709b648a4432f59399d67b2030d2132a87ed2eb39a4d9e3466f6aba51945f038139b525a954cdf3
 DIST bash41-002 1799 SHA256 322e229de186b3bd87dedabfbad8386716f103e87ff00cd1b2db844e0dff78f8 SHA512 0e0aa000db8bf56cd0948579cd96c3bc0aec4e4ec0bd129bedab57e9d7a4c54450f0e4739255c3be4bf4f4ff679eadb1ca6bff07d76a2951fb11cec20257751c WHIRLPOOL 402ab8fe47ed28f8219d0324d25d4bcd77f411c1574ca05c86b7680ee637e7471ee32d641810093099120c9a8d8030304eb9bea52dbf0aa3d4f524f0dfd87912
 DIST bash41-003 1407 SHA256 91763dddbbb98c3ff7deb3faea3b3ad6e861e7bfd2e46c045c0d1d85d1b3256d SHA512 3d8db77e8472c232cde67f6dd25409efc8ef3f40396d5bddd22b15622a55a664887d46b7bf9f4a7bcc573e8de9dccaa39575d0822b61bdae5c4e98553336aa65 WHIRLPOOL bd270f3de36ae1a39eaa61143560eece549b5b857674a889853f95d8ef495e561c97d3c32104b802116d027566f6bcdc0ee74c58320ba910def3d69250d48060
@@ -174,6 +176,7 @@ DIST bash41-011 2444 SHA256 1b2b81a20712cb56c10696a940d583ac2a01d07836f8139252e8
 DIST bash41-012 3280 SHA256 272e24a9a2802e896b20dae7c88d6a34b8dc89692c9bc90542cd4bda77607b6d SHA512 8a269842db2bcfb37b94a15cf75f0d1c357f4a451e1d69cf3dbfd71ede9eabeedfdfbfab78e67a4fc07dfd47e52100c34f5cc1d71f7e6bd3d5b27f2b3e255c5a WHIRLPOOL 6eeffda0ad369f196bb719f19c2295c06f9e1c5c5c338199839c568b1a8da44f319c5770ec3adb5cdd702affc64cf3f2046b32573bd58b7eb05132cafde7f04d
 DIST bash41-013 1181 SHA256 cad722e20534882ed6177f7287eedf21dc966816757fd964ca930f0ca230fdf8 SHA512 ae1a0c2a7efd1fa9858801b68f47bd4a2d3eb0f7a37d24029cabb97b980d40b6e116a8559c358d67ce7f8fa290cbc3b88e5c07743a78a8939a41aabd474044dd WHIRLPOOL 86ec7a12959018a6491df9b184ce322af7a2422ce24ac2b2419e1eaac8b126c1b0da9d5d5567d347f87c5d7fd9ebd2aa1ca6ff9c15c13a7cbe49efc3623f2cba
 DIST bash41-014 6672 SHA256 595d1efedea8d63e2eb426e0a800b52a5fa8b62d3d8476b912e1f0d0d7fbf13e SHA512 762e7487e9ba079c18d35dcdf3a2453b7de3ddd176986c502286544e735325ae3b6d710dacb250bece0e8a1251ccb026ddcd0f881f8a95a94d02c1be241ec572 WHIRLPOOL b80fd4f95c5fa1d81bb8072efb4e085f96044f5bca46cb0c1bc842145136d45afebca0721742d37cc793e73578490915dc319b4549ee149372769ebf75acb397
+DIST bash41-015 5085 SHA256 ec580a8e31c04db9d5e7ca279740a0565c4e32b27e87f56db2bfc21df834ce9e SHA512 3044a1acdd380f21317da0bc3b8455f7deddf464c9a70bf35e30ea434278b9b0c04756644e6037a133442b52f673757e223157b3b3301d64bacb939b4cc721a9 WHIRLPOOL 04a6467de9d962f32f5dd63943bb14cdf55c421390a658eec9f6cf19a0fb23ce931be73dcd7a3ea7fe875f32848ac6f5c5b38021d749f2d3abb9b0375245dfc6
 DIST bash42-001 2944 SHA256 8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a SHA512 931f2f1d4e677925b5057558ea6f157073a9ba87bf4ed59e7d8fe20957c5fc40f3384a98fc4a2d5d7b458129ec096d9e28a860b6844ebf15f377778a6ef8aade WHIRLPOOL 72f1c1453d00f72efe77bd31253ee6978415abb3c943e2de4ba458de09af8e9f76469febfbdda54336e4399ea0f63a2cdc93d023b09b8caa97c435e4eab27a52
 DIST bash42-002 1780 SHA256 febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9 SHA512 b9ca62e397a05b368b74920d8d1b168367ffe840cf168e312b530c5b390cef3ca53e31db63c9fe15fe1a36e4c98369bf10573db40d20712fb1a016f10e0fc893 WHIRLPOOL d0803c477e120a323e79d842269db60eca7ce0eef8e2b829926a8b337d27cead87e9f8bb26c51f8f68eacfcc280123ad4ebd654c3d6744f361a88ef5c12f2a97
 DIST bash42-003 6896 SHA256 5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd SHA512 6cf944ab0f554ab53831cbe114f771671c7a9420778d2caa524c09a24ec8064e7a7ef1355e66ed3a53100b72736284a5b44e2c6bda03a8234a2f2d340ed47ce4 WHIRLPOOL 8ff610b9bf6f81eb7ea68691c6d2bcfdcdc6ae2a5ed503306f4b5cac1f020c59901c3c3a35a6206934407d65be58db60fd2c0e74497a0fd30fc87822e8fbf36f
@@ -224,6 +227,7 @@ DIST bash42-047 1353 SHA256 c1979201d0345011c419a1c82407cd2a00c60a0c75b7f07e145d
 DIST bash42-048 3258 SHA256 751a5d2330b21ac9aba7323acbbc91c948285f30a4bb41f56796f9a36b983d24 SHA512 4218377052da8900ab6d49b855ae6f7779ad94e9e76daf3424240fbbb1bab37b929989b976ecc3ccbfb66f3c278a7ba546e5d34b214382b41767991945d960b4 WHIRLPOOL 16da3dfb42b1cbb50841e381428135a9d0439d30c519725bd52bf55093c618b7ca8983b4638749dc87d5893a20b4cc5546c1ef5141f62d78fad8ccd5b4261fe7
 DIST bash42-049 1159 SHA256 901cd74cdd9f3e9bb5cc907d563e3d4dcdf9d5f6a751e85b706a958f51bc510e SHA512 a0472af2c3bb30fb3ebf0217b34261aa586314a05fc19c959b4931dcd064e0a6a8b4e37f8b4a9dd13d8fff38822e32e12fb28f4fcb73b0f6dcf42827fa5aba05 WHIRLPOOL a34df0a257a3db06b887abbda2afa823b471e1ba705318822e98d4740ce41fe906edf2d91602bcbbf97f1202067086b33217824af7cf8f2f71c58fb4d6fd65eb
 DIST bash42-050 6650 SHA256 1a19b84455e83b46fcaa27759a5dd643dde2e11ceacd1e84e351970ea04d8ba6 SHA512 317a5f90d909a5db697025894b50f35f26f8293b3ce1ad9b8e9dc6d0661f277659c8cc0a70a113d3889b2de6e932e5af5ba89a427f32879c69d4e3db24e6a2a8 WHIRLPOOL 2d77d23cd0e2baa59f8024e3e09f9db48f0ab999157d9c6911c4893abcf6a3e320f8f1614049ebf2b7b9ff5da57041ef1fd1b873746a940cf720ca947ad75d43
+DIST bash42-051 5063 SHA256 3e15347bc23a116b8ee898acec9d0ac744612ce9bbc0096fff47c4cf1149051c SHA512 de9d35fae23b9c7782139b9812460a602252675a9db556d7e38e8c15ae914db0e4a1f2e06db909e249a36f33ca1f04aed25fc8e036d9b1fc6ab58d8148524e2a WHIRLPOOL 8a61a34206d97e087a298dabe5b6347eaf22e846bdfebedfed1c534063e7b78f9e2a6a68de330f6069aeb736444ec50bcad105c683ecefc64f288abbe8a44b96
 DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9
 DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc
 DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32
@@ -251,29 +255,34 @@ DIST bash43-024 1909 SHA256 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e
 DIST bash43-025 3940 SHA256 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822 WHIRLPOOL b3385e49dfbbf156bea9ebbd10f18dcb88c1d489c61c5bd6c16d1caac8a2ebf1ce057ec350d661ebd0307330a61f8c1088bef1cb133368919ccd0b5e81c3e7e3
 DIST bash43-026 1575 SHA256 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897 WHIRLPOOL 3c21e3b21f1967d85b49386c05945859ee0fab2bbe0062052319876bbe3283bf3a7b50a9e160e36e9ee96fbe79ac13c90d86ffb4157ef0cb0641acd9dafb917e
 DIST bash43-027 6889 SHA256 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3 WHIRLPOOL 241a77807f142765fac71490987bd62a93bbd57c6ad2f83fbc645bf0618286fbfc3cd269eadf99e7f973a9e88ac08c5065868f8ad38727c17bb6056cedc83888
-EBUILD bash-3.1_p19.ebuild 4464 SHA256 1d3a34fa08110f3a04127efa869963a65a60b15429fd656f01a270ea218eeb0e SHA512 cc0effcc54a204b644d1485df8ddbabd98462c0c0dd1ac71fa8a0c7eefc09f8dfb74cee44a965dd6eee0c99a3937638a72f7db0b57eb609f3e79f214664b4319 WHIRLPOOL 1271a6495f07a138ff9e55cc66615221fc95e33ec08aa11bffff95dd9705a786cf5fc0f39dc738a7a169daa60d15f058877b938e3b1bb3fe1a5898ad621df2f1
+DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88 WHIRLPOOL f01e8fe2c09a7bdefacd7114cc8377f7ccd65de6c3bafac05595f1400f330ba0ba63ce97fe7b9b49957639c75438bb5ceb853890094cb0c4e43fadc1795b89b6
 EBUILD bash-3.1_p20.ebuild 4459 SHA256 667518475167fd6f4db398e62525896cf1c188985c11cf13c4a60b51377f6ef7 SHA512 f69bd53a28a89f8e153ccc3c377aa9e0543ab45f778812c41e721d04bdd2f6b03f4eb9f5c6a4e1dc711872c2f475ce96231bc78f97c278a7e77c825c4c35b277 WHIRLPOOL 14599f70c422a0603dbcc030adc9c2824b99a841933ef2c43b14a7c23e971532a05ce210ec6b0aa02d0973358b80ec120a74978c30653299a157b2f1f8ece6b1
-EBUILD bash-3.2_p53.ebuild 4641 SHA256 71f00d60bcb3bf6285f63957e91a131af5696c767cce616651f3e8d75e8f3b20 SHA512 c371746bd266199522f6b46c70c2a861171610c27af67b04b9334f6f4d2734ae9413f525aa7ceaf0592f79684c81998cff7fb53c8baae3cad9356307a7cd296d WHIRLPOOL e80a9b25fc182221f3102cb8c9e982f29e0454bb71410e08dc208060ffcbc10c8d9580e3e107e1c78f15dc795532d5c040c3e8ea2e769a80fa077b48869e8b30
+EBUILD bash-3.1_p21.ebuild 4477 SHA256 bca0ab67bd7f66538dcdf108a1647b52bdb00eefd7a0c96c7e4197c2d2e4217c SHA512 0bf38abe22ac5029d32756a49f5094b1e36d41b68280d6f1c2912e18905f63ae3d064457dfe0f9c95e4650bb848e0ff5681953b22949cfd197930de1f6d2522e WHIRLPOOL fb24e77fbc7c9b096b5b4e222375c1a109ac31394916268b87e5f07e880e58b390a8e1c060e7fbf924e2b877767f117fc4a70f4917ef7d65cca0a288bdc962f7
 EBUILD bash-3.2_p54.ebuild 4636 SHA256 0271aa0b50df112e805ed0ff4a4662def349650ad35ebad5b27ab9cee2b1e040 SHA512 dd8238efe2e385d17bc812a4c793c697403e95b7008ee3b1c572b5bc54f32618cabf2974b610e032b3c7f0904fc9207741789e46715160f9083739b411ce070b WHIRLPOOL 058570250fd12c4b9e372c3bc190b978dbc3ecf17f5d8c8f43dce36bc2da19aaac8a901953c90b4dcef7e025fa2650533114d2e9b5cbbfd28a70dd4a75d30ce3
-EBUILD bash-4.0_p40.ebuild 4470 SHA256 2602e3ca6c7cfd9d17b23ca6aaf131573125f8d75c8ba8b96079b8dd3b146ec7 SHA512 8b91f4ec2acd1fa424afd285a02caaecd2ec9433e39fc4181cbedc6ce5b4fbc31cc2cd7d2e3398d07c9d4abba4ce5080334458ecc7e78c1adeda7a8207b65818 WHIRLPOOL ca5091c213762abfe1a624c3f0db4f36501eaea8b6f74fc95a624de1bc2f6e56c6ad4ea74ddd9cb1efbb74431260c30d74f898130d7c6c775e91d8c63df00b5f
+EBUILD bash-3.2_p55.ebuild 4654 SHA256 24011ca71d766bef6e8e6832d68935a2c7681e7c713edf65ac49a2e5bed8779f SHA512 f9e56b66971ad5c9f4f6d7e59c8880c2071dd66af61d154204d78a0f6b05a91b9501e8f7e6ce1dcbe2398fc899643771d217ed2450ffaa3ae375384e4afca6ba WHIRLPOOL 03c1ac784d2cb6d13b5038439702c4d466478d571d73733dbb22ef92c623d5dc7f289b46c73fce1b34e4e14e9ff2f8dcb77fb2632660d16379c82ce79b0a9136
 EBUILD bash-4.0_p41.ebuild 4465 SHA256 28f485e25a1fc56e2759b010660fbe9a7b19392c7067b2519b27bb47d2b13f7b SHA512 06a23afcbf108d63513def3ce04c6cfecea4eca41070f3deeb51f33fb007e99c9154ff8c0045965a85cada613e6470dad5488882d40d24f4962545db4fb582c2 WHIRLPOOL b2e4a12b1f4c5ba6ef8106009b9827ac7c10b613d8c022f0df72a77ef92f39b6367eb5e956d4646da486ae4a949695cfc3e506cda538c11cab07691bd91265eb
-EBUILD bash-4.1_p13.ebuild 4205 SHA256 aed4836dbfc95f07c64812ffa66f9e3172ca51e8d05dfc2d39b703783fbf5d59 SHA512 e86782a05fd215204e669af2f6fe004f8406915312a696fed9105918e192e4ccce10f1fc57ec84237da92cdffb64f27b27dd0063453b51aff2162c42cfd05ad7 WHIRLPOOL 7469a24e126c332018fff9e630632fe6fa2cb7ed6ebadf69a57b87a7c00da5509b98170ca6d2b609765bf745232b204d4c4c51076ad88caf2aeffa8539efbf77
-EBUILD bash-4.1_p14-r1.ebuild 4266 SHA256 43b6bf6cc96c3e28a31749a128e5ae7e3476a5ee8aed0e4505b770983d11db17 SHA512 b14c543f23efe76c673472319481a6bdb44f819d39d6127ab65ad4bcfdfb539a8bebde61d51acc34b2c98edc8c4dff089e2b670e653cba0f73b01c208fcb1c6e WHIRLPOOL 849357c45b928e3873e578b5aa4c7b848a95d74dcc75babc16372803e7c8f8402045590459859a14904671343f62f30a9b27fe2b0438ba2a67ecff56af39616d
+EBUILD bash-4.0_p42.ebuild 4483 SHA256 7a9395c30aa9c664ddf7943c15748bf8fb3a0311a9ff76a5053f5d19462e301c SHA512 9121e6816493eca7125a2ef5fdec1454c3c86a7f3d7aa91d426bb6e35ebea957765df3a5926d798d774648f203e0e1d1a942cdc7ee5752b2da34c8ed4d53e689 WHIRLPOOL e730df16512b85b94eda0d9800fd1f36ca50c112991f1b44076f506650e3194a1725bf7ce7333dbdd91dec0ae3aa37f0483b2ed8538a8fb2cc67a75d01399365
 EBUILD bash-4.1_p14.ebuild 4200 SHA256 ce1373fdd06f932fe702c803c3adc8eeadcda05f5597cc97c14aac426d4e244b SHA512 8c914ed5692f80e7d441c01afc66dd36399998746e0a51d03d5bdb95940d65d109f59fab39b0784265d66ef064348b7aeaf6218aebe9021d962abf90a536d079 WHIRLPOOL 80c308b01b91f3e71d6f013f60645b1df81e963662f6a6f3c812727a93a35b8c9fc1c8e49afdaef320e1a300971e7cbe4cf80180a26553ad4587b47c48b40d4b
-EBUILD bash-4.2_p49.ebuild 6634 SHA256 794c15597b063c69fb0f508f6979fe0ef8fff7c50192afef2065aad3e2d41210 SHA512 96d1e6ca2d65cd1d5861fb0c0842d69cad96b606a593735dbd7fec59a2d6ce9959dc33de69f098fde8af7ea3178a931c8ebceec49e372b0dc0fd89fe566df15a WHIRLPOOL a6f88cc298457b49399da00b73b8947d87d626a79c516f0903b41f54a243ff254f74b17d2167c7dd73820732f16d730fb4010d7eb78a249187635a3a1a0c5b50
-EBUILD bash-4.2_p50-r1.ebuild 6699 SHA256 7580f10a24ed971de25338bc3425c2c477f49bfc650df06ee6d134c56f56522e SHA512 e19279aad39b183981c7907b455f4146967dc31a390169cb64abd31ac70ffd58239099090089536c34d0a3fe09ba7d09cf7828e81d1f4694dc4e6199a0613262 WHIRLPOOL a19f734ba833c0c3229f49fb38cb4c1b8f3d38283df5d8d1aec882395f8c2af26ddb3961d1ec69f72adf88d9409c44784eef6db43d97a3cc305ad1c045520feb
+EBUILD bash-4.1_p15.ebuild 4209 SHA256 3aa856439fc8536f2abafc2994103596f4ce1e0165c70dfaaa0a04675df52d94 SHA512 6005bc8bc543e4f3790a23a26950cd642153f5eadbcee861e479223d35c1865c49cded0ba23d58c4e3498134bfb0a589eecd0075b061be709d63d5c9b16d3cbf WHIRLPOOL c04941b83bc6913ce050ad78b55a88007f81450e2f15f9c3c1586a8bdcf576fb81eadefa712d01174d00c542660612e962eb160d78c787a0e2b039d3f4dfc38c
 EBUILD bash-4.2_p50.ebuild 6629 SHA256 a5f350689f5071594ffd57652a739a8e5669c4abe0cd3ab21c5b3352079792b2 SHA512 8a1aacb586a55a2e03042909ec6efacdcd88240e32724c09674c2e430389f424cfc330558cdbc3db95fa4d2bb04c7ec8c02feff70bff1c475540c17201766fcc WHIRLPOOL 8bb1adc92885d17c62609cdb0e141e89aee9a2b6cda32a5c0425653ce422c045201e67c8ff7a1d226a540f3ce83c5887144dba1240cca959938c538d1051af52
-EBUILD bash-4.3_p27-r1.ebuild 7228 SHA256 054e2a09e8af82bf26cc7dded436e32f90d05f9ff8406bab3e5cb44ee0f250c6 SHA512 da57c7465a55aee59351bfd23e1b97a5a927807fa0d59d6e6b1d8b8b6d3f01c6d3f0337797f34435e7479bc332db341bcf0e6637b4d9a9346a16e90d6590c70a WHIRLPOOL d20e01afc9d692cf305c15ff915bf6a4fa4a77539047d7cdd359111f21c569421994c33e6373d6cdca556928a6cf652c8ab5828f5c03166f48e876c2a5f99bd7
-MISC ChangeLog 66331 SHA256 75b6ecad9f70c8ab26ef6078d9193837f3635e57e7a2a7505a5f35c49f29ede2 SHA512 e394b747a4a684d5ce9c42fa4966834e62c2c50b5537803c6e55f2a3128013e18db0c653b65449bd5085ff1d0429d5bdf1621f829983d471e718070320eb4539 WHIRLPOOL 2b31d5cde0ca5cb94721ff4a9b899c9b5e3c7b8db00ac470cc6508a29e8ebe12ba9665823e0cd341ee446cbe0532855589c6be62335c0c10d3a569c24493bf3f
+EBUILD bash-4.2_p51.ebuild 6637 SHA256 0f166a2571fd599343ac196e3c025c79aa164d131fc5a56058b34d43d78b97ad SHA512 eccb00344c8a58f7259da96422d04ea75a473f4c4e5f4fec1a593e1fba5b00e106c3ceeaba6376322bcfe2563063fc436d1a538954e9b34d3580127a71dd19db WHIRLPOOL ab3a5acf059468925c31100fd274868c1450dfbbd657e4822edf7f7ef251f7d697f6e748f460e3ec2104eca30018542f6ad29e01d74e5fdaf055c8f4a595c2cc
+EBUILD bash-4.3_p28.ebuild 7162 SHA256 66ececdc33555ee56077d5823838dbe0d5f5bb6813bd69b05522b91ccdbec5ee SHA512 174ccede20f00fdb35cf4bfc3b3976a04513b3c43b1d7afb844c253d73223e0db675b55fa211144e94b1da3aa0669007c4d8020cf2c9255b222903546ec6e9b4 WHIRLPOOL 2fc987b54a96df237d16075e945ab5b526dea7d2e5a270fd0ca64d2d901a6630c387f7510d07e555a483cc957156b83091125a4532cfb87ae97313d5e7f2ce24
+MISC ChangeLog 67086 SHA256 006f65f8a7f032a3ae5c2b5d66ab4c6f5811e2d6cca57f1b6ae8ce258f6be75a SHA512 ee9193ec41b0d3d8d5f8b7d3881cd0a6df61861392589fb343506dd589a6b18d9418a45deaa8c4825a2869aaa0c33b7116869641b80800864e75e27328c4f0e1 WHIRLPOOL d50c7b936ae517dcee949cf478cd731f453bba3f959175780dd5628566d711059f01986eb002b699b7f1c2da4873867d04e66c755aed903dbcb02b88f4f77b3c
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULC6+AAoJECo/aRed9267c2MH/idu5Tryzb3IlHc10D1gw31+
-UmkfzCIV5BRY8rFeKC2ZvnffulijMSOXEjSFuFx9PqAH6N9kwL8Td4Te3TVhpMIl
-MeEcN7z9IqwDk+x3JMhKstnt2NhwPBisiRnyvhJ8kXKwMhRzcJ2yWBp0oUeNOvJG
-RTOB3isA4ttIUetRxdmoulf2EO3kEu/3cnteIomW1DKf+kJqWLg5JAAHDhzYGKoe
-oChRqe0mgkpvexTsTFTe++xC3oJcaIX2LTy0orkfi9rp2wap2GPoilkua19y7w5E
-5gXrnDFi0QM10QbDqX+AYTnSFvXcB8ttVbbnjeaklUsA9RhnW5qWUyD34P1VZJA=
-=3ss0
+iQIcBAEBCAAGBQJULGheAAoJEPiazRVxLXTFdnsQAMGmzH2bRW8QWZ5k3I36WOM2
+89l4OJt/BT0wrTa2J3N0bcLKyVYHh7EvIjKJOHH5JJIuukabuhDER/EYdZLunRaU
+YNTnyVWtWwLm3JZrQdkwachC2Z/VqHICqJL1vByZf9gncJHf38JqS26gkVpyy+T5
+KleZk260ar3ELOBkgpUJsTt/aG+gCo/TQcM6/FtYgfx5vzo/Bp6AseGikwkHzrY9
+f92is2ixdv8v0ystmVXIEEHWnMKOrFx0Dy2QD0aqXoOP3sAlGrO0Iv5mWsjBLZxp
+ULmkR8CBwN+nNS25FgtHCU7CaoTdXatPEZpVqD//GSldDe/MmcEixB3jlQKXv7JA
+ePmbdvaBRBof5jEnh7FmX7jknLWlIOKq99Cj5TelD/gLxKQclJEYx65iS0F2eiO6
+I3Q0df+Xt7aEt/2g32BhD/+JNT5cyAlwXqb2hKW4SuMuh1Z475J/PV8Ra+Tzm5Z+
+Y9xSZtw2DDjzOgxvA6LzRD2uZCreCfZ7G0Tw+o/wENN/xYhsCzkA90D9Zt5/NUWj
+fpVh9mybaH3oJDBTBh/Zx608SHvGTl7msXxz186QJ6/L95WBUl/DspgiSKhw5N/K
+BkYNoW9zRV0BZMIMSurZptKylVvSE+4udsAqzoi5J6hnN3hW3Ym2x7N0t4t8rPgp
+JlGVkptnmdMnyO5AlYzu
+=jZvs
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p19.ebuild b/app-shells/bash/bash-3.1_p21.ebuild
index 2614883b6c34..2210b80f3b82 100644
--- a/app-shells/bash/bash-3.1_p19.ebuild
+++ b/app-shells/bash/bash-3.1_p21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p19.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p21.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="afs +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/bash/bash-3.2_p53.ebuild b/app-shells/bash/bash-3.2_p55.ebuild
index eda678b7db43..09c04b7f3893 100644
--- a/app-shells/bash/bash-3.2_p53.ebuild
+++ b/app-shells/bash/bash-3.2_p55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p53.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p55.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-2"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="afs +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/bash/bash-4.0_p40.ebuild b/app-shells/bash/bash-4.0_p42.ebuild
index 507cd04d2971..3695b2fa9fc8 100644
--- a/app-shells/bash/bash-4.0_p40.ebuild
+++ b/app-shells/bash/bash-4.0_p42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p40.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p42.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="afs mem-scramble +net nls +readline"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/bash/bash-4.1_p13.ebuild b/app-shells/bash/bash-4.1_p13.ebuild
deleted file mode 100644
index 90a13f733db6..000000000000
--- a/app-shells/bash/bash-4.1_p13.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p13.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="${MY_PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="afs mem-scramble +net nls +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-6.2 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
-	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
-	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	myconf+=( --without-lispdir ) #335896
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=6.2
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	into /
-	newbin bash bash-${SLOT}
-
-	newman doc/bash.1 bash-${SLOT}.1
-	newman doc/builtins.1 builtins-${SLOT}.1
-
-	insinto /usr/share/info
-	newins doc/bashref.info bash-${SLOT}.info
-	dosym bash-${SLOT}.info /usr/share/info/bashref-${SLOT}.info
-
-	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-}
diff --git a/app-shells/bash/bash-4.1_p14-r1.ebuild b/app-shells/bash/bash-4.1_p15.ebuild
index 6a2d1dddd2d3..dda5157787ad 100644
--- a/app-shells/bash/bash-4.1_p14-r1.ebuild
+++ b/app-shells/bash/bash-4.1_p15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p14-r1.ebuild,v 1.3 2014/10/01 16:06:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1_p15.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -68,7 +68,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
 	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
 	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-redir-stack-overflow.patch #523742
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-4.2_p49.ebuild b/app-shells/bash/bash-4.2_p49.ebuild
deleted file mode 100644
index b1fcd7a04653..000000000000
--- a/app-shells/bash/bash-4.2_p49.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p49.ebuild,v 1.1 2014/09/27 05:12:25 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-6.2 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!!<sys-apps/portage-2.1.6.7_p1
-	!!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
-	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
-	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
-	epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=6.2
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h examples/loadables/*.h include/*.h \
-			lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]]; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]]; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.2_p50-r1.ebuild b/app-shells/bash/bash-4.2_p51.ebuild
index 2fb445c15e44..fc436f62fd4b 100644
--- a/app-shells/bash/bash-4.2_p50-r1.ebuild
+++ b/app-shells/bash/bash-4.2_p51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p50-r1.ebuild,v 1.4 2014/10/01 16:41:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p51.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -84,7 +84,6 @@ src_prepare() {
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
 	fi
-	epatch "${FILESDIR}"/${PN}-redir-stack-overflow.patch #523742
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-4.3_p27-r1.ebuild b/app-shells/bash/bash-4.3_p28.ebuild
index 5eba1e2235c6..9aa813e4ce56 100644
--- a/app-shells/bash/bash-4.3_p27-r1.ebuild
+++ b/app-shells/bash/bash-4.3_p28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p27-r1.ebuild,v 1.1 2014/09/30 20:34:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p28.ebuild,v 1.1 2014/10/01 20:47:24 polynomial-c Exp $
 
 EAPI="4"
 
@@ -87,7 +87,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.3-parse-time-keyword.patch
 	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
 	epatch "${FILESDIR}"/${PN}-4.3-term-cleanup.patch
-	epatch "${FILESDIR}"/${PN}-redir-stack-overflow.patch #523742
 
 	epatch_user
 }
diff --git a/app-shells/bash/files/bash-redir-stack-overflow.patch b/app-shells/bash/files/bash-redir-stack-overflow.patch
deleted file mode 100644
index feba2cea5769..000000000000
--- a/app-shells/bash/files/bash-redir-stack-overflow.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-*** ../bash-20140912/parse.y	2014-08-26 15:09:42.000000000 -0400
---- parse.y	2014-09-25 19:16:40.000000000 -0400
-***************
-*** 169,172 ****
---- 169,175 ----
-  static int reserved_word_acceptable __P((int));
-  static int yylex __P((void));
-+ 
-+ static void push_heredoc __P((REDIRECT *));
-+ static char *mk_alexpansion __P((char *));
-  static int alias_expand_token __P((char *));
-  static int time_command_acceptable __P((void));
-***************
-*** 266,270 ****
-  /* Variables to manage the task of reading here documents, because we need to
-     defer the reading until after a complete command has been collected. */
-! static REDIRECT *redir_stack[10];
-  int need_here_doc;
-  
---- 269,275 ----
-  /* Variables to manage the task of reading here documents, because we need to
-     defer the reading until after a complete command has been collected. */
-! #define HEREDOC_MAX 16
-! 
-! static REDIRECT *redir_stack[HEREDOC_MAX];
-  int need_here_doc;
-  
-***************
-*** 308,312 ****
-     index is decremented after a case, select, or for command is parsed. */
-  #define MAX_CASE_NEST	128
-! static int word_lineno[MAX_CASE_NEST];
-  static int word_top = -1;
-  
---- 313,317 ----
-     index is decremented after a case, select, or for command is parsed. */
-  #define MAX_CASE_NEST	128
-! static int word_lineno[MAX_CASE_NEST+1];
-  static int word_top = -1;
-  
-***************
-*** 521,525 ****
-  			  redir.filename = $2;
-  			  $$ = make_redirection (source, r_reading_until, redir, 0);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	NUMBER LESS_LESS WORD
---- 526,530 ----
-  			  redir.filename = $2;
-  			  $$ = make_redirection (source, r_reading_until, redir, 0);
-! 			  push_heredoc ($$);
-  			}
-  	|	NUMBER LESS_LESS WORD
-***************
-*** 528,532 ****
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_reading_until, redir, 0);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	REDIR_WORD LESS_LESS WORD
---- 533,537 ----
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_reading_until, redir, 0);
-! 			  push_heredoc ($$);
-  			}
-  	|	REDIR_WORD LESS_LESS WORD
-***************
-*** 535,539 ****
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	LESS_LESS_MINUS WORD
---- 540,544 ----
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-! 			  push_heredoc ($$);
-  			}
-  	|	LESS_LESS_MINUS WORD
-***************
-*** 542,546 ****
-  			  redir.filename = $2;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	NUMBER LESS_LESS_MINUS WORD
---- 547,551 ----
-  			  redir.filename = $2;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! 			  push_heredoc ($$);
-  			}
-  	|	NUMBER LESS_LESS_MINUS WORD
-***************
-*** 549,553 ****
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	REDIR_WORD  LESS_LESS_MINUS WORD
---- 554,558 ----
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-! 			  push_heredoc ($$);
-  			}
-  	|	REDIR_WORD  LESS_LESS_MINUS WORD
-***************
-*** 556,560 ****
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! 			  redir_stack[need_here_doc++] = $$;
-  			}
-  	|	LESS_LESS_LESS WORD
---- 561,565 ----
-  			  redir.filename = $3;
-  			  $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-! 			  push_heredoc ($$);
-  			}
-  	|	LESS_LESS_LESS WORD
-***************
-*** 2637,2640 ****
---- 2642,2660 ----
-  static int esacs_needed_count;
-  
-+ static void
-+ push_heredoc (r)
-+      REDIRECT *r;
-+ {
-+   if (need_here_doc >= HEREDOC_MAX)
-+     {
-+       last_command_exit_value = EX_BADUSAGE;
-+       need_here_doc = 0;
-+       report_syntax_error (_("maximum here-document count exceeded"));
-+       reset_parser ();
-+       exit_shell (last_command_exit_value);
-+     }
-+   redir_stack[need_here_doc++] = r;
-+ }
-+ 
-  void
-  gather_here_documents ()