diff --git a/bash-2.03-manual.patch b/bash-2.03-manual.patch
index 0ac0e44..9b62574 100644
--- a/bash-2.03-manual.patch
+++ b/bash-2.03-manual.patch
@@ -1,6 +1,8 @@
---- doc/bash.1
-+++ doc/bash.1	Mon Oct 25 17:29:54 2004
-@@ -113,6 +113,12 @@
+Index: doc/bash.1
+===================================================================
+--- doc/bash.1.orig
++++ doc/bash.1
+@@ -115,6 +115,12 @@ processing, then commands are read from
  This option allows the positional parameters to be set
  when invoking an interactive shell.
  .TP
@@ -12,8 +14,8 @@
 +.TP
  .B \-D
  A list of all double-quoted strings preceded by \fB$\fP
- is printed on the standard ouput.
-@@ -5799,6 +5805,11 @@
+ is printed on the standard output.
+@@ -6211,6 +6217,11 @@ Apply the following `\fBs\fP' modifier o
  .SH "SHELL BUILTIN COMMANDS"
  .\" start of bash_builtins
  .zZ
@@ -25,7 +27,7 @@
  .PP
  Unless otherwise noted, each builtin command documented in this
  section as accepting options preceded by
-@@ -8534,6 +8545,11 @@
+@@ -9205,6 +9216,11 @@ process or job waited for.
  .SH "RESTRICTED SHELL"
  .\" rbash.1
  .zY
@@ -37,9 +39,11 @@
  .PP
  If
  .B bash
---- doc/builtins.1
-+++ doc/builtins.1	Mon Oct 25 17:29:20 2004
-@@ -10,6 +10,6 @@
+Index: doc/builtins.1
+===================================================================
+--- doc/builtins.1.orig
++++ doc/builtins.1
+@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim
  ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
  .SH BASH BUILTIN COMMANDS
  .nr zZ 1
@@ -47,8 +51,10 @@
 +.so /usr/share/man/man1/bash.1
  .SH SEE ALSO
  bash(1), sh(1)
---- doc/rbash.1
-+++ doc/rbash.1	Mon Oct 25 17:29:20 2004
+Index: doc/rbash.1
+===================================================================
+--- doc/rbash.1.orig
++++ doc/rbash.1
 @@ -3,6 +3,6 @@
  rbash \- restricted bash, see \fBbash\fR(1)
  .SH RESTRICTED SHELL
diff --git a/bash-3.0-decl.patch b/bash-3.0-decl.patch
index 7fa68f0..71144ed 100644
--- a/bash-3.0-decl.patch
+++ b/bash-3.0-decl.patch
@@ -1,8 +1,10 @@
---- support/printenv.c
-+++ support/printenv.c	2005-09-19 15:09:08.000000000 +0200
-@@ -24,6 +24,7 @@
-    with Bash; see the file COPYING.  If not, write to the Free Software
-    Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+Index: support/printenv.c
+===================================================================
+--- support/printenv.c.orig
++++ support/printenv.c
+@@ -30,6 +30,7 @@
+ 
+ #include "bashansi.h"
  
 +#include <string.h>
  extern char **environ;
diff --git a/bash-3.0-evalexp.patch b/bash-3.0-evalexp.patch
index 0f018b9..6bc91f1 100644
--- a/bash-3.0-evalexp.patch
+++ b/bash-3.0-evalexp.patch
@@ -1,6 +1,8 @@
---- expr.c
-+++ expr.c	2004-07-30 16:39:48.000000000 +0200
-@@ -406,8 +406,8 @@
+Index: expr.c
+===================================================================
+--- expr.c.orig
++++ expr.c
+@@ -410,8 +410,8 @@ expassign ()
    value = expcond ();
    if (curtok == EQ || curtok == OP_ASSIGN)
      {
diff --git a/bash-3.0-nfs_redir.patch b/bash-3.0-nfs_redir.patch
index bd63943..ac8e347 100644
--- a/bash-3.0-nfs_redir.patch
+++ b/bash-3.0-nfs_redir.patch
@@ -1,6 +1,8 @@
---- redir.c
-+++ redir.c	2005-01-28 15:22:21.950230271 +0100
-@@ -169,12 +169,13 @@
+Index: redir.c
+===================================================================
+--- redir.c.orig
++++ redir.c
+@@ -176,12 +176,13 @@ redirection_error (temp, error)
     how to undo the redirections later, if non-zero.  If flags & RX_CLEXEC
     is non-zero, file descriptors opened in do_redirection () have their
     close-on-exec flag set. */
@@ -15,7 +17,7 @@
    REDIRECT *temp;
  
    if (flags & RX_UNDOABLE)
-@@ -190,14 +191,21 @@
+@@ -197,14 +198,21 @@ do_redirections (list, flags)
  
    for (temp = list; temp; temp = temp->next)
      {
@@ -38,16 +40,16 @@
  }
  
  /* Return non-zero if the redirection pointed to by REDIRECT has a
-@@ -759,6 +767,8 @@
+@@ -786,6 +794,8 @@ do_redirection_internal (redirect, flags
  #if defined (BUFFERED_INPUT)
  	  check_bash_input (redirector);
  #endif
 +	  if ((fd != redirector) && (close(redirector) < 0) && (errno != EBADF))
 +	    close_before_dup2_err = errno;
  
- 	  if ((fd != redirector) && (dup2 (fd, redirector) < 0))
- 	    return (errno);
-@@ -838,6 +848,9 @@
+ 	  /* Make sure there is no pending output before we change the state
+ 	     of the underlying file descriptor, since the builtins use stdio
+@@ -879,6 +889,9 @@ do_redirection_internal (redirect, flags
  #if defined (BUFFERED_INPUT)
  	      check_bash_input (redirector);
  #endif
@@ -57,7 +59,7 @@
  	      if (fd != redirector && dup2 (fd, redirector) < 0)
  		{
  		  r = errno;
-@@ -880,6 +893,9 @@
+@@ -920,6 +933,9 @@ do_redirection_internal (redirect, flags
  #if defined (BUFFERED_INPUT)
  	  check_bash_input (redirector);
  #endif
@@ -67,9 +69,11 @@
  	  /* This is correct.  2>&1 means dup2 (1, 2); */
  	  if (dup2 (redir_fd, redirector) < 0)
  	    return (errno);
---- execute_cmd.c
-+++ execute_cmd.c	2005-01-28 16:09:10.383937390 +0100
-@@ -119,7 +119,7 @@
+Index: execute_cmd.c
+===================================================================
+--- execute_cmd.c.orig
++++ execute_cmd.c
+@@ -121,7 +121,7 @@ static void close_pipes __P((int, int));
  static void do_piping __P((int, int));
  static void bind_lastarg __P((char *));
  static int shell_control_structure __P((enum command_type));
@@ -78,7 +82,7 @@
  
  #if defined (JOB_CONTROL)
  static int restore_signal_mask __P((sigset_t *));
-@@ -393,12 +393,13 @@
+@@ -417,12 +417,13 @@ shell_control_structure (type)
  
  /* A function to use to unwind_protect the redirection undo list
     for loops. */
@@ -94,7 +98,7 @@
  }
  
  #if 0
-@@ -603,7 +604,7 @@
+@@ -664,7 +665,7 @@ execute_command_internal (command, async
       redirection.)  */
    if (do_redirections (command->redirects, RX_ACTIVE|RX_UNDOABLE) != 0)
      {
@@ -102,17 +106,17 @@
 +      (void)cleanup_redirects (redirection_undo_list);
        redirection_undo_list = (REDIRECT *)NULL;
        dispose_exec_redirects ();
-       return (EXECUTION_FAILURE);
-@@ -2593,7 +2594,7 @@
+       return (last_command_exit_value = EXECUTION_FAILURE);
+@@ -3314,7 +3315,7 @@ execute_null_command (redirects, pipe_in
+      REDIRECT *redirects;
       int pipe_in, pipe_out, async;
-      pid_t old_last_command_subst_pid;
  {
 -  int r;
 +  int r, s;
  
    if (pipe_in != NO_PIPE || pipe_out != NO_PIPE || async)
      {
-@@ -2632,10 +2633,10 @@
+@@ -3361,10 +3362,10 @@ execute_null_command (redirects, pipe_in
  	 substitution.  Otherwise, return EXECUTION_SUCCESS. */
  
        r = do_redirections (redirects, RX_ACTIVE|RX_UNDOABLE);
@@ -123,9 +127,9 @@
 -      if (r != 0)
 +      if (r != 0 || s != 0)
  	return (EXECUTION_FAILURE);
-       else if (old_last_command_subst_pid != last_command_subst_pid)
+       else if (last_command_subst_pid != NO_PID)
  	return (last_command_exit_value);
-@@ -3404,7 +3405,7 @@
+@@ -4238,7 +4239,7 @@ execute_builtin_or_function (words, buil
  
    if (do_redirections (redirects, RX_ACTIVE|RX_UNDOABLE) != 0)
      {
@@ -134,7 +138,7 @@
        redirection_undo_list = (REDIRECT *)NULL;
        dispose_exec_redirects ();
        return (EX_REDIRFAIL);	/* was EXECUTION_FAILURE */
-@@ -3463,8 +3464,10 @@
+@@ -4299,8 +4300,10 @@ execute_builtin_or_function (words, buil
  
    if (redirection_undo_list)
      {
diff --git a/bash-3.0-warn-locale.patch b/bash-3.0-warn-locale.patch
index 6167fed..ad488d8 100644
--- a/bash-3.0-warn-locale.patch
+++ b/bash-3.0-warn-locale.patch
@@ -1,5 +1,7 @@
---- locale.c
-+++ locale.c	2004-09-03 12:56:10.000000000 +0200
+Index: locale.c
+===================================================================
+--- locale.c.orig
++++ locale.c
 @@ -29,6 +29,10 @@
  #include "bashintl.h"
  #include "bashansi.h"
@@ -9,9 +11,9 @@
 +#include <unistd.h>
 +#include <errno.h>
  #include "chartypes.h"
+ #include <errno.h>
  
- #include "shell.h"
-@@ -63,6 +67,15 @@
+@@ -68,6 +72,15 @@ void
  set_default_locale ()
  {
  #if defined (HAVE_SETLOCALE)
diff --git a/bash-3.2-2.4.4.patch b/bash-3.2-2.4.4.patch
index fd45768..f3edf3a 100644
--- a/bash-3.2-2.4.4.patch
+++ b/bash-3.2-2.4.4.patch
@@ -1,6 +1,8 @@
---- array.c
-+++ array.c	2006-11-14 10:54:22.000000000 +0100
-@@ -724,7 +724,7 @@ char	*s, *sep;
+Index: array.c
+===================================================================
+--- array.c.orig
++++ array.c
+@@ -877,7 +877,7 @@ char	*s, *sep;
   * To make a running version, compile -DTEST_ARRAY and link with:
   * 	xmalloc.o syntax.o lib/malloc/libmalloc.a lib/sh/libsh.a
   */
@@ -9,8 +11,10 @@
  
  int
  signal_is_trapped(s)
---- hashlib.c
-+++ hashlib.c	2006-11-14 10:54:36.000000000 +0100
+Index: hashlib.c
+===================================================================
+--- hashlib.c.orig
++++ hashlib.c
 @@ -381,7 +381,7 @@ hash_pstats (table, name)
  
  HASH_TABLE *table, *ntable;
@@ -20,9 +24,11 @@
  
  int
  signal_is_trapped (s)
---- jobs.c
-+++ jobs.c	2001-05-02 18:20:31.000000000 +0200
-@@ -1701,6 +1701,15 @@ make_child (command, async_p)
+Index: jobs.c
+===================================================================
+--- jobs.c.orig
++++ jobs.c
+@@ -1735,6 +1735,15 @@ make_child (command, async_p)
        pid_t mypid;
  
        mypid = getpid ();
@@ -38,8 +44,10 @@
  #if defined (BUFFERED_INPUT)
        /* Close default_buffered_input if it's > 0.  We don't close it if it's
  	 0 because that's the file descriptor used when redirecting input,
---- quit.h
-+++ quit.h	2006-11-14 10:43:18.000000000 +0100
+Index: quit.h
+===================================================================
+--- quit.h.orig
++++ quit.h
 @@ -21,9 +21,13 @@
  #if !defined (_QUIT_H_)
  #define _QUIT_H_
@@ -56,9 +64,11 @@
  
  /* Macro to call a great deal.  SIGINT just sets the interrupt_state variable.
     When it is safe, put QUIT in the code, and the "interrupt" will take
---- sig.c
-+++ sig.c	2006-11-14 10:53:51.000000000 +0100
-@@ -59,13 +59,13 @@ extern int loop_level, continuing, break
+Index: sig.c
+===================================================================
+--- sig.c.orig
++++ sig.c
+@@ -61,13 +61,13 @@ extern int comsub_ignore_return;
  extern int parse_and_execute_level, shell_initialized;
  
  /* Non-zero after SIGINT. */
@@ -75,7 +85,7 @@
  
  /* The environment at the top-level R-E loop.  We use this in
     the case of error return. */
-@@ -77,10 +77,10 @@ sigset_t top_level_mask;
+@@ -79,10 +79,10 @@ sigset_t top_level_mask;
  #endif /* JOB_CONTROL */
  
  /* When non-zero, we throw_to_top_level (). */
@@ -88,8 +98,10 @@
  
  #if defined (SIGWINCH)
  static SigHandler *old_winch = (SigHandler *)SIG_DFL;
---- sig.h
-+++ sig.h	2006-11-14 10:49:32.000000000 +0100
+Index: sig.h
+===================================================================
+--- sig.h.orig
++++ sig.h
 @@ -108,11 +108,15 @@ do { \
  
  #endif /* JOB_CONTROL */
@@ -109,9 +121,11 @@
  
  /* Functions from sig.c. */
  extern sighandler termsig_sighandler __P((int));
---- examples/loadables/tee.c
-+++ examples/loadables/tee.c	2006-11-14 11:31:29.000000000 +0100
-@@ -17,6 +17,7 @@
+Index: examples/loadables/tee.c
+===================================================================
+--- examples/loadables/tee.c.orig
++++ examples/loadables/tee.c
+@@ -35,6 +35,7 @@
  #include "bashansi.h"
  
  #include <stdio.h>
@@ -119,7 +133,7 @@
  #include <errno.h>
  
  #include "builtins.h"
-@@ -37,7 +38,7 @@ static FLIST *tee_flist;
+@@ -56,7 +57,7 @@ static FLIST *tee_flist;
  
  #define TEE_BUFSIZE	8192
  
diff --git a/bash-3.2-longjmp.dif b/bash-3.2-longjmp.dif
index 75f8315..9583377 100644
--- a/bash-3.2-longjmp.dif
+++ b/bash-3.2-longjmp.dif
@@ -1,6 +1,8 @@
---- execute_cmd.c.mm	2008-04-22 14:03:07.000000000 +0000
-+++ execute_cmd.c	2008-04-28 01:38:19.000000000 +0000
-@@ -24,6 +24,7 @@
+Index: execute_cmd.c
+===================================================================
+--- execute_cmd.c.orig
++++ execute_cmd.c
+@@ -25,6 +25,7 @@
  #endif /* _AIX && RISC6000 && !__GNUC__ */
  
  #include <stdio.h>
@@ -8,7 +10,7 @@
  #include "chartypes.h"
  #include "bashtypes.h"
  #if !defined (_MINIX) && defined (HAVE_SYS_FILE_H)
-@@ -4013,6 +4014,23 @@ shell_execve (command, args, env)
+@@ -4764,6 +4765,23 @@ shell_execve (command, args, env)
    /* We have committed to attempting to execute the contents of this file
       as shell commands. */
  
@@ -32,7 +34,7 @@
    initialize_subshell ();
  
    set_sigint_handler ();
-@@ -4055,6 +4073,8 @@ shell_execve (command, args, env)
+@@ -4806,6 +4824,8 @@ shell_execve (command, args, env)
  
    longjmp (subshell_top_level, 1);
    /*NOTREACHED*/
diff --git a/bash-3.2-printf.patch b/bash-3.2-printf.patch
index 29012ea..9bfe7f7 100644
--- a/bash-3.2-printf.patch
+++ b/bash-3.2-printf.patch
@@ -1,6 +1,8 @@
---- builtins/printf.def
-+++ builtins/printf.def	2006-07-27 17:11:19.000000000 +0200
-@@ -37,6 +37,7 @@ shell variable VAR rather than being sen
+Index: builtins/printf.def
+===================================================================
+--- builtins/printf.def.orig
++++ builtins/printf.def
+@@ -47,6 +47,7 @@ error occurs.
  $END
  
  #include <config.h>
@@ -8,7 +10,7 @@
  
  #include "../bashtypes.h"
  
-@@ -501,12 +502,20 @@ printf_builtin (list)
+@@ -529,12 +530,20 @@ printf_builtin (list)
  	    case 'A':
  #endif
  	      {
diff --git a/bash-3.2-sigrestart.patch b/bash-3.2-sigrestart.patch
index 2ea8993..e2b5414 100644
--- a/bash-3.2-sigrestart.patch
+++ b/bash-3.2-sigrestart.patch
@@ -1,6 +1,8 @@
---- jobs.c
-+++ jobs.c	2008-01-08 19:10:15.575513000 +0100
-@@ -2344,7 +2344,11 @@ wait_for (pid)
+Index: jobs.c
+===================================================================
+--- jobs.c.orig
++++ jobs.c
+@@ -2417,7 +2417,11 @@ wait_for (pid)
  	  act.sa_handler = SIG_DFL;
  	  sigemptyset (&act.sa_mask);
  	  sigemptyset (&oact.sa_mask);
@@ -12,9 +14,11 @@
  	  sigaction (SIGCHLD, &act, &oact);
  #  endif
  	  queue_sigchld = 1;
---- sig.c
-+++ sig.c	2008-04-02 12:42:23.742406622 +0200
-@@ -586,6 +586,17 @@ set_signal_handler (sig, handler)
+Index: sig.c
+===================================================================
+--- sig.c.orig
++++ sig.c
+@@ -654,6 +654,17 @@ set_signal_handler (sig, handler)
      act.sa_flags |= SA_INTERRUPT;	/* XXX */
    else
      act.sa_flags |= SA_RESTART;		/* XXX */
diff --git a/bash-4.0-extended_quote.patch b/bash-4.0-extended_quote.patch
index 8d6c630..7a56ede 100644
--- a/bash-4.0-extended_quote.patch
+++ b/bash-4.0-extended_quote.patch
@@ -1,6 +1,8 @@
---- parse.y
-+++ parse.y	2009-02-27 16:09:21.720002034 +0100
-@@ -3101,7 +3101,7 @@ parse_matched_pair (qc, open, close, len
+Index: parse.y
+===================================================================
+--- parse.y.orig
++++ parse.y
+@@ -3106,7 +3106,7 @@ parse_matched_pair (qc, open, close, len
  		  ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen);
  		  xfree (nestret);
  
@@ -9,7 +11,7 @@
  		    {
  		      nestret = sh_single_quote (ttrans);
  		      free (ttrans);
-@@ -3470,7 +3470,7 @@ eof_error:
+@@ -3517,7 +3517,7 @@ eof_error:
  	      ttrans = ansiexpand (nestret, 0, nestlen - 1, &ttranslen);
  	      xfree (nestret);
  
diff --git a/bash-4.0-headers.dif b/bash-4.0-headers.dif
index ee0774a..83a88f5 100644
--- a/bash-4.0-headers.dif
+++ b/bash-4.0-headers.dif
@@ -1,5 +1,7 @@
---- examples/loadables/Makefile.in
-+++ examples/loadables/Makefile.in	2009-06-05 11:50:08.745961844 +0000
+Index: examples/loadables/Makefile.in
+===================================================================
+--- examples/loadables/Makefile.in.orig
++++ examples/loadables/Makefile.in
 @@ -28,6 +28,9 @@ includedir = @includedir@
  
  datarootdir = @datarootdir@
diff --git a/bash-4.0-loadables.dif b/bash-4.0-loadables.dif
index 70765f0..182f946 100644
--- a/bash-4.0-loadables.dif
+++ b/bash-4.0-loadables.dif
@@ -1,5 +1,7 @@
---- examples/loadables/Makefile.in
-+++ examples/loadables/Makefile.in	2006-09-25 13:31:55.000000000 +0200
+Index: examples/loadables/Makefile.in
+===================================================================
+--- examples/loadables/Makefile.in.orig
++++ examples/loadables/Makefile.in
 @@ -83,7 +83,7 @@ INC = -I. -I.. -I$(topdir) -I$(topdir)/l
  	$(SHOBJ_CC) $(SHOBJ_CFLAGS) $(CCFLAGS) $(INC) -c -o $@ $<
  
@@ -9,8 +11,10 @@
  	  tty pathchk tee head mkdir rmdir printenv id whoami \
  	  uname sync push ln unlink cut realpath getconf strftime mypid
  OTHERPROG = necho hello cat
---- examples/loadables/basename.c
-+++ examples/loadables/basename.c	2006-09-25 13:49:31.000000000 +0200
+Index: examples/loadables/basename.c
+===================================================================
+--- examples/loadables/basename.c.orig
++++ examples/loadables/basename.c
 @@ -9,10 +9,13 @@
  #endif
  
@@ -26,8 +30,10 @@
  basename_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/cat.c
-+++ examples/loadables/cat.c	2006-09-25 13:37:46.000000000 +0200
+Index: examples/loadables/cat.c
+===================================================================
+--- examples/loadables/cat.c.orig
++++ examples/loadables/cat.c
 @@ -25,8 +25,10 @@
  #include <fcntl.h>
  #include <errno.h>
@@ -40,8 +46,10 @@
  
  #ifndef errno
  extern int errno;
---- examples/loadables/cut.c
-+++ examples/loadables/cut.c	2006-09-25 14:00:21.000000000 +0200
+Index: examples/loadables/cut.c
+===================================================================
+--- examples/loadables/cut.c.orig
++++ examples/loadables/cut.c
 @@ -60,8 +60,10 @@ static const char sccsid[] = "@(#)cut.c
  #  include <unistd.h>
  #endif
@@ -63,8 +71,10 @@
  			if (ch == '\n')
  				break;
  			if (*pos++)
---- examples/loadables/dirname.c
-+++ examples/loadables/dirname.c	2006-09-25 13:49:38.000000000 +0200
+Index: examples/loadables/dirname.c
+===================================================================
+--- examples/loadables/dirname.c.orig
++++ examples/loadables/dirname.c
 @@ -27,10 +27,13 @@
  #endif
  
@@ -80,8 +90,10 @@
  dirname_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/finfo.c
-+++ examples/loadables/finfo.c	2006-09-25 13:48:52.000000000 +0200
+Index: examples/loadables/finfo.c
+===================================================================
+--- examples/loadables/finfo.c.orig
++++ examples/loadables/finfo.c
 @@ -20,6 +20,8 @@
  #include "bashansi.h"
  #include "shell.h"
@@ -144,8 +156,10 @@
  
    v = make_builtin_argv (list, &c);
    r = finfo_main (c, v);
---- examples/loadables/getconf.c
-+++ examples/loadables/getconf.c	2006-09-25 14:02:33.000000000 +0200
+Index: examples/loadables/getconf.c
+===================================================================
+--- examples/loadables/getconf.c.orig
++++ examples/loadables/getconf.c
 @@ -65,6 +65,8 @@
  #include "bashansi.h"
  #include "shell.h"
@@ -182,8 +196,10 @@
  
  	builtin_usage();
  	printf("Acceptable variable names are:\n");
---- examples/loadables/head.c
-+++ examples/loadables/head.c	2006-09-25 13:55:24.000000000 +0200
+Index: examples/loadables/head.c
+===================================================================
+--- examples/loadables/head.c.orig
++++ examples/loadables/head.c
 @@ -38,6 +38,8 @@
  
  #include "builtins.h"
@@ -213,8 +229,10 @@
    munge_list (list);	/* change -num into -n num */
  
    reset_internal_getopt ();
---- examples/loadables/hello.c
-+++ examples/loadables/hello.c	2006-09-25 13:38:25.000000000 +0200
+Index: examples/loadables/hello.c
+===================================================================
+--- examples/loadables/hello.c.orig
++++ examples/loadables/hello.c
 @@ -11,8 +11,10 @@
  
  #include <stdio.h>
@@ -227,8 +245,10 @@
  #include "bashgetopt.h"
  
  /* A builtin `xxx' is normally implemented with an `xxx_builtin' function.
---- examples/loadables/id.c
-+++ examples/loadables/id.c	2006-09-25 13:57:41.000000000 +0200
+Index: examples/loadables/id.c
+===================================================================
+--- examples/loadables/id.c.orig
++++ examples/loadables/id.c
 @@ -47,6 +47,8 @@ extern struct group *getgrgid ();
  
  #include "shell.h"
@@ -247,8 +267,10 @@
  static int inituser ();
  
  static int id_pruser ();
---- examples/loadables/ln.c
-+++ examples/loadables/ln.c	2006-09-25 13:59:09.000000000 +0200
+Index: examples/loadables/ln.c
+===================================================================
+--- examples/loadables/ln.c.orig
++++ examples/loadables/ln.c
 @@ -33,8 +33,10 @@
  #include <stdio.h>
  #include <errno.h>
@@ -269,8 +291,10 @@
  ln_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/logname.c
-+++ examples/loadables/logname.c	2006-09-25 13:30:40.000000000 +0200
+Index: examples/loadables/logname.c
+===================================================================
+--- examples/loadables/logname.c.orig
++++ examples/loadables/logname.c
 @@ -27,8 +27,10 @@
  #include <stdio.h>
  #include <errno.h>
@@ -283,8 +307,10 @@
  #include "common.h"
  
  #if !defined (errno)
---- examples/loadables/mkdir.c
-+++ examples/loadables/mkdir.c	2006-09-25 13:56:07.000000000 +0200
+Index: examples/loadables/mkdir.c
+===================================================================
+--- examples/loadables/mkdir.c.orig
++++ examples/loadables/mkdir.c
 @@ -31,8 +31,10 @@
  #  include <unistd.h>
  #endif
@@ -315,8 +341,10 @@
      {
        *p = '\0';
        if (stat (npath, &sb) != 0)
---- examples/loadables/necho.c
-+++ examples/loadables/necho.c	2006-09-25 13:39:26.000000000 +0200
+Index: examples/loadables/necho.c
+===================================================================
+--- examples/loadables/necho.c.orig
++++ examples/loadables/necho.c
 @@ -21,9 +21,15 @@
     along with Bash.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -334,8 +362,10 @@
  
  necho_builtin (list)
  WORD_LIST *list;
---- examples/loadables/pathchk.c
-+++ examples/loadables/pathchk.c	2006-09-25 13:53:13.000000000 +0200
+Index: examples/loadables/pathchk.c
+===================================================================
+--- examples/loadables/pathchk.c.orig
++++ examples/loadables/pathchk.c
 @@ -58,8 +58,10 @@
  #include <stdio.h>
  #include <errno.h>
@@ -385,8 +415,10 @@
  	     path, strlen (path), path_max);
        return 1;
      }
---- examples/loadables/print.c
-+++ examples/loadables/print.c	2006-09-25 13:23:46.000000000 +0200
+Index: examples/loadables/print.c
+===================================================================
+--- examples/loadables/print.c.orig
++++ examples/loadables/print.c
 @@ -33,6 +33,8 @@
  #include "bashansi.h"
  #include "shell.h"
@@ -405,8 +437,10 @@
    WORD_LIST *l;
  
    nflag = raw = sflag = 0;
---- examples/loadables/printenv.c
-+++ examples/loadables/printenv.c	2006-09-25 13:39:47.000000000 +0200
+Index: examples/loadables/printenv.c
+===================================================================
+--- examples/loadables/printenv.c.orig
++++ examples/loadables/printenv.c
 @@ -26,8 +26,10 @@
  #include <config.h>
  #include <stdio.h>
@@ -419,8 +453,10 @@
  #include "bashgetopt.h"
  #include "common.h"
  
---- examples/loadables/push.c
-+++ examples/loadables/push.c	2006-09-25 13:39:53.000000000 +0200
+Index: examples/loadables/push.c
+===================================================================
+--- examples/loadables/push.c.orig
++++ examples/loadables/push.c
 @@ -25,8 +25,10 @@
  #include <stdio.h>
  #include <errno.h>
@@ -433,8 +469,10 @@
  #include "jobs.h"
  #include "bashgetopt.h"
  #include "common.h"
---- examples/loadables/realpath.c
-+++ examples/loadables/realpath.c	2006-09-25 14:03:01.000000000 +0200
+Index: examples/loadables/realpath.c
+===================================================================
+--- examples/loadables/realpath.c.orig
++++ examples/loadables/realpath.c
 @@ -49,8 +49,10 @@
  #include <maxpath.h>
  #include <errno.h>
@@ -455,8 +493,10 @@
  realpath_builtin(list)
  WORD_LIST	*list;
  {
---- examples/loadables/rmdir.c
-+++ examples/loadables/rmdir.c	2006-09-25 13:56:28.000000000 +0200
+Index: examples/loadables/rmdir.c
+===================================================================
+--- examples/loadables/rmdir.c.orig
++++ examples/loadables/rmdir.c
 @@ -24,14 +24,17 @@
  
  #include <stdio.h>
@@ -476,8 +516,10 @@
  rmdir_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/sleep.c
-+++ examples/loadables/sleep.c	2009-02-27 16:36:23.740001554 +0100
+Index: examples/loadables/sleep.c
+===================================================================
+--- examples/loadables/sleep.c.orig
++++ examples/loadables/sleep.c
 @@ -46,6 +46,8 @@
  
  #include "shell.h"
@@ -487,8 +529,10 @@
  #include "common.h"
  
  #define RETURN(x) \
---- examples/loadables/strftime.c
-+++ examples/loadables/strftime.c	2006-09-25 13:40:17.000000000 +0200
+Index: examples/loadables/strftime.c
+===================================================================
+--- examples/loadables/strftime.c.orig
++++ examples/loadables/strftime.c
 @@ -31,8 +31,10 @@
  
  #include <stdio.h>
@@ -501,8 +545,10 @@
  #include "common.h"
  
  int
---- examples/loadables/sync.c
-+++ examples/loadables/sync.c	2006-09-25 13:58:50.000000000 +0200
+Index: examples/loadables/sync.c
+===================================================================
+--- examples/loadables/sync.c.orig
++++ examples/loadables/sync.c
 @@ -24,10 +24,13 @@
  #include <unistd.h>
  #endif
@@ -518,8 +564,10 @@
  sync_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/tee.c
-+++ examples/loadables/tee.c	2006-09-25 13:54:21.000000000 +0200
+Index: examples/loadables/tee.c
+===================================================================
+--- examples/loadables/tee.c.orig
++++ examples/loadables/tee.c
 @@ -38,8 +38,10 @@
  #include <signal.h>
  #include <errno.h>
@@ -549,8 +597,10 @@
    reset_internal_getopt ();
    append = nointr = 0;
    tee_flist = (FLIST *)NULL;
---- examples/loadables/template.c
-+++ examples/loadables/template.c	2006-09-25 13:40:33.000000000 +0200
+Index: examples/loadables/template.c
+===================================================================
+--- examples/loadables/template.c.orig
++++ examples/loadables/template.c
 @@ -11,8 +11,10 @@
  #include <stdio.h>
  #include <errno.h>
@@ -563,8 +613,10 @@
  #include "bashgetopt.h"
  
  #if !defined (errno)
---- examples/loadables/truefalse.c
-+++ examples/loadables/truefalse.c	2006-09-25 13:40:42.000000000 +0200
+Index: examples/loadables/truefalse.c
+===================================================================
+--- examples/loadables/truefalse.c.orig
++++ examples/loadables/truefalse.c
 @@ -20,18 +20,24 @@
  
  #include <config.h>
@@ -592,8 +644,10 @@
       WORD_LIST *list;
  {
    return EXECUTION_FAILURE;
---- examples/loadables/tty.c
-+++ examples/loadables/tty.c	2006-09-25 13:49:53.000000000 +0200
+Index: examples/loadables/tty.c
+===================================================================
+--- examples/loadables/tty.c.orig
++++ examples/loadables/tty.c
 @@ -23,13 +23,16 @@
  #include "config.h"
  
@@ -612,8 +666,10 @@
  tty_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/uname.c
-+++ examples/loadables/uname.c	2006-09-25 13:58:18.000000000 +0200
+Index: examples/loadables/uname.c
+===================================================================
+--- examples/loadables/uname.c.orig
++++ examples/loadables/uname.c
 @@ -42,8 +42,10 @@ struct utsname {
  
  #include <errno.h>
@@ -639,8 +695,10 @@
    struct utsname uninfo;
  
    uname_flags = 0;
---- examples/loadables/unlink.c
-+++ examples/loadables/unlink.c	2006-09-25 13:59:37.000000000 +0200
+Index: examples/loadables/unlink.c
+===================================================================
+--- examples/loadables/unlink.c.orig
++++ examples/loadables/unlink.c
 @@ -30,14 +30,17 @@
  #include <stdio.h>
  #include <errno.h>
@@ -660,8 +718,10 @@
  unlink_builtin (list)
       WORD_LIST *list;
  {
---- examples/loadables/whoami.c
-+++ examples/loadables/whoami.c	2006-09-25 13:57:54.000000000 +0200
+Index: examples/loadables/whoami.c
+===================================================================
+--- examples/loadables/whoami.c.orig
++++ examples/loadables/whoami.c
 @@ -23,11 +23,14 @@
  #include <config.h>
  #include <stdio.h>
@@ -678,8 +738,10 @@
  whoami_builtin (list)
       WORD_LIST *list;
  {
---- shell.h
-+++ shell.h	2009-03-02 14:39:17.706427251 +0100
+Index: shell.h
+===================================================================
+--- shell.h.orig
++++ shell.h
 @@ -22,6 +22,9 @@
  #include "config.h"
  #endif
diff --git a/bash-4.0-security.patch b/bash-4.0-security.patch
index 16eda40..f140a80 100644
--- a/bash-4.0-security.patch
+++ b/bash-4.0-security.patch
@@ -1,5 +1,7 @@
---- variables.c
-+++ variables.c	2009-02-27 17:44:46.626430014 +0100
+Index: variables.c
+===================================================================
+--- variables.c.orig
++++ variables.c
 @@ -1203,6 +1203,7 @@ init_seconds_var ()
    return v;      
  }
diff --git a/bash-4.0-setlocale.dif b/bash-4.0-setlocale.dif
index c7ad259..1eafae1 100644
--- a/bash-4.0-setlocale.dif
+++ b/bash-4.0-setlocale.dif
@@ -1,5 +1,7 @@
---- locale.c
-+++ locale.c	2009-02-27 16:40:50.576066695 +0100
+Index: locale.c
+===================================================================
+--- locale.c.orig
++++ locale.c
 @@ -47,6 +47,7 @@ extern int dump_translatable_strings, du
  
  /* The current locale when the program begins */
diff --git a/bash-4.0.10-typo.patch b/bash-4.0.10-typo.patch
index fcad44d..b7eca92 100644
--- a/bash-4.0.10-typo.patch
+++ b/bash-4.0.10-typo.patch
@@ -7,8 +7,10 @@
 |
 | Andreas.
 |
---- doc/bashref.texi	2009-02-18 21:14:43.000000000 +0100
-+++ doc/bashref.texi	2009-03-14 21:11:36.000000000 +0100
+Index: doc/bashref.texi
+===================================================================
+--- doc/bashref.texi.orig
++++ doc/bashref.texi
 @@ -864,7 +864,7 @@ operator terminates a pattern list.
  A list of patterns and an associated command-list is known
  as a @var{clause}.
@@ -18,4 +20,3 @@
  The @var{word} undergoes tilde expansion, parameter expansion, command
  substitution, arithmetic expansion, and quote removal before matching is
  attempted.  Each @var{pattern} undergoes tilde expansion, parameter
-
diff --git a/bash-4.0.24-acl.dif b/bash-4.0.24-acl.dif
index caef81f..74fce7a 100644
--- a/bash-4.0.24-acl.dif
+++ b/bash-4.0.24-acl.dif
@@ -1,5 +1,7 @@
---- findcmd.c
-+++ findcmd.c	2009-06-04 12:03:16.094615177 +0200
+Index: findcmd.c
+===================================================================
+--- findcmd.c.orig
++++ findcmd.c
 @@ -93,7 +93,22 @@ file_status (name)
  
    r = FS_EXISTS;
@@ -44,8 +46,10 @@
  }
  
  /* Return non-zero if FILE exists and is executable.
---- lib/sh/eaccess.c
-+++ lib/sh/eaccess.c	2009-06-04 11:59:33.165901707 +0200
+Index: lib/sh/eaccess.c
+===================================================================
+--- lib/sh/eaccess.c.orig
++++ lib/sh/eaccess.c
 @@ -201,7 +201,7 @@ sh_eaccess (path, mode)
    if (path_is_devfd (path))
      return (sh_stataccess (path, mode));
diff --git a/bash-4.0.24-memleak-read.patch b/bash-4.0.24-memleak-read.patch
index 13af93e..4ac65e1 100644
--- a/bash-4.0.24-memleak-read.patch
+++ b/bash-4.0.24-memleak-read.patch
@@ -1,5 +1,7 @@
---- builtins/read.def
-+++ builtins/read.def	2009-07-02 14:29:42.017901989 +0200
+Index: builtins/read.def
+===================================================================
+--- builtins/read.def.orig
++++ builtins/read.def
 @@ -763,7 +763,10 @@ assign_vars:
        if (*input_string == 0)
  	tofree = input_string = t;
diff --git a/bash-4.0.dif b/bash-4.0.dif
index 87e0f02..9715687 100644
--- a/bash-4.0.dif
+++ b/bash-4.0.dif
@@ -1,5 +1,7 @@
---- .pkgextract
-+++ .pkgextract	2006-03-27 14:15:25.000000000 +0200
+Index: .pkgextract
+===================================================================
+--- /dev/null
++++ .pkgextract
 @@ -0,0 +1,14 @@
 +tar Oxfj ../bash-4.0-patches.tar.bz2 | patch -p0 -s
 +patch -p0 -s --suffix=".manual"   < ../bash-2.03-manual.patch
@@ -15,8 +17,10 @@
 +patch -p0 -s --suffix=".zerotty"  < ../readline-4.3-input.dif
 +patch -p0 -s --suffix=".wrap"     < ../readline-6.0-wrap.patch
 +patch -p0 -s --suffix=".conf"     < ../readline-5.2-conf.patch
---- config-top.h
-+++ config-top.h	2009-02-27 17:03:21.460110230 +0100
+Index: config-top.h
+===================================================================
+--- config-top.h.orig
++++ config-top.h
 @@ -54,14 +54,14 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
@@ -59,8 +63,10 @@
  
  /* Define if you want the case-capitalizing operators (~[~]) and the
     `capcase' variable attribute (declare -c). */
---- general.h
-+++ general.h	2006-03-27 14:15:25.000000000 +0200
+Index: general.h
+===================================================================
+--- general.h.orig
++++ general.h
 @@ -21,10 +21,13 @@
  #if !defined (_GENERAL_H_)
  #define _GENERAL_H_
@@ -75,8 +81,10 @@
  
  #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
+Index: jobs.c
+===================================================================
+--- jobs.c.orig
++++ jobs.c
 @@ -199,10 +199,10 @@ int previous_job = NO_JOB;
  #endif
  
@@ -99,8 +107,10 @@
  
  /* Functions local to this file. */
  
---- jobs.h
-+++ jobs.h	2006-03-27 14:15:25.000000000 +0200
+Index: jobs.h
+===================================================================
+--- jobs.h.orig
++++ jobs.h
 @@ -165,7 +165,7 @@ extern pid_t fork (), getpid (), getpgrp
  extern struct jobstats js;
  
@@ -110,8 +120,10 @@
  extern int asynchronous_notification;
  
  extern JOB **jobs;
---- parse.y
-+++ parse.y	2006-03-27 14:15:25.000000000 +0200
+Index: parse.y
+===================================================================
+--- parse.y.orig
++++ parse.y
 @@ -1283,7 +1283,7 @@ input_file_descriptor ()
  
  #if defined (READLINE)
@@ -121,8 +133,10 @@
  int current_readline_line_index = 0;
  
  static int
---- shell.c
-+++ shell.c	2006-03-27 14:15:25.000000000 +0200
+Index: shell.c
+===================================================================
+--- shell.c.orig
++++ shell.c
 @@ -479,7 +479,7 @@ main (argc, argv, env)
    if (dump_translatable_strings)
      read_but_dont_execute = 1;
@@ -132,9 +146,11 @@
      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
-@@ -2859,6 +2859,7 @@ call_expand_word_internal (w, q, i, c, e
+Index: subst.c
+===================================================================
+--- subst.c.orig
++++ subst.c
+@@ -2962,6 +2962,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 */
@@ -142,8 +158,10 @@
      }
    else
      return (result);
---- builtins/shopt.def
-+++ builtins/shopt.def	2006-03-27 14:15:25.000000000 +0200
+Index: builtins/shopt.def
+===================================================================
+--- builtins/shopt.def.orig
++++ builtins/shopt.def
 @@ -279,9 +279,9 @@ reset_shopt_options ()
    allow_null_glob_expansion = glob_dot_filenames = 0;
    cdable_vars = mail_warning = 0;
@@ -156,8 +174,10 @@
  
  #if defined (EXTENDED_GLOB)
    extended_glob = 0;
---- doc/Makefile.in
-+++ doc/Makefile.in	2006-03-27 14:15:25.000000000 +0200
+Index: doc/Makefile.in
+===================================================================
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
 @@ -142,7 +142,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $
  	${RM} $@
  	-${DVIPS} $<
@@ -167,9 +187,11 @@
  nodvi: ps info text html
  everything: all pdf
  
---- doc/bash.1
-+++ doc/bash.1	2006-03-27 14:15:25.000000000 +0200
-@@ -4627,8 +4627,8 @@ file (the \fIinputrc\fP file).
+Index: doc/bash.1
+===================================================================
+--- doc/bash.1.orig
++++ doc/bash.1
+@@ -4620,8 +4620,8 @@ file (the \fIinputrc\fP file).
  The name of this file is taken from the value of the
  .SM
  .B INPUTRC
@@ -180,7 +202,7 @@
  When a program which uses the readline library starts up, the
  initialization file is read, and the key bindings and variables
  are set.
-@@ -9346,6 +9346,9 @@ The individual login shell cleanup file,
+@@ -9340,6 +9340,9 @@ The individual login shell cleanup file,
  .TP
  .FN ~/.inputrc
  Individual \fIreadline\fP initialization file
@@ -190,8 +212,10 @@
  .PD
  .SH AUTHORS
  Brian Fox, Free Software Foundation
---- support/printenv.c
-+++ support/printenv.c	2007-12-06 16:33:47.000000000 +0100
+Index: support/printenv.c
+===================================================================
+--- support/printenv.c.orig
++++ support/printenv.c
 @@ -27,6 +27,7 @@
  #if defined (HAVE_CONFIG_H)
  #  include  <config.h>
@@ -200,8 +224,10 @@
  
  #include "bashansi.h"
  
---- support/rlvers.sh
-+++ support/rlvers.sh	2006-03-27 14:15:25.000000000 +0200
+Index: support/rlvers.sh
+===================================================================
+--- support/rlvers.sh.orig
++++ support/rlvers.sh
 @@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers
  
  # defaults
@@ -216,8 +242,10 @@
  
  # 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
+Index: support/shobj-conf
+===================================================================
+--- support/shobj-conf.orig
++++ support/shobj-conf
 @@ -112,10 +112,11 @@ sunos5*|solaris2*)
  linux*-*|gnu*-*|k*bsd*-gnu-*)
  	SHOBJ_CFLAGS=-fPIC
@@ -232,16 +260,20 @@
  	;;
  
  freebsd2*)
---- tests/run-intl
-+++ tests/run-intl	2009-03-02 13:20:15.978553796 +0100
+Index: tests/run-intl
+===================================================================
+--- tests/run-intl.orig
++++ tests/run-intl
 @@ -5,4 +5,4 @@ echo "warning: some of these tests will
  echo "warning: locales installed on your system." >&2
  echo "warning: please ignore any differences consisting only of white space" >&2
  ${THIS_SH} ./intl.tests > /tmp/xx
 -diff $AFLAG /tmp/xx intl.right && rm -f /tmp/xx
 +diff -w $AFLAG /tmp/xx intl.right && rm -f /tmp/xx
---- tests/run-read
-+++ tests/run-read	2009-03-02 13:09:18.212713847 +0100
+Index: tests/run-read
+===================================================================
+--- tests/run-read.orig
++++ tests/run-read
 @@ -1,4 +1,4 @@
  echo "warning: please do not consider output differing only in the amount of" >&2
  echo "warning: white space to be an error." >&2
diff --git a/bash.changes b/bash.changes
index 380f46d..54f3dca 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 26 13:01:19 CEST 2009 - coolo@novell.com
+
+- rediff patches to avoid fuzz
+
 -------------------------------------------------------------------
 Tue Jul 28 13:19:20 CEST 2009 - werner@suse.de
 
diff --git a/bash.spec b/bash.spec
index b2f91ac..88c37c1 100644
--- a/bash.spec
+++ b/bash.spec
@@ -28,7 +28,7 @@ Recommends:     bash-lang = %bash_vers
 Suggests:       command-not-found
 AutoReqProv:    on
 Version:        4.0
-Release:        14
+Release:        15
 Summary:        The GNU Bourne-Again Shell
 Url:            http://www.gnu.org/software/bash/bash.html
 Source0:        ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2
@@ -90,7 +90,7 @@ Group:          Documentation/Man
 Provides:       bash:%{_infodir}/bash.info.gz
 PreReq:         %install_info_prereq
 Version:        4.0
-Release:        14
+Release:        15
 AutoReqProv:    on
 
 %description -n bash-doc
@@ -110,7 +110,7 @@ License:        GPL v2 or later
 Summary:        Include Files mandatory for Development of bash loadable builtins
 Group:          Development/Languages/C and C++
 Version:        4.0
-Release:        3
+Release:        4
 AutoReqProv:    on
 
 %description -n bash-devel
@@ -130,7 +130,7 @@ License:        GPL v2 or later
 Summary:        Loadable bash builtins
 Group:          System/Shells
 Version:        4.0
-Release:        3
+Release:        4
 AutoReqProv:    on
 
 %description -n bash-loadables
@@ -199,7 +199,7 @@ Summary:        The Readline Library
 Group:          System/Libraries
 Provides:       bash:/%{_lib}/libreadline.so.%{rl_major}
 Version:        6.0
-Release:        14
+Release:        15
 Recommends:     readline-doc = %{version}
 # bug437293
 %ifarch ppc64
@@ -228,7 +228,7 @@ Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Provides:       bash:%{_libdir}/libreadline.a
 Version:        6.0
-Release:        14
+Release:        15
 Requires:       libreadline6 = %{version}
 Requires:       ncurses-devel
 Recommends:     readline-doc = %{version}
@@ -257,7 +257,7 @@ Group:          System/Libraries
 Provides:       readline:%{_infodir}/readline.info.gz
 PreReq:         %install_info_prereq
 Version:        6.0
-Release:        14
+Release:        15
 AutoReqProv:    on
 
 %description -n readline-doc
diff --git a/readline-4.3-input.dif b/readline-4.3-input.dif
index b6709d4..25ec099 100644
--- a/readline-4.3-input.dif
+++ b/readline-4.3-input.dif
@@ -1,6 +1,8 @@
---- lib/readline/input.c
-+++ lib/readline/input.c	Mon Mar 17 19:03:51 2003
-@@ -415,6 +415,8 @@
+Index: lib/readline/input.c
+===================================================================
+--- lib/readline/input.c.orig
++++ lib/readline/input.c
+@@ -459,6 +459,8 @@ rl_read_key ()
    return (c);
  }
  
@@ -9,7 +11,7 @@
  int
  rl_getc (stream)
       FILE *stream;
-@@ -432,7 +434,10 @@
+@@ -482,7 +484,10 @@ rl_getc (stream)
        /* If zero characters are returned, then the file that we are
  	 reading from is empty!  Return EOF in that case. */
        if (result == 0)
@@ -21,10 +23,12 @@
  
  #if defined (__BEOS__)
        if (errno == EINTR)
---- lib/readline/readline.c
-+++ lib/readline/readline.c	Mon Mar 17 19:02:52 2003
-@@ -387,6 +387,9 @@
-   return (eof ? (char *)NULL : savestring (the_line));
+Index: lib/readline/readline.c
+===================================================================
+--- lib/readline/readline.c.orig
++++ lib/readline/readline.c
+@@ -469,6 +469,9 @@ _rl_internal_char_cleanup ()
+     _rl_erase_entire_line ();
  }
  
 +/* Catch EOF from tty, do not return command line */
@@ -33,14 +37,14 @@
  STATIC_CALLBACK int
  #if defined (READLINE_CALLBACKS)
  readline_internal_char ()
-@@ -421,6 +424,10 @@
-       RL_SETSTATE(RL_STATE_READCMD);
+@@ -513,6 +516,10 @@ readline_internal_charloop ()
        c = rl_read_key ();
        RL_UNSETSTATE(RL_STATE_READCMD);
-+
+ 
 +      /* Return here if terminal is closed */
 +      if (c == EOF && _rl_read_zero_char_from_tty)
 +	return (rl_done = 1);
- 
-       /* EOF typed to a non-blank line is a <NL>. */
-       if (c == EOF && rl_end)
++
+       /* look at input.c:rl_getc() for the circumstances under which this will
+ 	 be returned; punt immediately on read error without converting it to
+ 	 a newline. */
diff --git a/readline-5.2-conf.patch b/readline-5.2-conf.patch
index d0184b2..c2ace7d 100644
--- a/readline-5.2-conf.patch
+++ b/readline-5.2-conf.patch
@@ -1,6 +1,8 @@
---- lib/readline/bind.c
-+++ lib/readline/bind.c	2006-11-13 17:20:23.000000000 +0100
-@@ -752,6 +752,9 @@ rl_function_of_keyseq (keyseq, map, type
+Index: lib/readline/bind.c
+===================================================================
+--- lib/readline/bind.c.orig
++++ lib/readline/bind.c
+@@ -751,6 +751,9 @@ rl_function_of_keyseq (keyseq, map, type
  /* The last key bindings file read. */
  static char *last_readline_init_file = (char *)NULL;
  
@@ -10,7 +12,7 @@
  /* The file we're currently reading key bindings from. */
  static const char *current_readline_init_file;
  static int current_readline_init_include_level;
-@@ -815,11 +818,14 @@ rl_re_read_init_file (count, ignore)
+@@ -816,11 +819,14 @@ rl_re_read_init_file (count, ignore)
    return r;
  }
  
@@ -26,7 +28,7 @@
       4. /etc/inputrc
     If the file existed and could be opened and read, 0 is returned,
     otherwise errno is returned. */
-@@ -831,16 +837,37 @@ rl_read_init_file (filename)
+@@ -832,16 +838,37 @@ rl_read_init_file (filename)
    if (filename == 0)
      filename = last_readline_init_file;
    if (filename == 0)
@@ -69,7 +71,7 @@
  #if defined (__MSDOS__)
    if (_rl_read_init_file (filename, 0) == 0)
      return 0;
-@@ -1350,7 +1377,14 @@ rl_parse_and_bind (string)
+@@ -1352,7 +1379,14 @@ rl_parse_and_bind (string)
  	  rl_macro_bind (seq, &funname[1], _rl_keymap);
  	}
        else
@@ -83,19 +85,21 @@
 +	  rl_bind_keyseq (seq, rl_named_function (funname));
 +	}
  
-       free (seq);
+       xfree (seq);
        return 0;
-@@ -1487,7 +1521,6 @@ typedef int _rl_sv_func_t PARAMS((const 
+@@ -1490,7 +1524,6 @@ typedef int _rl_sv_func_t PARAMS((const
  #define V_INT		2
  
  /* Forward declarations */
 -static int sv_bell_style PARAMS((const char *));
  static int sv_combegin PARAMS((const char *));
+ static int sv_dispprefix PARAMS((const char *));
  static int sv_compquery PARAMS((const char *));
- static int sv_editmode PARAMS((const char *));
---- lib/readline/rlconf.h
-+++ lib/readline/rlconf.h	2006-11-13 17:21:26.000000000 +0100
-@@ -35,7 +35,7 @@
+Index: lib/readline/rlconf.h
+===================================================================
+--- lib/readline/rlconf.h.orig
++++ lib/readline/rlconf.h
+@@ -33,7 +33,7 @@
  #define HANDLE_SIGNALS
  
  /* Ugly but working hack for binding prefix meta. */
@@ -104,9 +108,11 @@
  
  /* The next-to-last-ditch effort file name for a user-specific init file. */
  #define DEFAULT_INPUTRC "~/.inputrc"
---- lib/readline/doc/rluser.texi
-+++ lib/readline/doc/rluser.texi	2006-11-13 17:23:56.000000000 +0100
-@@ -338,7 +338,8 @@ file is taken from the value of the envi
+Index: lib/readline/doc/rluser.texi
+===================================================================
+--- lib/readline/doc/rluser.texi.orig
++++ lib/readline/doc/rluser.texi
+@@ -347,7 +347,8 @@ file is taken from the value of the envi
  @end ifclear
  that variable is unset, the default is @file{~/.inputrc}.  If that
  file does not exist or cannot be read, the ultimate default is
diff --git a/readline-6.0-wrap.patch b/readline-6.0-wrap.patch
index e59228d..f70aa14 100644
--- a/readline-6.0-wrap.patch
+++ b/readline-6.0-wrap.patch
@@ -1,6 +1,8 @@
---- lib/readline/display.c
-+++ lib/readline/display.c	2009-02-27 16:57:28.988001786 +0100
-@@ -713,7 +713,10 @@ rl_redisplay ()
+Index: lib/readline/display.c
+===================================================================
+--- lib/readline/display.c.orig
++++ lib/readline/display.c
+@@ -714,7 +714,10 @@ rl_redisplay ()
        inv_lbreaks[++newlines] = temp;
  #if defined (HANDLE_MULTIBYTE)
        if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && prompt_multibyte_chars > 0)