Update to 2.05b, and fix MASTER_SITES. Lots of changes since 2.05.

Here are some of them, excerpted from NEWS:

- New code to handle multibyte characters.
- `select' was changed to be more ksh-compatible
- There is now a bindable edit-and-execute-command readline command,
    like the vi-mode `v' command, bound to C-xC-e in emacs mode.
- The shell now performs arithmetic in the largest integer size the
    machine supports (intmax_t), instead of long.
- There is a new configuration option `--enable-mem-scramble', controls
    bash malloc behavior of writing garbage characters into memory at
    allocation and free time.
- The `complete' and `compgen' builtins now have a new `-s/-A service'
    option to complete on names from /etc/services.
- `read' has a new `-u fd' option to read from a specified file descriptor.
- The expansion of $LINENO inside a shell function is only relative to the
    function start if the shell is interactive -- if the shell is running a
    script, $LINENO expands to the line number in the script.  This is as
    POSIX-2001 requires.
- The bash debugger in examples/bashdb has been modified to work with the
    new DEBUG trap semantics, the command set has been made more gdb-like,
    and the changes to $LINENO make debugging functions work better.  Code
    from Gary Vaughan.
- New [n]<&word- and [n]>&word- redirections from ksh93 -- move fds (dup
    and close).
- The `echo' builtin now accepts \0xxx (zero to three octal digits following
    the `0') in addition to \xxx (one to three octal digits) for SUSv3/XPG6/
    POSIX.1-2001 compliance.
- Added support for DESTDIR installation root prefix, so you can do a
    `make install DESTDIR=bash-root' and do easier binary packaging.
- New `-A group/-g' option to complete and compgen; does group name
    completion.
- The ksh-like `ERR' trap has been added.  The `ERR' trap will be run
    whenever the shell would have exited if the -e option were enabled.
    It is not inherited by shell functions.
- configure has a new `--enable-largefile' option, like other GNU utilities.
- `for' loops now allow empty word lists after `in', like the latest POSIX
    drafts require.
- The builtin `ulimit' now takes two new non-numeric arguments:  `hard',
    meaning the current hard limit, and `soft', meaning the current soft
    limit, in addition to `unlimited'

Also, there is a "New unwind-protect implementation from Paul
Eggert", which I believe obviates the need for two sparc64-related
patches.

6 files changed, 24 insertions, 155 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index bd7edf21109..4c53b6064e7 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2002/11/20 08:38:16 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2002/11/25 04:18:47 schmonz Exp $
 #
 
-DISTNAME=	bash-2.05
-PKGREVISION=	2
+DISTNAME=	bash-2.05b
+PKGNAME=	bash-2.05.2
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
-		ftp://slc2.ins.cwru.edu/pub/dist/
+		ftp://ftp.cwru.edu/pub/bash/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index c08518648af..2ea9a319a9d 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/09/26 22:06:30 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/11/25 04:18:47 schmonz Exp $
 
-SHA1 (bash-2.05.tar.gz) = 4418655ddc7bf6172f885bd3a54e7bfec77fec91
-Size (bash-2.05.tar.gz) = 1792319 bytes
-SHA1 (patch-ab) = 619adf5e1bbdf425b629f2675c37d3053d877d72
-SHA1 (patch-ac) = 41248ac10e116980aee59a790c73a71b91829e9e
-SHA1 (patch-ad) = 5e3207818583a7c93a65ccebf6c77cfe5fd9be5a
-SHA1 (patch-ae) = f55a728f9f8ce8896a7097100de80db1d1cf752f
+SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
+Size (bash-2.05b.tar.gz) = 1956216 bytes
+SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
+SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38
diff --git a/shells/bash2/patches/patch-ab b/shells/bash2/patches/patch-ab
index aa4cb194980..57bec15298f 100644
--- a/shells/bash2/patches/patch-ab
+++ b/shells/bash2/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.8 2002/09/26 22:06:31 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2002/11/25 04:18:47 schmonz Exp $
 
---- Makefile.in.orig	Tue Apr  3 12:03:24 2001
+--- Makefile.in.orig	Fri Nov 22 22:01:47 2002
 +++ Makefile.in
-@@ -595,15 +595,10 @@ TAGS:	$(SOURCES) $(BUILTIN_C_SRC) $(LIBR
+@@ -643,16 +643,10 @@
  installdirs:
- 	@${SHELL} $(SUPPORT_SRC)mkdirs $(bindir)
- 	@${SHELL} $(SUPPORT_SRC)mkdirs $(man1dir) $(man3dir)
--	@${SHELL} $(SUPPORT_SRC)mkdirs $(infodir)
+ 	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(bindir)
+ 	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(man1dir)
+-	@${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir)
  
  install:	.made installdirs
- 	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program)
--	$(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug
+ 	$(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program)
+ 	$(INSTALL_SCRIPT) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug
 -	-( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \
 -		man1dir=$(man1dir) man1ext=$(man1ext) \
 -		man3dir=$(man3dir) man3ext=$(man3ext) \
--		infodir=$(infodir) htmldir=$(htmldir) $@ )
-+	$(INSTALL_SCRIPT) $(INSTALLMODE2) bashbug $(bindir)/bashbug
+-		infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
+-	-( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
  
  install-strip:
  	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
diff --git a/shells/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
deleted file mode 100644
index 3818a702500..00000000000
--- a/shells/bash2/patches/patch-ac
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/08/30 13:56:28 mrg Exp $
-
---- unwind_prot.c.orig	Wed Feb 14 23:00:55 2001
-+++ unwind_prot.c	Thu Aug 30 11:24:44 2001
-@@ -51,7 +51,7 @@
-    points to this. */
- typedef struct {
-   int *variable;
--  char *desired_setting;
-+  UWP desired_setting;
-   int size;
- } SAVED_VAR;
-
-@@ -280,8 +280,9 @@
- discard_saved_var (sv)
-      SAVED_VAR *sv;
- {
--  if (sv->size != sizeof (int))
--    free (sv->desired_setting);
-+ if (sv->size != sizeof (int) && sv->size != sizeof (short) &&
-+      sv->size != sizeof (char *))
-+   free (sv->desired_setting.p);
-   free (sv);
- }
-
-@@ -293,13 +294,16 @@
- restore_variable (sv)
-      SAVED_VAR *sv;
- {
--  if (sv->size != sizeof (int))
--    {
--      FASTCOPY ((char *)sv->desired_setting, (char *)sv->variable, sv->size);
--      free (sv->desired_setting);
--    }
--  else
--    *(sv->variable) = (int)sv->desired_setting;
-+ if (sv->size == sizeof (int))
-+   *(int *)(sv->variable) = sv->desired_setting.i;
-+ else if (sv->size == sizeof (short))
-+   *(short *)(sv->variable) = sv->desired_setting.s;
-+ else if (sv->size == sizeof (char *))
-+   *(char **)(sv->variable) = sv->desired_setting.p;
-+ else {
-+     FASTCOPY ((char *)sv->desired_setting.p, (char *)sv->variable, sv->size);
-+     free (sv->desired_setting.p);
-+ }
-
-   free (sv);
- }
-@@ -312,19 +316,22 @@
- void
- unwind_protect_var (var, value, size)
-      int *var;
--     char *value;
-+     UWP *value;
-      int size;
- {
-   SAVED_VAR *s = (SAVED_VAR *)xmalloc (sizeof (SAVED_VAR));
-
-   s->variable = var;
--  if (size != sizeof (int))
--    {
--      s->desired_setting = (char *)xmalloc (size);
--      FASTCOPY (value, (char *)s->desired_setting, size);
--    }
--  else
--    s->desired_setting = value;
-+  if (size == sizeof (int)) {
-+    s->desired_setting.i = value->i;
-+  } else if (size == sizeof (short)) {
-+    s->desired_setting.s = value->s;
-+  } else if (size == sizeof (char *)) {
-+    s->desired_setting.p = value->p;
-+  } else {
-+       s->desired_setting.p = (char *)xmalloc (size);
-+       FASTCOPY (value, (char *)s->desired_setting.p, size);
-+  }
-   s->size = size;
-   add_unwind_protect ((Function *)restore_variable, (char *)s);
- }
diff --git a/shells/bash2/patches/patch-ad b/shells/bash2/patches/patch-ad
deleted file mode 100644
index ea7dfad5d61..00000000000
--- a/shells/bash2/patches/patch-ad
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/08/30 13:56:28 mrg Exp $
-
---- unwind_prot.h.orig	Thu Feb  1 19:51:00 2001
-+++ unwind_prot.h	Thu Aug 30 11:24:44 2001
-@@ -34,8 +34,9 @@
- /* Try to force correct alignment on machines where pointers and ints
-    differ in size. */
- typedef union {
--  char *s;
-+  char *p;
-   int i;
-+  int s;
- } UWP;
-
- /* Define for people who like their code to look a certain way. */
-@@ -47,18 +48,28 @@
- 	  { \
- 	    UWP u; \
- 	    u.i = (X); \
--	    unwind_protect_var (&(X), u.s, sizeof (int)); \
-+	    unwind_protect_var (&(X), &u, sizeof (int)); \
- 	  } \
- 	while (0)
-
- #define unwind_protect_short(X) \
--  unwind_protect_var ((int *)&(X), (char *)&(X), sizeof (short))
-+	do \
-+	  { \
-+	    UWP u; \
-+	    u.i = (X); \
-+	    unwind_protect_var (&(X), &u, sizeof (int)); \
-+	  } \
-+	while (0)
-
- /* How to protect a pointer to a string. */
- #define unwind_protect_string(X) \
--  unwind_protect_var ((int *)&(X), \
--		      ((sizeof (char *) == sizeof (int)) ? (char *) (X) : (char *) &(X)), \
--		       sizeof (char *))
-+	do \
-+	{ \
-+	  UWP u; \
-+	  u.p = (X); \
-+	  unwind_protect_var (&(X), &u, sizeof (char *)); \
-+	} \
-+	while (0)
-
- /* How to protect any old pointer. */
- #define unwind_protect_pointer(X) unwind_protect_string (X)
diff --git a/shells/bash2/patches/patch-ae b/shells/bash2/patches/patch-ae
index 02898ca9723..8c2ebfed01e 100644
--- a/shells/bash2/patches/patch-ae
+++ b/shells/bash2/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.5 2000/03/30 11:56:32 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2002/11/25 04:18:48 schmonz Exp $
 
---- builtins/enable.def.orig	Thu Aug  5 13:41:13 1999
-+++ builtins/enable.def	Thu Mar 30 13:08:21 2000
-@@ -305,9 +305,16 @@
+--- builtins/enable.def.orig	Fri Nov 22 22:16:40 2002
++++ builtins/enable.def
+@@ -314,9 +314,16 @@
        name = list->word->word;
  
        size = strlen (name);
 +#ifdef __ELF__
-       struct_name = xmalloc (size + 8);
+       struct_name = (char *)xmalloc (size + 8);
        strcpy (struct_name, name);
        strcpy (struct_name + size, "_struct");
 +#else