Update to 4.0.24. Following bugs were fixed since 4.0.10:

When using the ** globbing operator, bash will incorrectly add an extra
directory name when the preceding directory name ends with `*' or an empty
string when there is no preceding directory name.

If the prompt length exactly matches the screen width, and the prompt ends
with invisible characters, readline positions the cursor incorrectly.

When parsing case statements in command substitutions, the shell did not
note that a newline is a shell metacharacter and can legally be followed
by a reserved word (e.g., `esac').

When not in a locale supporting multibyte characters, readline will
occasionally not erase characters between the cursor position and the end
of the line when killing text backwards.

If a SIGWINCH arrives while bash is performing redisplay, multi-line prompts
are displayed incorrectly due to the display code being called recursively.

Using an external command as part of the DEBUG trap when job control is
enabled causes pipelines to misbehave.  The problem has to do with process
groups assigned to the pipeline and terminal.

A missing include file results in an empty function definition and a no-op
when checking whether or not the window size has changed.

Adding a null line to a here-document (e.g., by hitting EOF) causes the
shell to dump core attempting to dereference the NULL pointer.

There are several problems with the handling of $LINENO in an ERR trap.

Deferring handling of signals which should cause the shell to terminate until
it is "safe" to run the handler functions does not work for some terminating
signals.

When the fc builtin is run in a command substitution from a shell with history
enabled, it does not correctly calculate the command on which to operate.

Though references to $@ when there are no positional parameters will now
cause the shell to exit if the `errexit' option has been enabled, constructs
such as ${@:-foo} should not cause an exit.

A case statement using the ;& pattern terminator followed immediately by
"esac" caused a core dump due to a null pointer dereference.

When using the new |& operator following a simple command with a redirection,
the redirection of stderr through the pipe was not performed under certain
circumstances.

2 files changed, 48 insertions, 4 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 86bd1d1c17e..1502d8921fe 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.44 2009/05/20 00:58:27 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2009/06/05 23:32:00 hasso Exp $
 
 BASH_VERSION=		4.0
-BASH_PATCHLEVEL=	10
+BASH_PATCHLEVEL=	24
 
 DISTNAME=	bash-${BASH_VERSION}
 PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
-PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
@@ -13,6 +12,9 @@ MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 PATCH_SITES=	${MASTER_SITES:=bash-4.0-patches/}
 PATCHFILES+=	bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
 PATCHFILES+=	bash40-006 bash40-007 bash40-008 bash40-009 bash40-010
+PATCHFILES+=	bash40-011 bash40-012 bash40-013 bash40-014 bash40-015
+PATCHFILES+=	bash40-016 bash40-017 bash40-018 bash40-019 bash40-020
+PATCHFILES+=	bash40-021 bash40-022 bash40-023 bash40-024
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 6091ae6b46a..3d0710c5fa9 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/03/31 10:09:06 hasso Exp $
+$NetBSD: distinfo,v 1.16 2009/06/05 23:32:00 hasso Exp $
 
 SHA1 (bash-4.0.tar.gz) = 2bbed30879f9f424c091a846a48111c27d0b2370
 RMD160 (bash-4.0.tar.gz) = 82aba4b2cb475c2030904a9d22af6208dfa85eb3
@@ -33,5 +33,47 @@ Size (bash40-009) = 1821 bytes
 SHA1 (bash40-010) = b6ae8581201f10e4a2a87da077880bf65a0a5a9a
 RMD160 (bash40-010) = 0a505d7fa2a2f576a46b6716d7f172098a303392
 Size (bash40-010) = 2152 bytes
+SHA1 (bash40-011) = ab4daf25d8acf6793d7e60cbaa1fb2731cdd057b
+RMD160 (bash40-011) = e1bb7d468eeef37e0167c0bef476f33dbce43650
+Size (bash40-011) = 1383 bytes
+SHA1 (bash40-012) = c9215c1a8a5f30fe92fabfbbebd98b9c298dbf66
+RMD160 (bash40-012) = d0b5e71481991a80ba6a1d75779890838e49051e
+Size (bash40-012) = 1459 bytes
+SHA1 (bash40-013) = 2662229353256fa133bc96868c125855222e6007
+RMD160 (bash40-013) = 0ab5d07aba9303a2c69da8e76dbb12837984cf65
+Size (bash40-013) = 4629 bytes
+SHA1 (bash40-014) = 8e2ada4c483ad219b479531e54e285576ef5c547
+RMD160 (bash40-014) = 232aa79556b0557af200df67f0c13543b4898f6a
+Size (bash40-014) = 3709 bytes
+SHA1 (bash40-015) = 41ac5d729bdb8756c4ee59e27db1eda2d88ff0d0
+RMD160 (bash40-015) = 76fbe55d6222efd59fe0eb6f9daa7badf101dda6
+Size (bash40-015) = 1914 bytes
+SHA1 (bash40-016) = 2aba9164dda6f52872461276fa1ef175784c5535
+RMD160 (bash40-016) = 1ab774b4b6ab0964c53d9a73581081b29aea1ba9
+Size (bash40-016) = 3032 bytes
+SHA1 (bash40-017) = b283d0079b5dfb66444ae1aa95ae37ff5803692d
+RMD160 (bash40-017) = 692f5b1537351b68c0e9ad0aa597342cd01eb0fd
+Size (bash40-017) = 1496 bytes
+SHA1 (bash40-018) = 653671824b58bf81518b042db261d5cac669ce2e
+RMD160 (bash40-018) = bc7d056dfb661059890abb34e80c5204dbf51000
+Size (bash40-018) = 2614 bytes
+SHA1 (bash40-019) = 846df69cbef5dd37addeebeb168152fe6bcee845
+RMD160 (bash40-019) = 02c119daea6b2e414907e3dc386be907b3044c7d
+Size (bash40-019) = 3309 bytes
+SHA1 (bash40-020) = 8bae306cfc0d176f4ebd3cfbbe8d38f38ac9f787
+RMD160 (bash40-020) = 874a368171e9ce773a2f17a8339ba9e622eb83ce
+Size (bash40-020) = 2666 bytes
+SHA1 (bash40-021) = a1c785042f92b85564deb41d142a94dd045b9dac
+RMD160 (bash40-021) = 057becc706b90a5c55d51baa425ee9546e3fa092
+Size (bash40-021) = 1547 bytes
+SHA1 (bash40-022) = 7060344931a866b07754eb0b9d49039df4132053
+RMD160 (bash40-022) = a9c134b260cd4bde1d2c3352b52dcf5e0f333476
+Size (bash40-022) = 1592 bytes
+SHA1 (bash40-023) = e6ccdbc145f81209c04541cbfcb6ba561e7fe8ea
+RMD160 (bash40-023) = dbf73ebe9b63aceb61068a9f133a6d4a946af795
+Size (bash40-023) = 2148 bytes
+SHA1 (bash40-024) = 3471e683167980dcb297bebe17f34646df560ce6
+RMD160 (bash40-024) = 484c6ef4e0bbe887ecff754db18aa25e62075529
+Size (bash40-024) = 3049 bytes
 SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48