bash: update to 5.1.4.

That is, 5.1 with the four post-release patches available so far.

This is a terse description of the new features added to bash-5.1 since
the release of bash-5.0.  As always, the manual page (doc/bash.1) is
the place to look for complete descriptions.

1. New Features in Bash

a. `bind -x' now supports different bindings for different editing modes and
   keymaps.

b. Bash attempts to optimize the number of times it forks when executing
   commands in subshells and from `bash -c'.

c. Here documents and here strings now use pipes for the expanded document if
   it's smaller than the pipe buffer size, reverting to temporary files if it's
   larger.

d. There are new loadable builtins: mktemp, accept, mkfifo, csv, cut/lcut

e. In posix mode, `trap -p' now displays signals whose disposition is SIG_DFL
   and those that were SIG_IGN when the shell starts.

f. The shell now expands the history number (e.g., in PS1) even if it is not
   currently saving commands to the history list.

g. `read -e' may now be used with arbitrary file descriptors (`read -u N').

h. The `select' builtin now runs traps if its internal call to the read builtin
   is interrupted by a signal.

i. SRANDOM: a new variable that expands to a 32-bit random number that is not
   produced by an LCRNG, and uses getrandom/getentropy, falling back to
   /dev/urandom or arc4random if available. There is a fallback generator if
   none of these are available.

j. shell-transpose-words: a new bindable readline command that uses the same
   definition of word as shell-forward-word, etc.

k. The shell now adds default bindings for shell-forward-word,
   shell-backward-word, shell-transpose-words, and shell-kill-word.

l. Bash now allows ARGV0 appearing in the initial shell environment to set $0.

m. If `unset' is executed without option arguments, bash tries to unset a shell
   function if a name argument cannot be a shell variable name because it's not
   an identifier.

n. The `test -N' operator uses nanosecond timestamp granularity if it's
   available.

o. Bash posix mode now treats assignment statements preceding shell function
   definitions the same as in its default mode, since POSIX has changed and
   no longer requires those assignments to persist after the function returns
   (POSIX interp 654).

p. BASH_REMATCH is no longer readonly.

q. wait: has a new -p VARNAME option, which stores the PID returned by `wait -n'
   or `wait' without arguments.

r. Sorting the results of pathname expansion now uses byte-by-byte comparisons
   if two strings collate equally to impose a total order; the result of a
   POSIX interpretation.

s. Bash now allows SIGINT trap handlers to execute recursively.

t. Bash now saves and restores state around setting and unsetting posix mode,
   instead of having unsetting posix mode set a known state.

u. Process substitution is now available in posix mode.

v. READLINE_MARK: a new variable available while executing commands bound with
   `bind -x', contains the value of the mark.

w. Bash removes SIGCHLD from the set of blocked signals if it's blocked at shell
   startup.

x. `test -v N' can now test whether or not positional parameter N is set.

y. `local' now honors the `-p' option to display all local variables at the
    current context.

z. The `@a' variable transformation now prints attributes for unset array
   variables.

aa. The `@A' variable transformation now prints a declare command that sets a
    variable's attributes if the variable has attributes but is unset.

bb. `declare' and `local' now have a -I option that inherits attributes and
    value from a variable with the same name at a previous scope.

cc. When run from a -c command, `jobs' now reports the status of completed jobs.

dd. New `U', `u', and `L' parameter transformations to convert to uppercase,
    convert first character to uppercase, and convert to lowercase,
    respectively.

ee. PROMPT_COMMAND: can now be an  array variable, each element of which can
    contain a command to be executed like a string PROMPT_COMMAND variable.

ff. `ulimit' has a -R option to report and set the RLIMIT_RTTIME resource.

gg. Associative arrays may be assigned using a list of key-value pairs within
    a compound assignment. Compound assignments where the words are not of
    the form [key]=value are assumed to be key-value assignments. A missing or
    empty key is an error; a missing value is treated as NULL. Assignments may
    not mix the two forms.

hh. New `K' parameter transformation to display associative arrays as key-
    value pairs.

ii. Writing history to syslog now handles messages longer than the syslog max
    length by writing multiple messages with a sequence number.

jj. SECONDS and RANDOM may now be assigned using arithmetic expressions, since
    they are nominally integer variables. LINENO is not an integer variable.

kk. Bash temporarily suppresses the verbose option when running the DEBUG trap
    while running a command from the `fc' builtin.

ll. `wait -n' now accepts a list of job specifications as arguments and will
    wait for the first one in the list to change state.

mm. The associative array implementation can now dynamically increase the
    size of the hash table based on insertion patterns.

nn. HISTFILE is now readonly in a restricted shell.

oo. The bash malloc now returns memory that is 16-byte aligned on 64-bit
    systems.

pp. If the hash builtin is listing hashed filenames portably, don't print
   anything if the table is empty.

qq. GLOBIGNORE now ignores `.' and `..' as a terminal pathname component.

rr. Bash attempts to optimize away forks in the last command in a function body
    under appropriate circumstances.

ss. The globbing code now uses fnmatch(3) to check collation elements (if
    available) even in cases without multibyte characters.

tt. The `fg' and `bg' builtins now return an error in a command substitution
    when asked to restart a job inherited from the parent shell.

uu. The shell now attempts to unlink all FIFOs on exit, whether a consuming
    process has finished with them or not.

vv. There is a new contributed loadable builtin: asort.

2. New Features in Readline

a. If a second consecutive completion attempt produces matches where the first
   did not, treat it as a new completion attempt and insert a match as
   appropriate.

b. Bracketed paste mode works in more places: incremental search strings, vi
   overstrike mode, character search, and reading numeric arguments.

c. Readline automatically switches to horizontal scrolling if the terminal has
   only one line.

d. Unbinding all key sequences bound to a particular readline function now
   descends into keymaps for multi-key sequences.

e. rl-clear-display: new bindable command that clears the screen and, if
   possible, the scrollback buffer (bound to emacs mode M-C-l by default).

f. New active mark and face feature: when enabled, it will highlight the text
   inserted by a bracketed paste (the `active region') and the text found by
   incremental and non-incremental history searches. This is tied to bracketed
   paste and can be disabled by turning off bracketed paste.

g. Readline sets the mark in several additional commands.

h. Bracketed paste mode is enabled by default.

i. Readline tries to take advantage of the more regular structure of UTF-8
   characters to identify the beginning and end of characters when moving
   through the line buffer.

j. The bindable operate-and-get-next command (and its default bindings) are
   now part of readline instead of a bash-specific addition.

k. The signal cleanup code now blocks SIGINT while processing after a SIGINT.

8 files changed, 48 insertions, 152 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index dc05f367c70..ee20ee03664 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.95 2020/07/10 20:40:26 kre Exp $
+# $NetBSD: Makefile,v 1.96 2021/01/04 10:39:23 wiz Exp $
 
-BASH_VERSION=		5.0
-BASH_PATCHLEVEL=	18
+BASH_VERSION=		5.1
+BASH_PATCHLEVEL=	4
 
 DISTNAME=	bash-${BASH_VERSION}
-PKGNAME=	bash-${BASH_VERSION:C/4\.4\..*/4.4/}.${BASH_PATCHLEVEL}
+PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/}
 
-PATCH_SITES=	${MASTER_SITES:=bash-5.0-patches/}
-PATCHFILES+=	bash50-001 bash50-002 bash50-003 bash50-004 bash50-005
-PATCHFILES+=	bash50-006 bash50-007 bash50-008 bash50-009 bash50-010
-PATCHFILES+=	bash50-011 bash50-012 bash50-013 bash50-014 bash50-015
-PATCHFILES+=	bash50-016 bash50-017 bash50-018
+PATCH_SITES=	${MASTER_SITES:=bash-5.1-patches/}
+PATCHFILES+=	bash51-001 bash51-002 bash51-003 bash51-004
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/PLIST b/shells/bash/PLIST
index 32bd31dbcc7..4f2614fdbbc 100644
--- a/shells/bash/PLIST
+++ b/shells/bash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/10/24 11:52:30 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/01/04 10:39:23 wiz Exp $
 bin/bash
 bin/bashbug
 include/bash/alias.h
@@ -61,7 +61,10 @@ include/bash/xmalloc.h
 include/bash/y.tab.h
 info/bash.info
 lib/bash/Makefile.inc
+lib/bash/accept
 lib/bash/basename
+lib/bash/csv
+lib/bash/cut
 lib/bash/dirname
 lib/bash/fdflags
 lib/bash/finfo
@@ -71,12 +74,15 @@ lib/bash/ln
 lib/bash/loadables.h
 lib/bash/logname
 lib/bash/mkdir
+lib/bash/mkfifo
+lib/bash/mktemp
 lib/bash/mypid
 lib/bash/pathchk
 lib/bash/print
 lib/bash/printenv
 lib/bash/push
 lib/bash/realpath
+lib/bash/rm
 lib/bash/rmdir
 lib/bash/seq
 lib/bash/setpgid
@@ -123,6 +129,7 @@ ${PLIST.nls}share/locale/hu/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/id/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/it/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/ja/LC_MESSAGES/bash.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/lt/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/nb/LC_MESSAGES/bash.mo
 ${PLIST.nls}share/locale/nl/LC_MESSAGES/bash.mo
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index fa76892b2f7..b5889b40570 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,91 +1,32 @@
-$NetBSD: distinfo,v 1.61 2020/07/10 20:40:26 kre Exp $
+$NetBSD: distinfo,v 1.62 2021/01/04 10:39:23 wiz Exp $
 
-SHA1 (bash-5.0.tar.gz) = d116b469b9e6ea5264a74661d3a4c797da7f997b
-RMD160 (bash-5.0.tar.gz) = a081428a896d617855499376b670eca3433a27c1
-SHA512 (bash-5.0.tar.gz) = bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864
-Size (bash-5.0.tar.gz) = 10135110 bytes
-SHA1 (bash50-001) = 9b8c7b32bf434d36b030c37b54fe8cebe54e2ab7
-RMD160 (bash50-001) = 20cde6fea8fb371d1d00d10496c1f5b1d9c71182
-SHA512 (bash50-001) = e3bf036287d3be1f3e91755678c04c9a8e1b4a98e34e181871dfaeb13987dda18c31a44db3f3829d91a185ba4414b9c0229f2a15f6e8a951cbc6c1054252bfdd
-Size (bash50-001) = 4133 bytes
-SHA1 (bash50-002) = 44a3a849a6826571115f9920405edeca3d8287ad
-RMD160 (bash50-002) = a1eb7734493903e9eb25b3c1b48d69ee7a01da5e
-SHA512 (bash50-002) = 59b1cfa1be1029ada53c63fe651d51451ead5523c50c115e0eada07e34e641c693ed728366986acb431f96fdc61818efd3f8cd168ce416001edc62602e5f28dd
-Size (bash50-002) = 4380 bytes
-SHA1 (bash50-003) = f371117fb06427e2b480fb796ee27f467a2d951a
-RMD160 (bash50-003) = c964aa0deb96a5efe5e0d9cf123d0e5345c77efc
-SHA512 (bash50-003) = 520b5cc0b7aeea6cd8b7471b553d8979996f3627a3e5c8889023562dadc82475be243aca2ec608217b78400a1dceb134b877d3ded926e581445234f1b69409e6
-Size (bash50-003) = 6434 bytes
-SHA1 (bash50-004) = e0adfba3d5e9b96911c771140e03ec892e732be3
-RMD160 (bash50-004) = 90417dbb08702281201614df0518d1534dcf6f48
-SHA512 (bash50-004) = cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1d7d5e56f789258ba9f54c4cfb5760ed3c70ec1f49f25c719
-Size (bash50-004) = 1664 bytes
-SHA1 (bash50-005) = 08aac2d877b65e5816c3a73ee49a78261988597c
-RMD160 (bash50-005) = 9662d5e3ed43a14b80845ecb6a5916733113a126
-SHA512 (bash50-005) = 4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da
-Size (bash50-005) = 3732 bytes
-SHA1 (bash50-006) = 9cf8246582e3a03f79791a6922c8331c2564a51e
-RMD160 (bash50-006) = 702429f2e21e61cb39f7ecc579fc61bfaa5f4991
-SHA512 (bash50-006) = 71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0
-Size (bash50-006) = 1275 bytes
-SHA1 (bash50-007) = 43e1f09bc57bb442603d4c8691d6f39e378a0bfc
-RMD160 (bash50-007) = 75f55a086cb11db8fb0faa001a7fe8d77b17b30f
-SHA512 (bash50-007) = 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8
-Size (bash50-007) = 1640 bytes
-SHA1 (bash50-008) = 953e54638c2e0f3bed5f6589df6b9710f5d6bd35
-RMD160 (bash50-008) = e4076df3d86bb750c2fd72766fcdf855a92b9269
-SHA512 (bash50-008) = 110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4
-Size (bash50-008) = 2622 bytes
-SHA1 (bash50-009) = 38e2101c03c9d48595df248a5115b61bd62c0b00
-RMD160 (bash50-009) = 55a8d44d5ef731d4996bdf69dcf6a80105ca168e
-SHA512 (bash50-009) = 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
-Size (bash50-009) = 1095 bytes
-SHA1 (bash50-010) = f938ba0730f63f4535eaf4298ae4ebe1121553ca
-RMD160 (bash50-010) = 40599f5fe2f5a9cfa9324cd31c0487166ff68f5a
-SHA512 (bash50-010) = 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
-Size (bash50-010) = 6407 bytes
-SHA1 (bash50-011) = c8dfa690a081b15826737cab955ff2d79c69dd7a
-RMD160 (bash50-011) = d2866cbdf4f5a8e1f79ff4795b6045a45bea4627
-SHA512 (bash50-011) = 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
-Size (bash50-011) = 1870 bytes
-SHA1 (bash50-012) = 302ff4f46b7910f83600496d6afab898ff24f76b
-RMD160 (bash50-012) = 3c08d0e8a96645112fe86c407637f2d030319a7a
-SHA512 (bash50-012) = 24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e
-Size (bash50-012) = 1571 bytes
-SHA1 (bash50-013) = f03604304381de28bf16f4f86a7d98fc38c05b6e
-RMD160 (bash50-013) = 824d45c5779bf238b2891a4906a38d7e49f71ea8
-SHA512 (bash50-013) = 38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5
-Size (bash50-013) = 2328 bytes
-SHA1 (bash50-014) = 7ca0ac31f30ce2364999dc71d7e4d7bd1517dc3d
-RMD160 (bash50-014) = 1f36acc05688999814a8932ac87fcbd8f2f71b4c
-SHA512 (bash50-014) = e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
-Size (bash50-014) = 1747 bytes
-SHA1 (bash50-015) = ea47fdb05dfde153414dccc79c51238156963bf1
-RMD160 (bash50-015) = 540db9eff2543184e504f2de9bff3c07642c2ce5
-SHA512 (bash50-015) = 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
-Size (bash50-015) = 2565 bytes
-SHA1 (bash50-016) = 93c1a62446bf403139fd266612df9204e477d40d
-RMD160 (bash50-016) = 19d5f631e0181e2671f9bcb8ee7419a46f99008e
-SHA512 (bash50-016) = dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
-Size (bash50-016) = 1534 bytes
-SHA1 (bash50-017) = bde40645832ba9dbd9cc531764489165fd67d15e
-RMD160 (bash50-017) = a46602c2186a902f20f3260da2bbde825b7a8ad9
-SHA512 (bash50-017) = d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
-Size (bash50-017) = 6517 bytes
-SHA1 (bash50-018) = 4599f8f88ea950aac47d4c3dddc7de14fd70f38d
-RMD160 (bash50-018) = f3c61856439972d3a5b51c8140bb6899c259816e
-SHA512 (bash50-018) = cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
-Size (bash50-018) = 1242 bytes
+SHA1 (bash-5.1.tar.gz) = 063019501ef1f30fad99d2b735a7ae2ce1d11423
+RMD160 (bash-5.1.tar.gz) = 3b968e29e3867e201a781c4dc28f71120dbaeed8
+SHA512 (bash-5.1.tar.gz) = c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
+Size (bash-5.1.tar.gz) = 10458638 bytes
+SHA1 (bash51-001) = a57ac5f91651682d15bbb89f542a89efe8c00e3b
+RMD160 (bash51-001) = 94262e6ca1a964766c1f8721e884764375667148
+SHA512 (bash51-001) = 1cd86805a2639614372aec29a710bc456e330abcbbaa0867820c94f714a1fa5fb5c1b18aa2c10263ae0bce9dad7579c7af2f732282315c1c34bfd6a90777bfd2
+Size (bash51-001) = 2894 bytes
+SHA1 (bash51-002) = cce5023da8edf7139e8141a21b9352e05c33549f
+RMD160 (bash51-002) = 966bc4dba103804fec94c71529c9d9419d5a96d1
+SHA512 (bash51-002) = 923e7822a9629645347d3aea0058fb5e2d52223507159a62369309f264612df44a84931c19e0ccb3852e98ce672dfbd454477090b4041b5a0de477c94eb61088
+Size (bash51-002) = 1575 bytes
+SHA1 (bash51-003) = 76f363f19c6307170dfe84c7d22f2eae41d45f90
+RMD160 (bash51-003) = ee9e41cc02c4925394da2c02b664c40c4e86f6f4
+SHA512 (bash51-003) = 01e952dcfdae58624723d64912ea3444eed2fdcd266ba1a929b95ec3abd70f914bf400607c3f7bb7a94ac2925f794f91f37c1929d5bb987de2ba7f60a19cb8bd
+Size (bash51-003) = 1800 bytes
+SHA1 (bash51-004) = 65facaca75a1686ef1c1fc85155f13ea6a2e45d6
+RMD160 (bash51-004) = 6d5536298d29c16bf1004f82ce6b6d0dd1312241
+SHA512 (bash51-004) = 10ff24cd91a2cd88818bfa7218050843af6b409e43fcca89f5ec70d8266020c6c2a55132426271f165cd0f154f49eb0f8ec2761b80fc066c921b83120bb543ce
+Size (bash51-004) = 3745 bytes
 SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062
 SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
 SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
-SHA1 (patch-bashline.c) = a41e6bdca7a0eba71ba76619ff1eb4f51a4437f2
 SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
-SHA1 (patch-examples_loadables_fdflags.c) = 92a63c8f4c94ccf9cf782e934a0806930d172654
-SHA1 (patch-examples_loadables_push.c) = 57a3c7de9ea0a75c373db678d9500954bcf40ff4
+SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
 SHA1 (patch-lib_malloc_malloc.c) = fc22c2bb45490c57782d34d62336d168875c3609
 SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd
-SHA1 (patch-subst.c) = f07a230682b197db03dcba4c4fd5dbba3e2f35d9
 SHA1 (patch-support_shobj-conf) = 8750c104549ea8a4a722bd21a684a9fe13e05fe5
-SHA1 (patch-variables.c) = 8d91272602aba348dc158d8fb5948edd90d96646
+SHA1 (patch-variables.c) = 6a60c2f7011f952d7804e0614ebdb2575973a4a7
diff --git a/shells/bash/patches/patch-bashline.c b/shells/bash/patches/patch-bashline.c
deleted file mode 100644
index 9e50456397f..00000000000
--- a/shells/bash/patches/patch-bashline.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bashline.c,v 1.2 2020/03/17 21:59:48 rillig Exp $
-
-Fix array subscript with char index.
-
-https://lists.gnu.org/archive/html/bug-bash/2020-03/msg00056.html
-
---- bashline.c.orig	2020-03-17 16:57:19.058552795 +0000
-+++ bashline.c
-@@ -4050,7 +4050,7 @@ set_filename_bstab (string)
- 
-   memset (filename_bstab, 0, sizeof (filename_bstab));
-   for (s = string; s && *s; s++)
--    filename_bstab[*s] = 1;
-+    filename_bstab[(unsigned char) *s] = 1;
- }
- 
- /* Quote a filename using double quotes, single quotes, or backslashes
diff --git a/shells/bash/patches/patch-examples_loadables_fdflags.c b/shells/bash/patches/patch-examples_loadables_fdflags.c
index 1ad139b0773..b727d63522b 100644
--- a/shells/bash/patches/patch-examples_loadables_fdflags.c
+++ b/shells/bash/patches/patch-examples_loadables_fdflags.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-examples_loadables_fdflags.c,v 1.1 2019/02/28 07:20:57 maya Exp $
+$NetBSD: patch-examples_loadables_fdflags.c,v 1.2 2021/01/04 10:39:23 wiz Exp $
 
 Handle O_CLOEXEC not being defined (Solaris 10)
 
---- examples/loadables/fdflags.c.orig	2017-02-02 16:40:42.000000000 +0000
+--- examples/loadables/fdflags.c.orig	2019-03-01 19:25:23.000000000 +0000
 +++ examples/loadables/fdflags.c
-@@ -113,8 +113,11 @@ getflags(int fd, int p)
+@@ -149,8 +149,11 @@ getflags(int fd, int p)
        return -1;
      }
  
@@ -17,15 +17,15 @@ Handle O_CLOEXEC not being defined (Solaris 10)
  
    return f & getallflags();
  }
-@@ -198,6 +201,7 @@ setone(int fd, char *v, int verbose)
+@@ -234,6 +237,7 @@ setone(int fd, char *v, int verbose)
  
    parseflags(v, &pos, &neg);
  
 +#ifdef O_CLOEXEC
    cloexec = -1;
+ 
    if ((pos & O_CLOEXEC) && (f & O_CLOEXEC) == 0)
-     cloexec = FD_CLOEXEC;
-@@ -209,6 +213,7 @@ setone(int fd, char *v, int verbose)
+@@ -247,6 +251,7 @@ setone(int fd, char *v, int verbose)
    pos &= ~O_CLOEXEC;
    neg &= ~O_CLOEXEC;
    f &= ~O_CLOEXEC;
diff --git a/shells/bash/patches/patch-examples_loadables_push.c b/shells/bash/patches/patch-examples_loadables_push.c
deleted file mode 100644
index aa70e14b43b..00000000000
--- a/shells/bash/patches/patch-examples_loadables_push.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-examples_loadables_push.c,v 1.1 2019/01/21 09:03:44 leot Exp $
-
-Match declaration of dollar_dollar_pid in variables.h.
-
---- examples/loadables/push.c.orig	2017-06-20 14:54:52.000000000 +0000
-+++ examples/loadables/push.c
-@@ -35,7 +35,7 @@
- extern int errno;
- #endif
- 
--extern int dollar_dollar_pid;
-+extern pid_t dollar_dollar_pid;
- extern int last_command_exit_value;
- 
- int
diff --git a/shells/bash/patches/patch-subst.c b/shells/bash/patches/patch-subst.c
deleted file mode 100644
index 071a54bf9b3..00000000000
--- a/shells/bash/patches/patch-subst.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-subst.c,v 1.2 2020/03/17 21:59:48 rillig Exp $
-
-Fix array subscript with char index.
-
-https://lists.gnu.org/archive/html/bug-bash/2020-03/msg00056.html
-
---- subst.c.orig	2020-03-17 16:57:17.469764555 +0000
-+++ subst.c
-@@ -11294,7 +11294,7 @@ shell_expand_word_list (tlist, eflags)
- 			case 'l':
- 			case 'u':
- 			case 'c':
--			  omap[l->word->word[oind]] = 1;
-+			  omap[(unsigned char) l->word->word[oind]] = 1;
- 			  if (opti == 0)
- 			    opts[opti++] = '-';
- 			  break;
diff --git a/shells/bash/patches/patch-variables.c b/shells/bash/patches/patch-variables.c
index 65562ec24c0..62f33f9587c 100644
--- a/shells/bash/patches/patch-variables.c
+++ b/shells/bash/patches/patch-variables.c
@@ -1,18 +1,18 @@
-$NetBSD: patch-variables.c,v 1.5 2019/01/08 16:24:42 ryoon Exp $
+$NetBSD: patch-variables.c,v 1.6 2021/01/04 10:39:23 wiz Exp $
 
 Only read functions from environment if flag is set.
 
---- variables.c.orig	2018-12-18 16:07:21.000000000 +0000
+--- variables.c.orig	2020-09-07 20:41:51.000000000 +0000
 +++ variables.c
-@@ -95,6 +95,7 @@
- #define FV_SKIPINVISIBLE	0x02
+@@ -97,6 +97,7 @@
+ #define FV_NODYNAMIC		0x04
  
  extern char **environ;
 +extern int import_functions;
  
  /* Variables used here and defined in other files. */
  extern time_t shell_start_time;
-@@ -368,7 +369,7 @@ initialize_shell_variables (env, privmod
+@@ -377,7 +378,7 @@ initialize_shell_variables (env, privmod
  #if defined (FUNCTION_IMPORT)
        /* If exported function, define it now.  Don't import functions from
  	 the environment in privileged mode. */