Update to patchlevel 3.2.25: Various bugfixes.

3 files changed, 65 insertions, 21 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index c0cba44158e..a1f80554d60 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2007/08/17 22:11:35 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/18 21:20:12 wiz Exp $
 
 DISTNAME=	bash-3.2
-PKGNAME=	bash-3.2.9
+PKGNAME=	bash-3.2.25
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
 
 PATCH_SITES=	${MASTER_SITES:=bash-3.2-patches/}
-PATCHFILES=	bash32-001
-PATCHFILES+=	bash32-002
-PATCHFILES+=	bash32-003
-PATCHFILES+=	bash32-004
-PATCHFILES+=	bash32-005
-PATCHFILES+=	bash32-006
-PATCHFILES+=	bash32-007
-PATCHFILES+=	bash32-008
-PATCHFILES+=	bash32-009
+PATCHFILES=	bash32-001 bash32-002 bash32-003 bash32-004 bash32-005
+PATCHFILES+=	bash32-006 bash32-007 bash32-008 bash32-009 bash32-010
+PATCHFILES+=	bash32-011 bash32-012 bash32-013 bash32-014 bash32-015
+PATCHFILES+=	bash32-016 bash32-017 bash32-018 bash32-019 bash32-020
+PATCHFILES+=	bash32-021 bash32-022 bash32-023 bash32-024 bash32-025
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 33e7da35bee..1ba3918e4b7 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/02/18 12:21:59 wiz Exp $
+$NetBSD: distinfo,v 1.11 2007/09/18 21:20:12 wiz Exp $
 
 SHA1 (bash-3.2.tar.gz) = fe6466c7ee98061e044dae0347ca5d1a8eab4a0d
 RMD160 (bash-3.2.tar.gz) = a73f790817d98be375a36def567737498e33aaf1
@@ -30,6 +30,54 @@ Size (bash32-008) = 1302 bytes
 SHA1 (bash32-009) = 149ce3e82e821bbbff858f4172ecb4a1e70709dd
 RMD160 (bash32-009) = 5a20bc86d04a156cdbcb22f36b6c68c7318e9bab
 Size (bash32-009) = 1882 bytes
-SHA1 (patch-af) = d265d5ff8eae99b8334753ef7d9d9b95dd4b2380
+SHA1 (bash32-010) = e493230f55d6080a2ecee6b69c90318c7fbf7261
+RMD160 (bash32-010) = 51b4c18b7939f663ee72861a522d7fb1d1afaa30
+Size (bash32-010) = 6293 bytes
+SHA1 (bash32-011) = e16d7a9ffa82d4fa1ff6bd6e035f5fe55d763fd2
+RMD160 (bash32-011) = 030404aabf09b8aa295f241d1d96bdba12a1f8cb
+Size (bash32-011) = 4776 bytes
+SHA1 (bash32-012) = 78962a55fb6a3d6ac44895197c53f3bdacf99658
+RMD160 (bash32-012) = c2011d3d8a8004acd58112568e611511f9bde5ff
+Size (bash32-012) = 2555 bytes
+SHA1 (bash32-013) = d05cf3e0068052a8e6238b34fc9f4c175192e419
+RMD160 (bash32-013) = 4ddfeafea7e451376c56d17836079a963298df06
+Size (bash32-013) = 1852 bytes
+SHA1 (bash32-014) = 28755817e044434407dda4be0918a18ace622fdd
+RMD160 (bash32-014) = cf47a705b00039bdc2cc5cd37dd20a58b029af33
+Size (bash32-014) = 8141 bytes
+SHA1 (bash32-015) = aaae708b76d0904d3a8a7006f6f66df68af4fbaa
+RMD160 (bash32-015) = 6535eb24b8d30ce9756b1e7c0d21c0946b1d354e
+Size (bash32-015) = 2293 bytes
+SHA1 (bash32-016) = 2329364459a0eff6614e889954d040c6cfd9846b
+RMD160 (bash32-016) = cfded7fc1b9bc328c4fb1167c536fcbd28756615
+Size (bash32-016) = 1620 bytes
+SHA1 (bash32-017) = 1535ec0fe4b8578dfa68e4a71b17d5827c666aeb
+RMD160 (bash32-017) = 7366ea8c0109b41a9bf5a369aa5fa56f4b8792f1
+Size (bash32-017) = 2611 bytes
+SHA1 (bash32-018) = fe0ee3be9cf82935c59c3901f804a006881983b1
+RMD160 (bash32-018) = 6c14a6a79f7bbc482be03bcf7a7d212f5c66b4c1
+Size (bash32-018) = 2433 bytes
+SHA1 (bash32-019) = 6a4a438bf201b832795df2c987d78ed1d197ba11
+RMD160 (bash32-019) = ba3785559673cabb6ddb0dea7b8d754edec5042b
+Size (bash32-019) = 8618 bytes
+SHA1 (bash32-020) = db0b320b6254c5317d434bce42c9b7bbc4b9b3f0
+RMD160 (bash32-020) = 32639b79283ba0874e3c33f1263a043270763f70
+Size (bash32-020) = 5182 bytes
+SHA1 (bash32-021) = 47a6f3b5c0b87d51ed74de1a5c036fb58eb15a9d
+RMD160 (bash32-021) = 19604def3f0dc5f1b9dd4a27d6f0c4fb736b5de5
+Size (bash32-021) = 1814 bytes
+SHA1 (bash32-022) = d7bc578876109177574293200f39198fb1bba343
+RMD160 (bash32-022) = 7dca279f12d29984eee0ea604f707b356d430353
+Size (bash32-022) = 3034 bytes
+SHA1 (bash32-023) = 6c2eb88a0bac2c3dc00b2534876567934a608c81
+RMD160 (bash32-023) = 0bbd0ea023fd06fcadbb0920024f23d65309a8e4
+Size (bash32-023) = 1321 bytes
+SHA1 (bash32-024) = d7b3399200ae4959023e085a9ded271c98b2c28d
+RMD160 (bash32-024) = 520c4f9b60509c6c2b2104f26ea2cafa2524d3bd
+Size (bash32-024) = 3228 bytes
+SHA1 (bash32-025) = 2d4fcca9356ddb045e867850acfd2ad3e0a2167f
+RMD160 (bash32-025) = bfe8add1ba14429fcb56cc37168eee82120ea011
+Size (bash32-025) = 1935 bytes
+SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
 SHA1 (patch-ah) = 6f88b33d9b56fabd319fa23cd1ff41594a01045b
diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af
index cdc7273738d..a50bf91416a 100644
--- a/shells/bash/patches/patch-af
+++ b/shells/bash/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.3 2006/10/22 11:18:10 wiz Exp $
+$NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
 
---- builtins/printf.def.orig	2006-09-18 12:48:42.000000000 +0000
+--- builtins/printf.def.orig	2007-09-18 15:24:09.000000000 +0000
 +++ builtins/printf.def
-@@ -64,6 +64,11 @@ $END
- #include "bashgetopt.h"
- #include "common.h"
+@@ -74,6 +74,11 @@ $END
+ #  undef PRIdMAX
+ #endif
  
 +#if defined (_AIX) && !defined (_AIX51)
 +   /* AIX defines do not work.  Undefine them.  */
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.3 2006/10/22 11:18:10 wiz Exp $
  #if !defined (PRIdMAX)
  #  if HAVE_LONG_LONG
  #    define PRIdMAX	"lld"
-@@ -71,6 +76,13 @@ $END
+@@ -81,6 +86,13 @@ $END
  #    define PRIdMAX	"ld"
  #  endif
  #endif
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.3 2006/10/22 11:18:10 wiz Exp $
  
  #if !defined (errno)
  extern int errno;
-@@ -452,7 +464,11 @@ printf_builtin (list)
+@@ -466,7 +478,11 @@ printf_builtin (list)
  		p = pp = getintmax ();
  		if (p != pp)
  		  {
@@ -40,7 +40,7 @@ $NetBSD: patch-af,v 1.3 2006/10/22 11:18:10 wiz Exp $
  		    PF (f, pp);
  		  }
  		else
-@@ -479,7 +495,11 @@ printf_builtin (list)
+@@ -493,7 +509,11 @@ printf_builtin (list)
  		p = pp = getuintmax ();
  		if (p != pp)
  		  {