diff options
| -rw-r--r-- | shells/bash/Makefile | 16 | ||||
| -rw-r--r-- | shells/bash/PLIST | 4 | ||||
| -rw-r--r-- | shells/bash/distinfo | 93 | ||||
| -rw-r--r-- | shells/bash/patches/patch-aa | 19 |
4 files changed, 12 insertions, 120 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index f48f42a85fe..31f7b602f34 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,21 +1,15 @@ -# $NetBSD: Makefile,v 1.48 2009/09/04 15:35:10 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2010/01/16 17:17:04 wiz Exp $ -BASH_VERSION= 4.0 -BASH_PATCHLEVEL= 28 +BASH_VERSION= 4.1 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 -PATCHFILES+= bash40-006 bash40-007 bash40-008 bash40-009 bash40-010 -PATCHFILES+= bash40-011 bash40-012 bash40-013 bash40-014 bash40-015 -PATCHFILES+= bash40-016 bash40-017 bash40-018 bash40-019 bash40-020 -PATCHFILES+= bash40-021 bash40-022 bash40-023 bash40-024 bash40-025 -PATCHFILES+= bash40-026 bash40-027 bash40-028 +#PATCH_SITES= ${MASTER_SITES:=bash-4.0-patches/} +#PATCHFILES+= bash40-001 bash40-002 bash40-003 bash40-004 bash40-005 MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://www.gnu.org/software/bash/bash.html diff --git a/shells/bash/PLIST b/shells/bash/PLIST index 0f417fc2aec..50639bcdc59 100644 --- a/shells/bash/PLIST +++ b/shells/bash/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/02/24 12:04:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/01/16 17:17:04 wiz Exp $ bin/bash bin/bashbug info/bash.info @@ -14,7 +14,9 @@ share/locale/en@quot/LC_MESSAGES/bash.mo share/locale/eo/LC_MESSAGES/bash.mo share/locale/es/LC_MESSAGES/bash.mo share/locale/et/LC_MESSAGES/bash.mo +share/locale/fi/LC_MESSAGES/bash.mo share/locale/fr/LC_MESSAGES/bash.mo +share/locale/ga/LC_MESSAGES/bash.mo share/locale/hu/LC_MESSAGES/bash.mo share/locale/id/LC_MESSAGES/bash.mo share/locale/ja/LC_MESSAGES/bash.mo diff --git a/shells/bash/distinfo b/shells/bash/distinfo index f1b0a292ccd..421795a4c6d 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,92 +1,7 @@ -$NetBSD: distinfo,v 1.18 2009/09/04 15:36:16 wiz Exp $ +$NetBSD: distinfo,v 1.19 2010/01/16 17:17:04 wiz Exp $ -SHA1 (bash-4.0.tar.gz) = 2bbed30879f9f424c091a846a48111c27d0b2370 -RMD160 (bash-4.0.tar.gz) = 82aba4b2cb475c2030904a9d22af6208dfa85eb3 -Size (bash-4.0.tar.gz) = 6230779 bytes -SHA1 (bash40-001) = dc47d547bec938afcd7b382816fec84077f3412f -RMD160 (bash40-001) = b8f1c1000b5cd12ecee79e29a73f3d576d0ad368 -Size (bash40-001) = 5156 bytes -SHA1 (bash40-002) = 21dc945126547df03e37a3b68cc4b80b788b9da6 -RMD160 (bash40-002) = bd361806bcfe324570638ebb1a127f197d5e3756 -Size (bash40-002) = 1220 bytes -SHA1 (bash40-003) = e4c120bdfd0c5bf16889e737e2c69268252812d6 -RMD160 (bash40-003) = bad695faa509341afa97f371dcbdbfee5844ed9b -Size (bash40-003) = 1749 bytes -SHA1 (bash40-004) = 5e885301acfe3f57add62b1d4a5ac801ab044c06 -RMD160 (bash40-004) = 35df532a05c159e68285ff618667860b4c0cdf61 -Size (bash40-004) = 1347 bytes -SHA1 (bash40-005) = fb109c36fad5ef1ce719ee7f0c8df33d70dd822e -RMD160 (bash40-005) = 1bcf3b9b32400f55470df55e410d717bfa16968c -Size (bash40-005) = 2021 bytes -SHA1 (bash40-006) = 7877182638032bbdd6281d1c5bcdb8e8c9648873 -RMD160 (bash40-006) = 441d9352ad02965bc6facc9cfe4e4db13e01af27 -Size (bash40-006) = 1133 bytes -SHA1 (bash40-007) = 477d2ad9665b09f97de1ec304055c553c531c16e -RMD160 (bash40-007) = 5a1bd8f24e3a33155ac9194d9c9efe2c12849713 -Size (bash40-007) = 6920 bytes -SHA1 (bash40-008) = e7f336204810905118a1689329b38df3abdc9522 -RMD160 (bash40-008) = 4dea0c385ec38af6613d07032aa504afb0d9eec8 -Size (bash40-008) = 1196 bytes -SHA1 (bash40-009) = 8f6f4d6ea5371805897f9435ab0dfe98318bc26b -RMD160 (bash40-009) = 886a6139a25346bb1703a7dca51a4f905f4f1951 -Size (bash40-009) = 1821 bytes -SHA1 (bash40-010) = b6ae8581201f10e4a2a87da077880bf65a0a5a9a -RMD160 (bash40-010) = 0a505d7fa2a2f576a46b6716d7f172098a303392 -Size (bash40-010) = 2152 bytes -SHA1 (bash40-011) = ab4daf25d8acf6793d7e60cbaa1fb2731cdd057b -RMD160 (bash40-011) = e1bb7d468eeef37e0167c0bef476f33dbce43650 -Size (bash40-011) = 1383 bytes -SHA1 (bash40-012) = c9215c1a8a5f30fe92fabfbbebd98b9c298dbf66 -RMD160 (bash40-012) = d0b5e71481991a80ba6a1d75779890838e49051e -Size (bash40-012) = 1459 bytes -SHA1 (bash40-013) = 2662229353256fa133bc96868c125855222e6007 -RMD160 (bash40-013) = 0ab5d07aba9303a2c69da8e76dbb12837984cf65 -Size (bash40-013) = 4629 bytes -SHA1 (bash40-014) = 8e2ada4c483ad219b479531e54e285576ef5c547 -RMD160 (bash40-014) = 232aa79556b0557af200df67f0c13543b4898f6a -Size (bash40-014) = 3709 bytes -SHA1 (bash40-015) = 41ac5d729bdb8756c4ee59e27db1eda2d88ff0d0 -RMD160 (bash40-015) = 76fbe55d6222efd59fe0eb6f9daa7badf101dda6 -Size (bash40-015) = 1914 bytes -SHA1 (bash40-016) = 2aba9164dda6f52872461276fa1ef175784c5535 -RMD160 (bash40-016) = 1ab774b4b6ab0964c53d9a73581081b29aea1ba9 -Size (bash40-016) = 3032 bytes -SHA1 (bash40-017) = b283d0079b5dfb66444ae1aa95ae37ff5803692d -RMD160 (bash40-017) = 692f5b1537351b68c0e9ad0aa597342cd01eb0fd -Size (bash40-017) = 1496 bytes -SHA1 (bash40-018) = 653671824b58bf81518b042db261d5cac669ce2e -RMD160 (bash40-018) = bc7d056dfb661059890abb34e80c5204dbf51000 -Size (bash40-018) = 2614 bytes -SHA1 (bash40-019) = 846df69cbef5dd37addeebeb168152fe6bcee845 -RMD160 (bash40-019) = 02c119daea6b2e414907e3dc386be907b3044c7d -Size (bash40-019) = 3309 bytes -SHA1 (bash40-020) = 8bae306cfc0d176f4ebd3cfbbe8d38f38ac9f787 -RMD160 (bash40-020) = 874a368171e9ce773a2f17a8339ba9e622eb83ce -Size (bash40-020) = 2666 bytes -SHA1 (bash40-021) = a1c785042f92b85564deb41d142a94dd045b9dac -RMD160 (bash40-021) = 057becc706b90a5c55d51baa425ee9546e3fa092 -Size (bash40-021) = 1547 bytes -SHA1 (bash40-022) = 7060344931a866b07754eb0b9d49039df4132053 -RMD160 (bash40-022) = a9c134b260cd4bde1d2c3352b52dcf5e0f333476 -Size (bash40-022) = 1592 bytes -SHA1 (bash40-023) = e6ccdbc145f81209c04541cbfcb6ba561e7fe8ea -RMD160 (bash40-023) = dbf73ebe9b63aceb61068a9f133a6d4a946af795 -Size (bash40-023) = 2148 bytes -SHA1 (bash40-024) = 3471e683167980dcb297bebe17f34646df560ce6 -RMD160 (bash40-024) = 484c6ef4e0bbe887ecff754db18aa25e62075529 -Size (bash40-024) = 3049 bytes -SHA1 (bash40-025) = ccd98dbb09f13b240ca95986ec55ae5f43e359b3 -RMD160 (bash40-025) = 3fd64c752c3e9f32472455247de52fd08bee1182 -Size (bash40-025) = 3435 bytes -SHA1 (bash40-026) = 39a9e0233efd5828f92ec7625643557fe628fe06 -RMD160 (bash40-026) = 5edce83d4910e1fadc004f0b35b1a84d624a2dfc -Size (bash40-026) = 1433 bytes -SHA1 (bash40-027) = 50976ef737ce3c01957a058ef5b496e152ebe7ac -RMD160 (bash40-027) = 99a2ba5a9b13d80039982966f7d18533387f66b1 -Size (bash40-027) = 2010 bytes -SHA1 (bash40-028) = bb3d83b79ed357c86bf75fc41eaf06e913e84c10 -RMD160 (bash40-028) = bc99e904e251a1f30a94359afc42ca2225fb4f29 -Size (bash40-028) = 5567 bytes -SHA1 (patch-aa) = 4ad4070c742d01372bd65a4466050f3100037e8f +SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150 +RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207 +Size (bash-4.1.tar.gz) = 6598300 bytes SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa deleted file mode 100644 index d9b9c868f54..00000000000 --- a/shells/bash/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/09/04 15:36:16 wiz Exp $ - ---- lib/glob/glob.c.orig 2009-09-04 15:33:42.000000000 +0000 -+++ lib/glob/glob.c -@@ -1018,14 +1018,6 @@ glob_filename (pathname, flags) - if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0') - { - dflags |= GX_ALLDIRS|GX_ADDCURDIR; --#if 0 -- /* If we want all directories (dflags & GX_ALLDIRS) and we're not -- being called recursively as something like `echo **/*.o' -- ((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from -- adding a null directory name to the front of the temp_results -- array. We turn off ADDCURDIR if not called recursively and -- dlen == 0 */ --#endif - if (directory_len == 0 && (flags & GX_ALLDIRS) == 0) - dflags &= ~GX_ADDCURDIR; - } |