bash/bash-3.2.dif

--- .pkgextract
+++ .pkgextract	2006-03-27 14:15:25.000000000 +0200
@@ -0,0 +1,15 @@
+tar Oxfj ../bash-3.2-patches.tar.bz2 | patch -p0 -s
+patch -p0 -s --suffix=".manual"   < ../bash-2.03-manual.patch
+patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch
+patch -p0 -s --suffix=".2.4.4"    < ../bash-3.2-2.4.4.patch
+patch -p0 -s --suffix=".evalexp"  < ../bash-3.0-evalexp.patch
+patch -p0 -s --suffix=".warnlc"   < ../bash-3.0-warn-locale.patch
+patch -p0 -s --suffix=".nfs_redir"< ../bash-3.0-nfs_redir.patch
+patch -p0 -s --suffix=".decl"     < ../bash-3.0-decl.patch
+patch -p1 -s --suffix=".random2"  < ../bash-3.1-random.patch
+patch -p0 -s --suffix=".equote"   < ../bash-3.1-extended_quote.patch
+patch -p0 -s --suffix=".printf"   < ../bash-3.2-printf.patch
+patch -p0 -s --suffix=".plugins"  < ../bash-3.1-loadables.dif
+patch -p0 -s --suffix=".valgrind" < ../bash-3.2-valgrind.patch
+patch -p0 -s --suffix=".zerotty"  < ../readline-4.3-input.dif
+patch -p0 -s --suffix=".wrap"     < ../readline-5.2-wrap.patch
+patch -p0 -s --suffix=".conf"     < ../readline-5.2-conf.patch
--- config-top.h
+++ config-top.h	2006-03-27 14:15:25.000000000 +0200
@@ -52,14 +52,14 @@
 /* The default value of the PATH variable. */
 #ifndef DEFAULT_PATH_VALUE
 #define DEFAULT_PATH_VALUE \
-  "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
+  "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:."
 #endif
 
 /* The value for PATH when invoking `command -p'.  This is only used when
    the Posix.2 confstr () function, or CS_PATH define are not present. */
 #ifndef STANDARD_UTILS_PATH
 #define STANDARD_UTILS_PATH \
-  "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
+  "/bin:/usr/bin:/sbin:/usr/sbin"
 #endif
 
 /* Default primary and secondary prompt strings. */
@@ -73,14 +73,14 @@
 #define KSH_COMPATIBLE_SELECT
 
 /* System-wide .bashrc file for interactive shells. */
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
+#define SYS_BASHRC "/etc/bash.bashrc"
 
 /* System-wide .bash_logout for login shells. */
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
 
 /* Define this to make non-interactive shells begun with argv[0][0] == '-'
    run the startup files when not in posix mode. */
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
+#define NON_INTERACTIVE_LOGIN_SHELLS
 
 /* Define this if you want bash to try to check whether it's being run by
    sshd and source the .bashrc if so (like the rshd behavior). */
--- general.h
+++ general.h	2006-03-27 14:15:25.000000000 +0200
@@ -21,10 +21,13 @@
 #if !defined (_GENERAL_H_)
 #define _GENERAL_H_
 
+#include <time.h>
+#include <sys/types.h>
 #include "stdc.h"
 
 #include "bashtypes.h"
 #include "chartypes.h"
+#include "bashline.h"
 
 #if defined (HAVE_SYS_RESOURCE_H) && defined (RLIMTYPE)
 #  if defined (HAVE_SYS_TIME_H)
--- jobs.c
+++ jobs.c	2006-03-27 14:15:25.000000000 +0200
@@ -197,10 +197,10 @@ int previous_job = NO_JOB;
 #endif
 
 /* Last child made by the shell.  */
-pid_t last_made_pid = NO_PID;
+volatile pid_t last_made_pid = NO_PID;
 
 /* Pid of the last asynchronous child. */
-pid_t last_asynchronous_pid = NO_PID;
+volatile pid_t last_asynchronous_pid = NO_PID;
 
 /* The pipeline currently being built. */
 PROCESS *the_pipeline = (PROCESS *)NULL;
@@ -213,7 +213,7 @@ int already_making_children = 0;
 
 /* If this is non-zero, $LINES and $COLUMNS are reset after every process
    exits from get_tty_state(). */
-int check_window_size;
+int check_window_size = 1;
 
 /* Functions local to this file. */
 
--- jobs.h
+++ jobs.h	2006-03-27 14:15:25.000000000 +0200
@@ -162,7 +162,7 @@ extern pid_t fork (), getpid (), getpgrp
 extern struct jobstats js;
 
 extern pid_t original_pgrp, shell_pgrp, pipeline_pgrp;
-extern pid_t last_made_pid, last_asynchronous_pid;
+extern volatile pid_t last_made_pid, last_asynchronous_pid;
 extern int asynchronous_notification;
 
 extern JOB **jobs;
--- parse.y
+++ parse.y	2006-03-27 14:15:25.000000000 +0200
@@ -1182,7 +1182,7 @@ input_file_descriptor ()
 
 #if defined (READLINE)
 char *current_readline_prompt = (char *)NULL;
-char *current_readline_line = (char *)NULL;
+unsigned char *current_readline_line = (unsigned char *)NULL;
 int current_readline_line_index = 0;
 
 static int
--- shell.c
+++ shell.c	2006-03-27 14:15:25.000000000 +0200
@@ -460,7 +460,7 @@ main (argc, argv, env)
   if (dump_translatable_strings)
     read_but_dont_execute = 1;
 
-  if (running_setuid && privileged_mode == 0)
+  if (running_setuid && privileged_mode == 0 /* && act_like_sh == 0 */)
     disable_priv_mode ();
 
   /* Need to get the argument to a -c option processed in the
--- subst.c
+++ subst.c	2006-03-27 14:15:25.000000000 +0200
@@ -2707,6 +2707,7 @@ call_expand_word_internal (w, q, i, c, e
       last_command_exit_value = EXECUTION_FAILURE;
       exp_jump_to_top_level ((result == &expand_word_error) ? DISCARD : FORCE_EOF);
       /* NOTREACHED */
+      return NULL; /* make stupid compiler happy */
     }
   else
     return (result);
--- variables.c
+++ variables.c	2006-03-27 14:15:25.000000000 +0200
@@ -1191,8 +1191,10 @@ assign_random (self, value, unused)
      arrayind_t unused;
 {
   sbrand (strtoul (value, (char **)NULL, 10));
+#if !defined(linux)
   if (subshell_environment)
     seeded_subshell = 1;
+#endif
   return (self);
 }
 
--- builtins/shopt.def
+++ builtins/shopt.def	2006-03-27 14:15:25.000000000 +0200
@@ -252,9 +252,9 @@ reset_shopt_options ()
   allow_null_glob_expansion = glob_dot_filenames = 0;
   cdable_vars = mail_warning = 0;
   no_exit_on_failed_exec = print_shift_error = 0;
-  check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;
+  check_hashed_filenames = cdspelling = expand_aliases = 0;
 
-  source_uses_path = promptvars = 1;
+  check_window_size = source_uses_path = promptvars = 1;
 
 #if defined (EXTENDED_GLOB)
   extended_glob = 0;
--- doc/Makefile.in
+++ doc/Makefile.in	2006-03-27 14:15:25.000000000 +0200
@@ -141,7 +141,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $
 	${RM} $@
 	-${DVIPS} $<
 
-all: ps info dvi text html
+all: info html
 nodvi: ps info text html
 
 PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps 
--- doc/bash.1
+++ doc/bash.1	2006-03-27 14:15:25.000000000 +0200
@@ -4370,8 +4370,8 @@ file (the \fIinputrc\fP file).
 The name of this file is taken from the value of the
 .SM
 .B INPUTRC
-variable.  If that variable is unset, the default is
-.IR ~/.inputrc .
+environment variable. If that variable is unset, readline will read both
+.IR /etc/inputrc " and " ~/.inputrc .
 When a program which uses the readline library starts up, the
 initialization file is read, and the key bindings and variables
 are set.
@@ -8816,6 +8816,9 @@ The individual login shell cleanup file,
 .TP
 .FN ~/.inputrc
 Individual \fIreadline\fP initialization file
+.TP
+.FN /etc/inputrc
+System \fBreadline\fP initialization file
 .PD
 .SH AUTHORS
 Brian Fox, Free Software Foundation
--- support/rlvers.sh
+++ support/rlvers.sh	2006-03-27 14:15:25.000000000 +0200
@@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers
 
 # defaults
 CC=cc
-RL_LIBDIR=/usr/local/lib
-RL_INCDIR=/usr/local/include
+RL_LIBDIR=/lib
+RL_INCDIR=/usr/include
 
-TERMCAP_LIB="-ltermcap"
+TERMCAP_LIB="-lncurses"
 
 # cannot rely on the presence of getopts
 while [ $# -gt 0 ]; do
--- support/shobj-conf
+++ support/shobj-conf	2006-09-22 16:11:58.000000000 +0200
@@ -108,10 +108,11 @@ sunos5*|solaris2*)
 linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+	SHOBJ_LDFLAGS='-shared'
 
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+	SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+	SHLIB_LIBS=-lncurses
 	;;
 
 freebsd2* | netbsd*)