RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: bash Date: 09-May-2009 18:13:55 Branch: HEAD Handle: 2009050916135500 Modified files: bash parse.y patchlevel.h Log: - jbj: apply bash40-006. Summary: Revision Changes Path 1.4 +1 -0 bash/parse.y 1.7 +1 -1 bash/patchlevel.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: bash/parse.y ============================================================================ $ cvs diff -u -r1.3 -r1.4 parse.y --- bash/parse.y 9 May 2009 16:11:56 -0000 1.3 +++ bash/parse.y 9 May 2009 16:13:55 -0000 1.4 @@ -4477,6 +4477,7 @@ case '}': /* XXX */ case AND_AND: case BANG: + case BAR_AND: case DO: case DONE: case ELIF: @@ . patch -p0 <<'@@ .' Index: bash/patchlevel.h ============================================================================ $ cvs diff -u -r1.6 -r1.7 patchlevel.h --- bash/patchlevel.h 9 May 2009 16:13:06 -0000 1.6 +++ bash/patchlevel.h 9 May 2009 16:13:55 -0000 1.7 @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 5 +#define PATCHLEVEL 6 #endif /* _PATCHLEVEL_H_ */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org