diff options
| author | wiz <wiz@pkgsrc.org> | 2009-09-04 15:36:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-09-04 15:36:16 +0000 |
| commit | 215ae643d9f559de095dd5da4f29124846e1dddb (patch) | |
| tree | 445b9bd1e2c6dce9e5fe8e6ad6d0a57a86a5a32e | |
| parent | 782d837a9056d421f215ec6da2e135cbe22bc4b3 (diff) | |
| download | pkgsrc-215ae643d9f559de095dd5da4f29124846e1dddb.tar.gz | |
Remove code that triggers parsing bugs in older gccs (e.g. on
NetBSD-3.1/amd64).
Reported by Michael Lambert and David A. Holland.
| -rw-r--r-- | shells/bash/distinfo | 3 | ||||
| -rw-r--r-- | shells/bash/patches/patch-aa | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/shells/bash/distinfo b/shells/bash/distinfo index d1ff25dcc11..f1b0a292ccd 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2009/08/06 06:38:46 hasso Exp $ +$NetBSD: distinfo,v 1.18 2009/09/04 15:36:16 wiz Exp $ SHA1 (bash-4.0.tar.gz) = 2bbed30879f9f424c091a846a48111c27d0b2370 RMD160 (bash-4.0.tar.gz) = 82aba4b2cb475c2030904a9d22af6208dfa85eb3 @@ -87,5 +87,6 @@ Size (bash40-027) = 2010 bytes SHA1 (bash40-028) = bb3d83b79ed357c86bf75fc41eaf06e913e84c10 RMD160 (bash40-028) = bc99e904e251a1f30a94359afc42ca2225fb4f29 Size (bash40-028) = 5567 bytes +SHA1 (patch-aa) = 4ad4070c742d01372bd65a4466050f3100037e8f SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa new file mode 100644 index 00000000000..d9b9c868f54 --- /dev/null +++ b/shells/bash/patches/patch-aa @@ -0,0 +1,19 @@ +$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; + } |