Fix from upstream for crash when exiting the shell.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 42 insertions, 17 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 282247583d07..2e8af4f7fb06 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.357 2014/03/20 19:45:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.358 2014/03/28 02:10:54 vapier Exp $
+
+*bash-4.3-r3 (28 Mar 2014)
+
+  28 Mar 2014; Mike Frysinger <vapier@gentoo.org> +bash-4.3-r3.ebuild,
+  +files/bash-4.3-input-line-realloc.patch, -bash-4.3-r2.ebuild:
+  Fix from upstream for crash when exiting the shell.
 
 *bash-4.3-r2 (20 Mar 2014)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 8a7aa9b23b53..638a4db4932e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -31,6 +31,7 @@ AUX bash-4.2-speed-up-read-N.patch 2858 SHA256 8547d32535ed4e2fe5cb7b3503e6044c3
 AUX bash-4.3-compound-array-empty-value.patch 382 SHA256 dd871c27f2ab651259c2fae3f3a000ddebb7be1d6678425b45ccb52a99222281 SHA512 94ad5501d7a68d9cc3453cfde59b9989f89d2eb1538fdf146c4780e68e4e840356082515d54181e3f35ab183b4869c5ac428be861c8cfa3081dfd1ba0ee7cd6a WHIRLPOOL e44eb362b509ffc034462d2fd5d283e2f722f5a6974c8a838821b00c52d684c4ffaef5b7e23b407fda9c3b537dff35e00c50f16b9828efe2e0e99ffb1acf9459
 AUX bash-4.3-debug-trap.patch 770 SHA256 546af48fd2ca99a83e82fd517283e3605fee8b622eb3626ca01e7cf84fe228f9 SHA512 012940721baa35f236e5e5db3c01be7b70df5fc1203ea454d623736032fade04a3b495c967cd76be184dda749ab6b98d861c0ab3b1f92ce22993385cbb5149c1 WHIRLPOOL 63bbb66fd7be6ca14519522f838d7a4fef2aa288dcaba722053f01cd88c4cd6571c731a275ae72c138ed0d761b4c5e2db89b8f7e517d90f80ba39646811d1fef
 AUX bash-4.3-extglob-skipname.patch 3665 SHA256 1ffcb7bc332a86af10352fffa707b6cc47fdecbf61abbe02919cba74f3b8d232 SHA512 321108847830c778a66cd2f4b1598aed28648f5f3ceef3b7c61b2e07966712228a629a71a4f7770caeb3376555ad156bfadbd2cc42c1cdd17283969b971d9284 WHIRLPOOL 3a5980d9612bfbdcce58e9fdee6dfb87e2fe87cf5bb3ecef03f2bb07fa428af751ac47af556733e677cf70f3d38dee947dc2fb8adf84c3f91fb0e428e3ddd718
+AUX bash-4.3-input-line-realloc.patch 743 SHA256 372fb807ae5fbf32ab3645a8a2052ffdea558a0b1dc8da08235b27629e6cc77e SHA512 dfcf3194e3453dd37db4c8ca1cd139a0ea1a6f9cd8f679bf7d358a1f91d7ff8dc4eb277c57ef9b73ed324efbf01487bd5ce65895a2e13e02c837fdd386f7db88 WHIRLPOOL 26535b5ddef012c0cad832efbfa259bf327a5d237276307286d67bab3645e1640e8c75e683fd2545b410882e98ec35f47128fff990ed8312a4ec195505598a88
 AUX bash-4.3-jobs-exit.patch 534 SHA256 5623ca32a1738503c3290ab2e8321007a272dff3bc4fee6e4675d6a667d61515 SHA512 7ea8cf2d1d348db8cdfaaa5160a8d9042c90ec1f0d65a912aec9f929c46e033ba0aa0f36331115795c8b2d354b368e777cce4cc23b643d1497a4fee9532f45b2 WHIRLPOOL 3011b6a57580014e248553e2f00e33887d8cfcc3711bc21bae4feccd1fd9b6c53257b7c38ebe7cf1ea71c4ab119e88bfc67c11556b5bff321a0fdd34e03c5eeb
 AUX bash-4.3-parse-ansi-expand.patch 919 SHA256 29b743a49020842ca5b250bcd8a82c60a5e0d9abcc1291a00d6dbd833554ee50 SHA512 0724f29c97c1c7060461a4cd8d60f6fac95e40a27d56223f2b3ed2d093c270cfb1e7ae4bc91e53f85cc5ca401118274c65a317ed5301947626ba88e2769c51e6 WHIRLPOOL efa6961d3798e58a2af7a854fb211c40f7df82b94abbe45eb202a856bfd943198e95fc9a6a8e9fc00a9e2236729f4514a2d49a33b5663f51986c104f0e47f849
 AUX bash-4.3-pcomplete-dequote.patch 1824 SHA256 99076a839ad00cf131138693a97f4e0ac35820ed2f6f0d2a2e187cf8d099d7a0 SHA512 91b179a2d287ba3ae5f8ea573b3a3ec80e38efda4fe40bb98a0a810303ac2f248e17d636749da247efdc999b4a82455105ee4d85efa5d201d0ead9f6b0b38442 WHIRLPOOL e9091cbe8a11fc6fc49268e18ea76efbd834fb7d39032b4de4a9697d09f91c34572072c4249ac297b314fffbd3b357e809dabb329c63106798af61022fc1f0e5
@@ -214,23 +215,23 @@ EBUILD bash-4.0_p38.ebuild 4464 SHA256 d6aa599f3e77808c09095c892c684a5a589fa7db9
 EBUILD bash-4.1_p11.ebuild 4199 SHA256 b6163a5d4aef950e3b5dad8c2590323549072b9f8819a939eda692fefccfb38c SHA512 06b47daa5e875b03408f2acc8108d52275a4e4681a0f88b9bd89ee43fb6db3d963b54086d0039c4bae90916b5b059bfdb53288877ffe3d08a0d4a91bcde634e5 WHIRLPOOL bf23eed9aba5773e423171c89ebeff05106864a4a3507ed186d1cbfd8fe982fc53e081b389937aaa7d6ee6ea54a98ecfc618a6fe67170ac9600573054bee3a8f
 EBUILD bash-4.2_p45-r1.ebuild 6627 SHA256 4279e47b504a597dd6be4ecb6eef33c7909c8f6d226117dd0565f0d0835b7914 SHA512 76cef739863b630608ac416037d4ae273b1ee9eaeb5c65e1f5b9ea9c4d987460d9406ead515a5d85f87175b866ef194c839d1341b3cb3615b276c45cbdefec2f WHIRLPOOL 554c2b95883066936dab181f5540cfdae5f4c197bd37b34ff0a8be60398ef8e5285041e813d669cc5b4140aebf622441a35c86e0daa98d07c35bd5a332cbb211
 EBUILD bash-4.2_p45.ebuild 6525 SHA256 784442914f6f6740031598a0cf1baaec087d973e6460d76a32baa120a2794b8e SHA512 8b6c57dead7a18b429632694e5d1e35791b262cd09c3d49919287c2b07ab9e524b9a758e247a8d2706ddfae2576d19e535c9467b7ef99ed08ddb041ef60025da WHIRLPOOL 55954d5cb13b064f89305af8c5de0c7f84714afb08c0f07bf4703ef62860cf08f9e9f38ba60a4e891d5cb0f26f0e46d26e2eea553b0785bc9e82d790b6c4d111
-EBUILD bash-4.3-r2.ebuild 6977 SHA256 919d9701f3872c5aacb563b21366dafb2102d2056822c3c1e908809d25157b64 SHA512 b1374dbafd6c679be8b11f6904c3c84e270ab5c7a6a1036cff30093554ed4ebe902298c0e3b32cda1d905baaf9b537cc3428d9794645abebc274870123fb72e1 WHIRLPOOL d91b33eaa491ecd0768c7ea32fb7bbbf047bb9f0fdb141028d7acd072fed273e207dabbc1fa3a69531867f6622d3c97a50a70fabaaeb243fd17098b16e7512e3
-MISC ChangeLog 54876 SHA256 da005e4dddceb90406cab9bba0b6cda9fa20e36b237ac117bd54fdbde63f045e SHA512 560abc4e1753b2eb66c3edb12d28025fbe9b76627156eca4f5d125ea36b602548c4137ef320bcd829f4fed12a56aca983997c36f84f4f91a8627c9926ba97a18 WHIRLPOOL ed18627eec44938e81d7b8c52807041f1282dead12b2d548822f50fb443918136b5adc556f6089912ddf0afefb696cd19d193c794376e6122ec8872cf4b34a21
+EBUILD bash-4.3-r3.ebuild 7029 SHA256 886e5f96633e367c9d2d33192e1affe340ee14c59715677f0774072da12abc40 SHA512 2627f1b5fb4e28022bdbacd771c43f90fd4301264b5324911612f8beeb58af1d482b2c6c0e04f9034c1baa3bcbd4429bfa05d029158f633054f42362999aa1b2 WHIRLPOOL 82d9337c1a2bd9244d90fb6db2b2095ad175ef99db49012044a2804d2addc02a6336d6da664a4ff0596e5b7b2821ec320d99f7dce5954ccd67fdcad81cc82153
+MISC ChangeLog 55095 SHA256 8bbb2a1e61665ba874739aef26806c7430ca85247bcb50323b828452f657553b SHA512 348083b30c5ae568f38e95e3b0374fbaa9424a9edde373ea483791c9e201e61711e5fae1140a18850d6a09c684ae9b02f485bc4da5415bc47c96f050c77e24bf WHIRLPOOL 9b80ff868d29a951d07f4527d2f6f34074499e353053d21eae1f3bd864af9a677c39cf095ba74099f9e84f004bd2d5b7c607af31085427f920bf5c2615c18a12
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK0VlAAoJEPGu1DbS6WIAF0wP/igr2lEG9SvNh240pTRJBU1G
-d5Q3aDGc3RkgC6EWk2J+Dl7Plpno/uSCJDju0GsIUAvPyw1cbUxFsAE1EJnfMDbV
-eIQB2xi0fsjyr9V3k9zMAtJapKcwbFQ3ffPOptNJKQGb8GiCL5GGogbMVl5sJJjA
-HvaWEIXjSs2IiTgXP8Jg3/k6e19qzSNnAYR0BxFkRw2+BmXxAiJN4edVuqWLqRRT
-s33DOEpMqHk3/N7qgx3JMidfIQSO3UTOo4ItilOHBKpVXdKZZ06ekP1eEGpgO4Nr
-mfh7BJ/kqxx3e2GITKHRJyWiCwdqGfwo4SxoeyU8U5IfZ1B+ru/WZeI+caCMRm90
-fcCilkKw1HmOtANMDzBPpbA8MC0q6mTye4SVQU2CUIflOnOMdxUR2EqTEOoVmHlE
-PAv08U2vCVBvt8p17WXhksx5YbhGxOV1MCOEbKeFZTYtILXhd8YQYP8mWMgIJ4w/
-6DYwNzDzCT0koPfh29ctwlkcXHYiX5Re+9685MXFS0uc6CWSiqU+BK2tI7BcHk/9
-Rvl37nO4gZUaJCcCx7rar6ETWGmngBXVvLfb3t7YFh5khTplPpj6zjwxqgK5SM+t
-j0SYM10Auo/7FE6Ummucx7bt+SUvqHDSg4tBqdEYM2JA3afi3VuU4JdhD0CTBFdk
-yBcywFvMJdQvg6P6GkPh
-=JyWU
+iQIcBAEBCAAGBQJTNNo1AAoJEPGu1DbS6WIAxeAP/RCJt5fQveNxZ5VyTKP7jBu2
+EJQoGhy5aIzOra6dWCHxXzyjv3Cz4p03SsogvqRnCQ5cj+B94QFoOxmPHRi8fQF4
+qLJmLzR/QRe2pOEEZDijnQbODnKrLRglkCJ6MdBRbonS5dOA4uOHc4ygRfLBXDXF
+oHxRikgCcQnXFXTSSXt0135xCHOWEhVXJh3poXgI/8SaC2ozCgKzl9ip1wc9mXzF
+2qtgJv6wsMg5Jl26P28tCmQT5sRI/chvaMg2Vl7DeSDNf74uj43CnJUV1pbIyXqg
+X5NqjK6XO3eVqmgdLHXoDfcnbiFhxuQMmzZJXYBpTTKLG/ZarVeiQrTJYbVwJhUC
+KkuF667pLiqdO3bzGDOeaz+sEpHitNtLZCJXMnIreCEq8VdxtnBsg6LsbJNi8DjI
+9v9ZJWDKMaHUo5PYVieeQQ9B5R/Mp9SmUpyrc3b28GAl+xv/LfgZClsNg36eD/w0
+2Gr0XAFBI8Mdz0aIK+5UYE7qMciz7t8MP2CuXnNyaOhWtd248PQZkj9mDJqXkH4A
+/quvkYb5WVlFk7KnI4xxV+CRWXMtjJmrIti3Nk7dRu/jOzjQdZzM4H4Mx9x3zJZH
+6A4/DDqMxr/ZD3UC16gxa5LowdZYEKTJTNmEJEbiQvpKWQ44xcTMK3OIgXTO95og
+dw9hwjDQrSck7JFYC5vd
+=g1rr
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.3-r2.ebuild b/app-shells/bash/bash-4.3-r3.ebuild
index 688b310ec3bd..df77a5657db1 100644
--- a/app-shells/bash/bash-4.3-r2.ebuild
+++ b/app-shells/bash/bash-4.3-r3.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-r2.ebuild,v 1.1 2014/03/20 19:45:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3-r3.ebuild,v 1.1 2014/03/28 02:10:54 vapier Exp $
 
 EAPI="4"
 
@@ -89,6 +89,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-pcomplete-dequote.patch
 	epatch "${FILESDIR}"/${P}-extglob-skipname.patch
 	epatch "${FILESDIR}"/${P}-compound-array-empty-value.patch
+	epatch "${FILESDIR}"/${P}-input-line-realloc.patch
 
 	epatch_user
 }
diff --git a/app-shells/bash/files/bash-4.3-input-line-realloc.patch b/app-shells/bash/files/bash-4.3-input-line-realloc.patch
new file mode 100644
index 000000000000..f50c6f900dc8
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-input-line-realloc.patch
@@ -0,0 +1,17 @@
+https://lists.gnu.org/archive/html/bug-bash/2014-03/msg00172.html
+
+*** ../bash-4.3-patched/parse.y	2014-02-11 09:42:10.000000000 -0500
+--- parse.y	2014-03-27 16:33:29.000000000 -0400
+***************
+*** 2425,2429 ****
+        if (shell_input_line_terminator != EOF)
+  	{
+! 	  if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
+  	    shell_input_line = (char *)xrealloc (shell_input_line,
+  					1 + (shell_input_line_size += 2));
+--- 2425,2429 ----
+        if (shell_input_line_terminator != EOF)
+  	{
+! 	  if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
+  	    shell_input_line = (char *)xrealloc (shell_input_line,
+  					1 + (shell_input_line_size += 2));