10 files changed, 55 insertions, 77 deletions

diff --git a/shells/bash/files/patch-builtins::Makefile.in b/shells/bash/files/patch-builtins::Makefile.in
index 45d34668a9c9..6ff8ae5d6d75 100644
--- a/shells/bash/files/patch-builtins::Makefile.in
+++ b/shells/bash/files/patch-builtins::Makefile.in
@@ -1,11 +1,11 @@
---- builtins/Makefile.in.orig	Mon Oct 11 15:32:28 2004
-+++ builtins/Makefile.in	Mon Oct 11 15:32:58 2004
-@@ -177,7 +177,7 @@
+--- builtins/Makefile.in.orig	Wed Dec 28 19:49:25 2005
++++ builtins/Makefile.in	Wed Dec 28 19:50:01 2005
+@@ -178,7 +178,7 @@
  
  install-help:
  	@-if test -n "${HELPDIR}" && test -d helpfiles ; then \
 -		test -d ${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
 +		test -d ${DESTDIR}${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
- 		( cd helpfiles ; \
- 		  for f in *; do \
+ 		( for f in helpfiles/*; do \
  			echo installing $$f; \
+ 			${INSTALL_DATA} $$f $(DESTDIR)$(HELPDIR); \
diff --git a/shells/bash/files/patch-config-top.h b/shells/bash/files/patch-config-top.h
index 39c10151d5c4..415b137d33e9 100644
--- a/shells/bash/files/patch-config-top.h
+++ b/shells/bash/files/patch-config-top.h
@@ -1,5 +1,5 @@
---- config-top.h.orig	Tue Aug  5 16:36:12 2003
-+++ config-top.h	Mon Oct 11 16:55:40 2004
+--- config-top.h.orig	Wed Dec 28 19:52:23 2005
++++ config-top.h	Wed Dec 28 19:54:12 2005
 @@ -52,18 +52,18 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
@@ -18,7 +18,7 @@
  
  /* Default primary and secondary prompt strings. */
 -#define PPROMPT "\\s-\\v\\$ "
-+#define PPROMPT "\\u@\\h\\$ "
++#define PPROMPT "[\\u@\\h \\w]\\$ "
  #define SPROMPT "> "
  
  /* Undefine this if you don't want the ksh-compatible behavior of reprinting
diff --git a/shells/bash/files/patch-configure b/shells/bash/files/patch-configure
deleted file mode 100644
index 3941f575db2a..000000000000
--- a/shells/bash/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Fix process substitution on FreeBSD systems without fdescfs
-#
-# http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00089.html
-#
---- configure.orig	Fri Oct  8 12:46:28 2004
-+++ configure	Fri Oct  8 12:48:44 2004
-@@ -23803,7 +23803,14 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then
--   bash_cv_dev_fd=standard
-+# check for systems like FreeBSD 5 that only provide /dev/fd/[012]
-+   exec 3<&0
-+   if test -r /dev/fd/3; then
-+     bash_cv_dev_fd=standard
-+   else
-+     bash_cv_dev_fd=absent
-+   fi
-+   exec 3<&-
-  elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
-    bash_cv_dev_fd=whacky
-  else
diff --git a/shells/bash/files/patch-doc::Makefile.in b/shells/bash/files/patch-doc::Makefile.in
index b14453a5e531..4bd0159a793e 100644
--- a/shells/bash/files/patch-doc::Makefile.in
+++ b/shells/bash/files/patch-doc::Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Tue Aug 31 00:34:30 2004
-+++ doc/Makefile.in	Tue Aug 31 00:36:03 2004
+--- doc/Makefile.in.orig	Wed Dec 28 20:00:02 2005
++++ doc/Makefile.in	Wed Dec 28 20:00:58 2005
 @@ -161,14 +161,11 @@
  bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
  	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi
diff --git a/shells/bash/files/patch-doc::bash.1 b/shells/bash/files/patch-doc::bash.1
index f02dfdc9fa36..7aad7f51aa2f 100644
--- a/shells/bash/files/patch-doc::bash.1
+++ b/shells/bash/files/patch-doc::bash.1
@@ -1,6 +1,6 @@
---- doc/bash.1.orig	Mon Oct 11 16:08:41 2004
-+++ doc/bash.1	Mon Oct 11 16:09:35 2004
-@@ -1843,7 +1843,7 @@
+--- doc/bash.1.orig	Wed Dec 28 19:44:28 2005
++++ doc/bash.1	Wed Dec 28 20:03:12 2005
+@@ -1897,7 +1897,7 @@
  .SM
  .B PROMPTING
  below) and used as the primary prompt string.  The default value is
@@ -9,7 +9,7 @@
  .TP
  .B PS2
  The value of this parameter is expanded as with
-@@ -8636,7 +8636,7 @@
+@@ -8784,7 +8784,7 @@
  .SH FILES
  .PD 0
  .TP
diff --git a/shells/bash/files/patch-doc::bashref.texi b/shells/bash/files/patch-doc::bashref.texi
index 555fbd522c66..add4d9b2944b 100644
--- a/shells/bash/files/patch-doc::bashref.texi
+++ b/shells/bash/files/patch-doc::bashref.texi
@@ -1,5 +1,5 @@
---- doc/bashref.texi.orig	Wed Sep  1 22:37:32 2004
-+++ doc/bashref.texi	Wed Sep  1 22:30:57 2004
+--- doc/bashref.texi.orig	Wed Dec 28 19:44:28 2005
++++ doc/bashref.texi	Wed Dec 28 20:09:16 2005
 @@ -1,6 +1,6 @@
  \input texinfo.tex @c -*- texinfo -*-
  @c %**start of header
@@ -17,12 +17,12 @@
  
  This is Edition @value{EDITION}, last updated @value{UPDATED},
  of @cite{The GNU Bash Reference Manual},
-@@ -4218,7 +4218,7 @@
+@@ -4277,7 +4277,7 @@
  
  
  @item PS1
 -The primary prompt string.  The default value is @samp{\s-\v\$ }.
-+The primary prompt string.  The default value is @samp{\u@@\h\$ }.
++The primary prompt string.  The default value is @samp{[\u@@\h \w]\$ }.
  @xref{Printing a Prompt}, for the complete list of escape
  sequences that are expanded before @env{PS1} is displayed.
  
diff --git a/shells/bash/files/patch-lib::readline::display.c b/shells/bash/files/patch-lib::readline::display.c
index 269f52ee03d7..53d0b4f4249a 100644
--- a/shells/bash/files/patch-lib::readline::display.c
+++ b/shells/bash/files/patch-lib::readline::display.c
@@ -4,9 +4,9 @@
 # http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00220.html
 # http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00266.html
 #
---- lib/readline/display.c.orig	2004-11-18 16:24:46.000000000 +0000
-+++ lib/readline/display.c	2004-11-18 17:12:32.904903404 +0000
-@@ -572,11 +572,10 @@
+--- lib/readline/display.c.orig	Wed Nov 30 17:05:02 2005
++++ lib/readline/display.c	Wed Dec 28 20:13:15 2005
+@@ -594,11 +594,10 @@
  
    /* inv_lbreaks[i] is where line i starts in the buffer. */
    inv_lbreaks[newlines = 0] = 0;
diff --git a/shells/bash/files/patch-support::mkversion.sh b/shells/bash/files/patch-support::mkversion.sh
index c7c4d609d230..0f8b460281cb 100644
--- a/shells/bash/files/patch-support::mkversion.sh
+++ b/shells/bash/files/patch-support::mkversion.sh
@@ -1,5 +1,5 @@
---- support/mkversion.sh.orig	Tue Oct 12 11:20:53 2004
-+++ support/mkversion.sh	Tue Oct 12 11:21:10 2004
+--- support/mkversion.sh.orig	Sat Sep 11 11:08:31 2004
++++ support/mkversion.sh	Wed Dec 28 20:15:34 2005
 @@ -67,7 +67,7 @@
  # increment the build version if that's what's required
  
diff --git a/shells/bash/files/xpatch-colonbreakswords b/shells/bash/files/xpatch-colonbreakswords
index c1cae42aaa09..cd565ca232dd 100644
--- a/shells/bash/files/xpatch-colonbreakswords
+++ b/shells/bash/files/xpatch-colonbreakswords
@@ -2,8 +2,8 @@
 # new shopt `colonbreakswords'
 # http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00190.html
 #
---- bashline.c.orig	Wed Oct 13 18:39:13 2004
-+++ bashline.c	Wed Oct 13 19:02:53 2004
+--- bashline.c.orig	Sat Nov  5 18:07:02 2005
++++ bashline.c	Wed Dec 28 19:44:28 2005
 @@ -212,6 +212,11 @@
     host list. */
  int perform_hostname_completion = 1;
@@ -16,7 +16,7 @@
  /* If non-zero, we don't do command completion on an empty line. */
  int no_empty_command_completion;
  
-@@ -222,6 +227,7 @@
+@@ -222,7 +227,8 @@
  
  static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
@@ -25,7 +25,8 @@
 +/* ))) */
  
  static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
-@@ -323,6 +329,80 @@
+ 
+@@ -325,6 +331,80 @@
    return (old_value);
  }
  
@@ -106,7 +107,7 @@
  /* Called once from parse.y if we are going to use readline. */
  void
  initialize_readline ()
-@@ -479,8 +559,12 @@
+@@ -485,8 +565,12 @@
       completion is enabled. */
    enable_hostname_completion (perform_hostname_completion);
  
@@ -120,9 +121,9 @@
    rl_filename_quoting_function = bash_quote_filename;
    rl_filename_dequoting_function = bash_dequote_filename;
    rl_char_is_quoted_p = char_is_quoted;
---- builtins/shopt.def.orig	Wed Oct 13 19:07:57 2004
-+++ builtins/shopt.def	Wed Oct 13 19:10:37 2004
-@@ -82,6 +82,8 @@
+--- builtins/shopt.def.orig	Wed Dec 28 19:38:09 2005
++++ builtins/shopt.def	Wed Dec 28 19:44:28 2005
+@@ -83,6 +83,8 @@
  extern int hist_verify, history_reediting, perform_hostname_completion;
  extern int no_empty_command_completion;
  extern int force_fignore;
@@ -131,7 +132,7 @@
  extern int enable_hostname_completion __P((int));
  #endif
  
-@@ -120,6 +122,9 @@
+@@ -121,6 +123,9 @@
    { "checkwinsize", &check_window_size, (shopt_set_func_t *)NULL },
  #if defined (HISTORY)
    { "cmdhist", &command_oriented_history, (shopt_set_func_t *)NULL },
@@ -141,9 +142,9 @@
  #endif
    { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
    { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
---- doc/bash.1.orig	Wed Oct 13 19:49:55 2004
-+++ doc/bash.1	Wed Oct 13 19:53:28 2004
-@@ -7866,6 +7866,18 @@
+--- doc/bash.1.orig	Wed Dec 28 19:38:09 2005
++++ doc/bash.1	Wed Dec 28 19:44:28 2005
+@@ -7972,6 +7972,18 @@
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  .TP 8
@@ -162,9 +163,9 @@
  .B dotglob
  If set, 
  .B bash
---- doc/bashref.texi.orig	Wed Oct 13 19:53:45 2004
-+++ doc/bashref.texi	Wed Oct 13 19:56:27 2004
-@@ -3577,6 +3577,11 @@
+--- doc/bashref.texi.orig	Wed Dec 28 19:38:09 2005
++++ doc/bashref.texi	Wed Dec 28 19:44:28 2005
+@@ -3598,6 +3598,11 @@
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  
diff --git a/shells/bash/files/xpatch-implicitcd b/shells/bash/files/xpatch-implicitcd
index bbd077cf6217..4d7efb6a00e1 100644
--- a/shells/bash/files/xpatch-implicitcd
+++ b/shells/bash/files/xpatch-implicitcd
@@ -2,8 +2,8 @@
 # new shopt `implicitcd'
 # http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00024.html
 #
---- execute_cmd.c.orig	Sun Jul  4 20:12:58 2004
-+++ execute_cmd.c	Wed Sep  1 22:28:29 2004
+--- execute_cmd.c.orig	Sat Nov  5 17:37:21 2005
++++ execute_cmd.c	Wed Dec 28 19:38:09 2005
 @@ -190,6 +190,9 @@
  /* The line number that the currently executing function starts on. */
  static int function_line_number;
@@ -14,7 +14,7 @@
  /* Set to 1 if fd 0 was the subject of redirection to a subshell.  Global
     so that reader_loop can set it to zero before executing a command. */
  int stdin_redir;
-@@ -2909,6 +2912,20 @@
+@@ -2913,6 +2916,20 @@
    this_command_name = words->word->word;
  
    QUIT;
@@ -35,11 +35,11 @@
  
    /* This command could be a shell builtin or a user-defined function.
       We have already found special builtins by this time, so we do not
---- builtins/shopt.def.orig	Wed Sep  1 22:32:59 2004
-+++ builtins/shopt.def	Wed Sep  1 22:31:27 2004
+--- builtins/shopt.def.orig	Sat Feb 19 19:25:03 2005
++++ builtins/shopt.def	Wed Dec 28 19:38:09 2005
 @@ -66,6 +66,7 @@
  extern int check_window_size;
- extern int glob_ignore_case;
+ extern int glob_ignore_case, match_ignore_case;
  extern int hup_on_exit;
 +extern int implicitcd;
  extern int xpg_echo;
@@ -53,7 +53,7 @@
    { "interactive_comments", &interactive_comments, set_shellopts_after_change },
  #if defined (HISTORY)
    { "lithist", &literal_history, (shopt_set_func_t *)NULL },
-@@ -252,6 +254,7 @@
+@@ -253,6 +255,7 @@
    cdable_vars = mail_warning = 0;
    no_exit_on_failed_exec = print_shift_error = 0;
    check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;
@@ -61,9 +61,9 @@
  
    source_uses_path = promptvars = 1;
  
---- doc/bash.1.orig	Mon Jul 12 17:27:08 2004
-+++ doc/bash.1	Wed Sep  1 22:21:44 2004
-@@ -7970,6 +7970,15 @@
+--- doc/bash.1.orig	Wed Oct 12 12:40:52 2005
++++ doc/bash.1	Wed Dec 28 19:38:09 2005
+@@ -8090,6 +8090,15 @@
  .B SIGHUP
  to all jobs when an interactive login shell exits.
  .TP 8
@@ -79,13 +79,12 @@
  .B interactive_comments
  If set, allow a word beginning with
  .B #
---- doc/bashref.texi.orig	Wed Sep  1 22:37:32 2004
-+++ doc/bashref.texi	Wed Sep  1 22:30:57 2004
-@@ -3661,6 +3661,15 @@
- @item huponexit
+--- doc/bashref.texi.orig	Mon Oct  3 16:07:21 2005
++++ doc/bashref.texi	Wed Dec 28 19:38:09 2005
+@@ -3697,6 +3697,15 @@
  If set, Bash will send @code{SIGHUP} to all jobs when an interactive
  login shell exits (@pxref{Signals}).
-+
+ 
 +@item implicitcd
 +If this is set, a directory name typed as a command is treated as a
 +request to change to that directory.
@@ -94,6 +93,7 @@
 +Changing directory takes precedence over executing a like-named
 +command, but it is done after alias substitutions.
 +Tilde and variable expansions work as expected.
- 
++
  @item interactive_comments
  Allow a word beginning with @samp{#}
+ to cause that word and all remaining characters on that