* Bash updated to 3.2 patchlevel 17.

svn path=/nixpkgs/trunk/; revision=8746

2 files changed, 4 insertions, 54 deletions

diff --git a/pkgs/shells/bash-interactive/bash32-001.patch b/pkgs/shells/bash-interactive/bash32-001.patch
deleted file mode 100644
index 9f8a885df1f29..0000000000000
--- a/pkgs/shells/bash-interactive/bash32-001.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release: 3.2
-Patch-ID: bash32-001
-
-Bug-Reported-by:	Greg Schafer <gschafer@zip.com.au>
-Bug-Reference-ID:	<20061012084940.GA15768@tigers.local>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00046.html
-
-Bug-Description:
-
-When using historical ``-style command substitution, bash incorrectly attempts
-to interpret shell comments while scanning for the closing backquote.
-
-Patch:
-
-*** bash-3.2/parse.y	Tue Sep 19 16:37:21 2006
---- new-bash/parse.y	Thu Oct 12 10:30:57 2006
-***************
-*** 2736,2740 ****
-    count = 1;
-    pass_next_character = backq_backslash = was_dollar = in_comment = 0;
-!   check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
-  
-    /* RFLAGS is the set of flags we want to pass to recursive calls. */
---- 2736,2740 ----
-    count = 1;
-    pass_next_character = backq_backslash = was_dollar = in_comment = 0;
-!   check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
-  
-    /* RFLAGS is the set of flags we want to pass to recursive calls. */
-*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
---- new-bash/patchlevel.h	Mon Oct 16 14:22:54 2006
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/pkgs/shells/bash-interactive/default.nix b/pkgs/shells/bash-interactive/default.nix
index 6e9d7b3fa4312..1877080049b33 100644
--- a/pkgs/shells/bash-interactive/default.nix
+++ b/pkgs/shells/bash-interactive/default.nix
@@ -3,25 +3,22 @@
 assert interactive -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "bash-3.2";
+  name = "bash-3.2-p17";
 
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/gnu/bash/bash-3.2.tar.gz;
-    md5 = "00bfa16d58e034e3c2aa27f390390d30";
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/bash-3.2-p17.tar.bz2;
+    sha256 = "153gg2z2s3ar7vni3345nnmdisha4b8cxzsj79d8ap6m6i4c35f5";
   };
 
   postInstall = "ln -s bash $out/bin/sh";
 
   patches = [
-    # Fix a nasty bug in bash-3.2.
-    ./bash32-001.patch
-  
     # For dietlibc builds.
     ./winsize.patch
   ];
 
   # !!! only needed for bash-3.2 (because of bash32-001.patch)
-  buildInputs = [bison] ++ (if interactive then [ncurses] else []);
+  buildInputs = [bison] ++ stdenv.lib.optional interactive ncurses;
 
   meta = {
     description =