Update to version 4.2 PL 20.

3 files changed, 45 insertions, 31 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index fe4f3f97b527..59c6b982692b 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=		bash
-PATCHLEVEL=		11
-PORTVERSION=		4.1.${PATCHLEVEL:S/^0//g}
+PATCHLEVEL=		20
+PORTVERSION=		4.2.${PATCHLEVEL:S/^0//g}
 PORTREVISION?=		0
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index f6dc0af5ffd3..def9af14977a 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,25 +1,43 @@
-SHA256 (bash/bash-4.1.tar.gz) = 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da
-SIZE (bash/bash-4.1.tar.gz) = 6598300
-SHA256 (bash/bash41-001) = a6e47fa108f853d0f0999520509c11680d37c8b7823b92b96d431766dd620278
-SIZE (bash/bash41-001) = 1445
-SHA256 (bash/bash41-002) = 322e229de186b3bd87dedabfbad8386716f103e87ff00cd1b2db844e0dff78f8
-SIZE (bash/bash41-002) = 1799
-SHA256 (bash/bash41-003) = 91763dddbbb98c3ff7deb3faea3b3ad6e861e7bfd2e46c045c0d1d85d1b3256d
-SIZE (bash/bash41-003) = 1407
-SHA256 (bash/bash41-004) = 78c063ba34c1f390a5bf2e5727624ca2e253bbef49ce187cabb240eee7f4ff9e
-SIZE (bash/bash41-004) = 1705
-SHA256 (bash/bash41-005) = 519639d8d1664be74d7ec15879d16337fe8c71af8d648b02f84ccdd4fb739c1a
-SIZE (bash/bash41-005) = 1626
-SHA256 (bash/bash41-006) = 5986abcf33c0b087bd5670f1ae6a6400a8ce6ab7e7c4de18b9826d0ee10f2c49
-SIZE (bash/bash41-006) = 2166
-SHA256 (bash/bash41-007) = 74012a2c28ba4fb532c3eb69155ac870aac8d53990fa4e1e52cdc173d4c205a7
-SIZE (bash/bash41-007) = 1610
-SHA256 (bash/bash41-008) = 4e2c2c251432cdf6b84dd5b4fd06d698f4dbeabb56a6c247ca8bf18443481215
-SIZE (bash/bash41-008) = 1610
-SHA256 (bash/bash41-009) = bd4006964ae88a5ed8032c16208130084efd43866afe19bb88a167e0c0f156d1
-SIZE (bash/bash41-009) = 1323
-SHA256 (bash/bash41-010) = 797758a867b6c93530be0217bf0f82edf747a3f5d7733186ff313d11f8d9d815
-SIZE (bash/bash41-010) = 1801
-SHA256 (bash/bash41-011) = 1b2b81a20712cb56c10696a940d583ac2a01d07836f8139252e8fe023d291621
-SIZE (bash/bash41-011) = 2444
+SHA256 (bash/bash-4.2.tar.gz) = a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8
+SIZE (bash/bash-4.2.tar.gz) = 7009201
+SHA256 (bash/bash42-001) = 8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a
+SIZE (bash/bash42-001) = 2944
+SHA256 (bash/bash42-002) = febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9
+SIZE (bash/bash42-002) = 1780
+SHA256 (bash/bash42-003) = 5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd
+SIZE (bash/bash42-003) = 6896
+SHA256 (bash/bash42-004) = 4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1
+SIZE (bash/bash42-004) = 1686
+SHA256 (bash/bash42-005) = a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0
+SIZE (bash/bash42-005) = 3424
+SHA256 (bash/bash42-006) = c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1
+SIZE (bash/bash42-006) = 1187
+SHA256 (bash/bash42-007) = 405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95
+SIZE (bash/bash42-007) = 1394
+SHA256 (bash/bash42-008) = 23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437
+SIZE (bash/bash42-008) = 2164
+SHA256 (bash/bash42-009) = e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20
+SIZE (bash/bash42-009) = 2384
+SHA256 (bash/bash42-010) = acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc
+SIZE (bash/bash42-010) = 1818
+SHA256 (bash/bash42-011) = a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532
+SIZE (bash/bash42-011) = 1426
+SHA256 (bash/bash42-012) = 354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8
+SIZE (bash/bash42-012) = 4247
+SHA256 (bash/bash42-013) = 3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea
+SIZE (bash/bash42-013) = 1340
+SHA256 (bash/bash42-014) = b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33
+SIZE (bash/bash42-014) = 1434
+SHA256 (bash/bash42-015) = 2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98
+SIZE (bash/bash42-015) = 1991
+SHA256 (bash/bash42-016) = 2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6
+SIZE (bash/bash42-016) = 1410
+SHA256 (bash/bash42-017) = 73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f
+SIZE (bash/bash42-017) = 1399
+SHA256 (bash/bash42-018) = e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d
+SIZE (bash/bash42-018) = 1929
+SHA256 (bash/bash42-019) = a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56
+SIZE (bash/bash42-019) = 1415
+SHA256 (bash/bash42-020) = 494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f
+SIZE (bash/bash42-020) = 1825
 SHA256 (bash/FAQ) = IGNORE
diff --git a/shells/bash/files/xpatch-colonbreakswords b/shells/bash/files/xpatch-colonbreakswords
index a37b742f4e17..5df21a20f973 100644
--- a/shells/bash/files/xpatch-colonbreakswords
+++ b/shells/bash/files/xpatch-colonbreakswords
@@ -103,7 +103,7 @@
  /* Called once from parse.y if we are going to use readline. */
  void
  initialize_readline ()
-@@ -517,11 +597,16 @@ initialize_readline ()
+@@ -517,7 +597,12 @@ initialize_readline ()
       completion is enabled. */
    enable_hostname_completion (perform_hostname_completion);
  
@@ -113,12 +113,8 @@
 +  enable_colon_wordbreak (colon_is_wordbreak);
 +
    /* characters that need to be quoted when appearing in filenames. */
- #if 0
-   rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{";	/*}*/
- #else
 -  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
 +//  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
- #endif
    rl_filename_quoting_function = bash_quote_filename;
    rl_filename_dequoting_function = bash_dequote_filename;
 --- builtins/shopt.def.orig	2009-01-13 05:43:16.000000000 -0800