Update to 3.1pl1:

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

1.  New Features in Bash

a.  Bash now understands LC_TIME as a special variable so that time display
    tracks the current locale.

b.  BASH_ARGC, BASH_ARGV, BASH_SOURCE, and BASH_LINENO are no longer created
    as `invisible' variables and may not be unset.

c.  In POSIX mode, if `xpg_echo' option is enabled, the `echo' builtin doesn't
    try to interpret any options at all, as POSIX requires.

d.  The `bg' builtin now accepts multiple arguments, as POSIX seems to specify.

e.  Fixed vi-mode word completion and glob expansion to perform tilde
    expansion.

f.  The `**' mathematic exponentiation operator is now right-associative.

g.  The `ulimit' builtin has new options: -i (max number of pending signals),
    -q (max size of POSIX message queues), and -x (max number of file locks).

h.  A bare `%' once again expands to the current job when used as a job
    specifier.

i.  The `+=' assignment operator (append to the value of a string or array) is
    now supported for assignment statements and arguments to builtin commands
    that accept assignment statements.

j.  BASH_COMMAND now preserves its value when a DEBUG trap is executed.

k.  The `gnu_errfmt' option is enabled automatically if the shell is running
    in an emacs terminal window.

l.  New configuration option:  --single-help-strings.  Causes long help text
    to be written as a single string; intended to ease translation.

m.  The COMP_WORDBREAKS variable now causes the list of word break characters
    to be emptied when the variable is unset.

n.  An unquoted expansion of $* when $IFS is empty now causes the positional
    parameters to be concatenated if the expansion doesn't undergo word
    splitting.

o.  Bash now inherits $_ from the environment if it appears there at startup.

p.  New shell option: nocasematch.  If non-zero, shell pattern matching ignores
    case when used by `case' and `[[' commands.

q.  The `printf' builtin takes a new option: -v var.  That causes the output
    to be placed into var instead of on stdout.

r.  By default, the shell no longer reports processes dying from SIGPIPE.

s.  Bash now sets the extern variable `environ' to the export environment it
    creates, so C library functions that call getenv() (and can't use the
    shell-provided replacement) get current values of environment variables.

t.  A new configuration option, `--enable-strict-posix-default', which will
    build bash to be POSIX conforming by default.

u.  If compiled for strict POSIX conformance, LINES and COLUMNS may now
    override the true terminal size.

2.  New Features in Readline

a.  The key sequence sent by the keypad `delete' key is now automatically
    bound to delete-char.

b.  A negative argument to menu-complete now cycles backward through the
    completion list.

c.  A new bindable readline variable:  bind-tty-special-chars.  If non-zero,
    readline will bind the terminal special characters to their readline
    equivalents when it's called (on by default).

d.  New bindable command: vi-rubout.  Saves deleted text for possible
    reinsertion, as with any vi-mode `text modification' command; `X' is bound
    to this in vi command mode.

e.  A new external application-controllable variable that allows the LINES
    and COLUMNS environment variables to set the window size regardless of
    what the kernel returns: rl_prefer_env_winsize

7 files changed, 41 insertions, 87 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 0809495e652..39b992595a5 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/31 00:02:27 wiz Exp $
 
-DISTNAME=	bash-3.0
-PKGNAME=	bash-3.0pl16
-PKGREVISION=	4
+DISTNAME=	bash-3.1
+PKGNAME=	bash-3.1pl1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
 
-PATCH_SITES=	${MASTER_SITES:=bash-3.0-patches/}
-PATCHFILES=	bash30-001 bash30-002 bash30-003 bash30-004 \
-		bash30-005 bash30-006 bash30-007 bash30-008 \
-		bash30-009 bash30-010 bash30-011 bash30-012 \
-		bash30-013 bash30-014 bash30-015 bash30-016
+PATCH_SITES=	${MASTER_SITES:=bash-3.1-patches/}
+PATCHFILES=	bash31-001
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index c91f862e010..1bb24d67889 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,60 +1,15 @@
-$NetBSD: distinfo,v 1.6 2005/10/10 19:41:26 joerg Exp $
+$NetBSD: distinfo,v 1.7 2005/12/31 00:02:27 wiz Exp $
 
-SHA1 (bash-3.0.tar.gz) = 3acf1ff4910d4bc863620c7533cbf4858370017b
-RMD160 (bash-3.0.tar.gz) = abe76200003a9dc441ce34650a439cd968f643d4
-Size (bash-3.0.tar.gz) = 2418293 bytes
-SHA1 (bash30-001) = 3b3c3a8ddd6d3725426d1d96fd249c81944e0090
-RMD160 (bash30-001) = 3d0095d4ac8a44e378c25b35f743dbe0555129ed
-Size (bash30-001) = 4999 bytes
-SHA1 (bash30-002) = ae2dc1d0a53bcdf81f1d46ac6d5c361a5ae5a816
-RMD160 (bash30-002) = f8f5a05997db0faa35f6866b4049f0941752d0c6
-Size (bash30-002) = 2119 bytes
-SHA1 (bash30-003) = 6497e392750741f2f4fa19583bf4301f7d280823
-RMD160 (bash30-003) = b070edbe5b8da82317d4fc133724fd8cce8ba369
-Size (bash30-003) = 4669 bytes
-SHA1 (bash30-004) = 0654aaddf1555f95fea326b76f9aedc8af8e3c19
-RMD160 (bash30-004) = eed9d3b6b71da157786ff1b779a40ff312be60c0
-Size (bash30-004) = 3372 bytes
-SHA1 (bash30-005) = 331094392ca03cf473ee209873425c68a6d3edff
-RMD160 (bash30-005) = 95815cb2168c213a8dcc61e7b3f95f5e1dcbe91c
-Size (bash30-005) = 1776 bytes
-SHA1 (bash30-006) = 2dd47fcc216d2c9be35320403a9d9cbf20263103
-RMD160 (bash30-006) = 4d2de58f20a96e44bf2925a57234e8003ab12283
-Size (bash30-006) = 4258 bytes
-SHA1 (bash30-007) = 5e63abf775ca3d4b4e6d7202eae0bf4b0d689cc3
-RMD160 (bash30-007) = 9017847074890216d3e683bc166a79962b7521ee
-Size (bash30-007) = 1808 bytes
-SHA1 (bash30-008) = 711e5f13ea9f813ed39507e063db511434f2a8ab
-RMD160 (bash30-008) = 7b1e6717500675dd65feba2f9eaa0ca0ecdee032
-Size (bash30-008) = 1220 bytes
-SHA1 (bash30-009) = 621beadd603652f340a4fa386f596185373e2e13
-RMD160 (bash30-009) = 63788479233f0b191c8731fc38fb9dc352853221
-Size (bash30-009) = 2828 bytes
-SHA1 (bash30-010) = d3d16b523efb08d5f89e29350a103f859f141542
-RMD160 (bash30-010) = 7c3c51278b35255d77aa48afebd979dbe6f5ff7f
-Size (bash30-010) = 3193 bytes
-SHA1 (bash30-011) = 0c28a21cc338809caba50a4fc340e5839f57f8b3
-RMD160 (bash30-011) = c582ea7fb1f720d20154965d1e49e8f050f61824
-Size (bash30-011) = 2635 bytes
-SHA1 (bash30-012) = c9e4be4611de544ce2189d88609647f06ad0c3a8
-RMD160 (bash30-012) = 1f493f21b0423254691e7718bdabb53bd72feb37
-Size (bash30-012) = 1395 bytes
-SHA1 (bash30-013) = 19954dabe3bbb0d24b9a5f245998da2296669257
-RMD160 (bash30-013) = f82a358665460bf051158b7fe73414b0762daee8
-Size (bash30-013) = 1963 bytes
-SHA1 (bash30-014) = 78de1ee80872300b0dac6d092bd642bdab170361
-RMD160 (bash30-014) = e2e2b95944e98cf34f62a122a7fa729d7664e418
-Size (bash30-014) = 1165 bytes
-SHA1 (bash30-015) = a808e839cacbf6df4f2622830ea9f0168118fbfe
-RMD160 (bash30-015) = dc7732b5f5dba71d615c73ddabe17e40fc70a40b
-Size (bash30-015) = 1480 bytes
-SHA1 (bash30-016) = fab3ac98b8ea6dcbf1d1a38c1ac001b44579fc3c
-RMD160 (bash30-016) = 370993ff74c1a800aadb4448de08d33b635c4a1d
-Size (bash30-016) = 2453 bytes
+SHA1 (bash-3.1.tar.gz) = 766e3fd9384616d8a103f812f662fd8ec791c129
+RMD160 (bash-3.1.tar.gz) = cbeda56312b3f623684b2099b711bb7592e0eda1
+Size (bash-3.1.tar.gz) = 2533934 bytes
+SHA1 (bash31-001) = cea61aaea659ba8e5d7552204a2a497424deaf65
+RMD160 (bash31-001) = 0d071aeade45c1706f4061774bb486d9a2ba7dae
+Size (bash31-001) = 2708 bytes
 SHA1 (patch-aa) = 611f9c7e512c7fb80b088d58d6b3d91e18b06911
 SHA1 (patch-ab) = c08789555515fd4afb621cb564397ad6f1ec4dea
-SHA1 (patch-ac) = 012300f9e4427f2e15c8b96bc59a674f17d93cbd
-SHA1 (patch-ad) = 520fec46aa5df6f41418ce253cef6448dc36cadb
-SHA1 (patch-ae) = 7bacb7ac6835eb64014c744aa48eeecf48960fd8
-SHA1 (patch-af) = 8ce9e6adbda879bd32e3854913df2f6f84e4d9f7
-SHA1 (patch-ag) = 0860cbe2d1d99a3616e10fdafac24f3f17dff0b5
+SHA1 (patch-ac) = a7db1188d4986b87fb4bdf32da0f32513afa52de
+SHA1 (patch-ad) = d5224322e962e48ae29c71e1fd2d2616c60b7939
+SHA1 (patch-ae) = cdbdd0d04366f53b8efe40b3643dca4cc4d12b21
+SHA1 (patch-af) = 80372fe4ad53a20976bb8e40f2859b2c7c93d460
+SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
diff --git a/shells/bash/patches/patch-ac b/shells/bash/patches/patch-ac
index a7735f518a3..091dc75827b 100644
--- a/shells/bash/patches/patch-ac
+++ b/shells/bash/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/10/23 07:48:03 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/31 00:02:28 wiz Exp $
 
---- configure.in.orig	2004-07-21 15:06:54.000000000 -0500
+--- configure.in.orig	2005-12-01 15:36:03.000000000 +0100
 +++ configure.in
-@@ -756,6 +756,16 @@ AC_CHECK_SIZEOF([long long], 8)
+@@ -826,6 +826,16 @@ AC_CHECK_SIZEOF([long long], 8)
  
  AC_CHECK_TYPE(u_int, [unsigned int])
  AC_CHECK_TYPE(u_long, [unsigned long])
diff --git a/shells/bash/patches/patch-ad b/shells/bash/patches/patch-ad
index e6e94aada55..cfb4b5a2ade 100644
--- a/shells/bash/patches/patch-ad
+++ b/shells/bash/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/10/23 07:48:03 minskim Exp $
+$NetBSD: patch-ad,v 1.2 2005/12/31 00:02:28 wiz Exp $
 
---- config.h.in.orig	2004-07-21 15:08:31.000000000 -0500
+--- config.h.in.orig	2005-09-05 04:35:50.000000000 +0200
 +++ config.h.in
-@@ -235,6 +235,9 @@
+@@ -239,6 +239,9 @@
  /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
  #undef HAVE_ALLOCA_H
  
diff --git a/shells/bash/patches/patch-ae b/shells/bash/patches/patch-ae
index 724a151f9f3..223e19b68c8 100644
--- a/shells/bash/patches/patch-ae
+++ b/shells/bash/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/10/23 07:48:03 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/31 00:02:28 wiz Exp $
 
---- configure.orig	2004-07-21 15:18:56.000000000 -0500
+--- configure.orig	2005-12-01 15:44:38.000000000 +0100
 +++ configure
-@@ -18508,6 +18508,74 @@ fi
+@@ -17937,6 +17937,74 @@ fi
  
  
  
diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af
index 42210f4b5cc..3e87233eef3 100644
--- a/shells/bash/patches/patch-af
+++ b/shells/bash/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2005/03/15 02:05:49 garbled Exp $
---- builtins/printf.def.orig	2003-12-19 16:04:06.000000000 -0700
-+++ builtins/printf.def	2005-03-14 18:56:57.000000000 -0700
-@@ -62,6 +62,11 @@
+$NetBSD: patch-af,v 1.2 2005/12/31 00:02:28 wiz Exp $
+--- builtins/printf.def.orig	2005-10-29 20:51:29.000000000 +0200
++++ builtins/printf.def
+@@ -64,6 +64,11 @@ $END
  #include "bashgetopt.h"
  #include "common.h"
  
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.1 2005/03/15 02:05:49 garbled Exp $
  #if !defined (PRIdMAX)
  #  if HAVE_LONG_LONG
  #    define PRIdMAX	"lld"
-@@ -69,6 +74,13 @@
+@@ -71,6 +76,13 @@ $END
  #    define PRIdMAX	"ld"
  #  endif
  #endif
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1 2005/03/15 02:05:49 garbled Exp $
  
  #if !defined (errno)
  extern int errno;
-@@ -344,7 +356,11 @@
+@@ -438,7 +450,11 @@ printf_builtin (list)
  		p = pp = getintmax ();
  		if (p != pp)
  		  {
@@ -39,7 +39,7 @@ $NetBSD: patch-af,v 1.1 2005/03/15 02:05:49 garbled Exp $
  		    PF (f, pp);
  		  }
  		else
-@@ -371,7 +387,11 @@
+@@ -465,7 +481,11 @@ printf_builtin (list)
  		p = pp = getuintmax ();
  		if (p != pp)
  		  {
diff --git a/shells/bash/patches/patch-ag b/shells/bash/patches/patch-ag
index 71181a23343..ecfb34e189b 100644
--- a/shells/bash/patches/patch-ag
+++ b/shells/bash/patches/patch-ag
@@ -1,12 +1,15 @@
-$NetBSD: patch-ag,v 1.1 2005/10/10 19:41:26 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/31 00:02:28 wiz Exp $
 
---- builtins/psize.c.orig	2005-07-05 17:39:02.000000000 +0200
+--- builtins/psize.c.orig	2005-07-07 14:21:32.000000000 +0200
 +++ builtins/psize.c
-@@ -40,7 +40,6 @@
- #include "../command.h"
+@@ -41,10 +41,6 @@
  #include "../general.h"
  #include "../sig.h"
--extern int errno;
  
+-#ifndef errno
+-extern int errno;
+-#endif
+-
  int nw;
  
+ sighandler