Add all current upstream bash patches including 025, which fixes

a security issue. Version number bumped in the usual way.

2 files changed, 85 insertions, 5 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 89d23b252a5..0869b23da0b 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile,v 1.63 2014/07/18 20:08:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2014/09/24 15:24:35 wiz Exp $
 
 BASH_VERSION=		4.3
+BASH_PATCHLEVEL=	025
 
 DISTNAME=	bash-${BASH_VERSION}
-#PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
+PKGNAME=	bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
 
-#PATCH_SITES=	${MASTER_SITES:=bash-4.0-patches/}
-#PATCHFILES+=	bash40-001 bash40-002 bash40-003 bash40-004 bash40-005
+PATCH_SITES=	${MASTER_SITES:=bash-4.3-patches/}
+PATCHFILES+=	bash43-001 bash43-002 bash43-003 bash43-004 bash43-005
+PATCHFILES+=	bash43-006 bash43-007 bash43-008 bash43-009 bash43-010
+PATCHFILES+=	bash43-011 bash43-012 bash43-013 bash43-014 bash43-015
+PATCHFILES+=	bash43-016 bash43-017 bash43-018 bash43-019 bash43-020
+PATCHFILES+=	bash43-021 bash43-022 bash43-023 bash43-024 bash43-025
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 4674e78239f..9a6356d83aa 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,8 +1,83 @@
-$NetBSD: distinfo,v 1.30 2014/07/17 12:49:15 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2014/09/24 15:24:35 wiz Exp $
 
 SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84
 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845
 Size (bash-4.3.tar.gz) = 7955839 bytes
+SHA1 (bash43-001) = d67ffd6833b30fd41f429205953714a184caa03b
+RMD160 (bash43-001) = 6fc9c8c814602c60f6cda0965848dc19a2601a62
+Size (bash43-001) = 1617 bytes
+SHA1 (bash43-002) = 0c1d486387e5f3bea6a97b317de54f9c3de71c7c
+RMD160 (bash43-002) = eecdd1863f8cb8f6ae6055d88b5ea811f5cc5674
+Size (bash43-002) = 1594 bytes
+SHA1 (bash43-003) = 024d9a6dc6822bb5424f83478b495de29883fb3c
+RMD160 (bash43-003) = 957f27933224699fff6c508be93ac9b378af174d
+Size (bash43-003) = 1465 bytes
+SHA1 (bash43-004) = ece4a6450842a5c13048b86ce1746576f1df7ccd
+RMD160 (bash43-004) = edeef6ffee97759db6a834fcafb14661321efa1b
+Size (bash43-004) = 1534 bytes
+SHA1 (bash43-005) = e7745508829892e3627cef63e56299d584689e07
+RMD160 (bash43-005) = 11aad94b8fbd1f88052741de8e09386e711c2fb7
+Size (bash43-005) = 2636 bytes
+SHA1 (bash43-006) = df3e72bbca83bcac4513b3574d03ab25ac501928
+RMD160 (bash43-006) = 21ae70170ae4338d0fdf177dd3cf90d8b638db86
+Size (bash43-006) = 1445 bytes
+SHA1 (bash43-007) = 1394ecd50212d1bc192db5fbfbf08b996d2582a3
+RMD160 (bash43-007) = 0e15af3ff9bdf7a348ecb45698ec79b4f9d84504
+Size (bash43-007) = 1331 bytes
+SHA1 (bash43-008) = 482f9583f1a3a83256ded3c745cc3b98ccc9b3ea
+RMD160 (bash43-008) = 1cfaef93a75c6315711e0b81c56f84da9a6fe577
+Size (bash43-008) = 4575 bytes
+SHA1 (bash43-009) = 1909cd7f214f4ebedc60bf022132dd4e1284e65b
+RMD160 (bash43-009) = 1d64cf44aa6d732988f52dd02aadbddb54aa3e81
+Size (bash43-009) = 2413 bytes
+SHA1 (bash43-010) = d932228b23e795030132dc8eeea04d9919c90aa7
+RMD160 (bash43-010) = 8b8ce230d0635e982d7beaf8578d63568895a5d6
+Size (bash43-010) = 5357 bytes
+SHA1 (bash43-011) = c53032a18e6491c91117aff5a330620ed8db0f38
+RMD160 (bash43-011) = 7b94ad9f7cb92b6dc072451fbdf0754d676f4a71
+Size (bash43-011) = 1533 bytes
+SHA1 (bash43-012) = 49b8865ca31df4ab0c270500fd12b9e06697272d
+RMD160 (bash43-012) = 42da2ec9e6585314ed4ed6ba361d270e6eb9cdcb
+Size (bash43-012) = 1365 bytes
+SHA1 (bash43-013) = 7c8a4bf8b556504ae9bbf0435b4a505de230e4e1
+RMD160 (bash43-013) = c0c2a1680c301f50d24e3f0184289b1c1ee0e947
+Size (bash43-013) = 2151 bytes
+SHA1 (bash43-014) = 582c8aa707e05b4423df982ee2ed3034f71673bc
+RMD160 (bash43-014) = ee39820ed5a94b00d4e233f0e0223671f55a2c8e
+Size (bash43-014) = 3533 bytes
+SHA1 (bash43-015) = 90969e367c9aaf8127ea61b9c23131eb9d9712fc
+RMD160 (bash43-015) = 7c4d91841ca9d0ca594a149cb391db65d1701c96
+Size (bash43-015) = 1894 bytes
+SHA1 (bash43-016) = 9bbe955e8b332c468e7c5704ea9143cbeb87752d
+RMD160 (bash43-016) = 53ef75be07a9c73297018251a51d1375ff4d5ffc
+Size (bash43-016) = 3674 bytes
+SHA1 (bash43-017) = 20be46bb4714ec53e2a961a8b48ccf6289991cba
+RMD160 (bash43-017) = 580c01692c5d7e91196d56eac345ee4aadcdbce9
+Size (bash43-017) = 1565 bytes
+SHA1 (bash43-018) = 4f4033a4d40463804ead6f87bfa734acb3df9fbe
+RMD160 (bash43-018) = a779bbfebc72b1a0c7e15284efc658b298618050
+Size (bash43-018) = 1315 bytes
+SHA1 (bash43-019) = 2cfd59869d2cfdee1f77560d7e9fd12f305725b8
+RMD160 (bash43-019) = d5f610fd7f10268efd7fc84d7a6d0c6c6f9836ab
+Size (bash43-019) = 2610 bytes
+SHA1 (bash43-020) = a3ed65d860788cb8eaa761a77a0abe7b5cbd9240
+RMD160 (bash43-020) = 4e59ef2dbbcbd0de85f04dd08fe8bcdde387a4d6
+Size (bash43-020) = 2777 bytes
+SHA1 (bash43-021) = 9786720bd7fc72280ff6d61476c83e39ed8213aa
+RMD160 (bash43-021) = b8931b1dda5e03cbae43b32a814503a8ef2a02d4
+Size (bash43-021) = 1623 bytes
+SHA1 (bash43-022) = 7c67c4277eb024d17051aabaa750b6cc388d173e
+RMD160 (bash43-022) = 8e17f783ba2535d3f7b1cc320d6c9a8639de4964
+Size (bash43-022) = 1782 bytes
+SHA1 (bash43-023) = 5fe81781847c5bad848b790d3c2c0e3df19e8719
+RMD160 (bash43-023) = 86e0fe2326a81b7182f52cd3cd7da087a52ea962
+Size (bash43-023) = 3414 bytes
+SHA1 (bash43-024) = 875accb818ebecdb77a2fc3dc6167056ea1ce347
+RMD160 (bash43-024) = a1fd34a95f55b37b065e824b494f3a35c4eb4361
+Size (bash43-024) = 1909 bytes
+SHA1 (bash43-025) = 484d85e54547a18f9702284c55145e34e74768d1
+RMD160 (bash43-025) = 9fd51a95756fcaf9b57cab9c29d6e3f6e3b900fe
+Size (bash43-025) = 3940 bytes
 SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e