rpms/bash/devel bash31-015, NONE, 1.1 bash31-016, NONE, 1.1 bash.spec, 1.114, 1.115
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 4 12:44:32 UTC 2006
- Previous message (by thread): rpms/vim/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vim.spec, 1.101, 1.102 vim-6.3-dnssyntax.patch, 1.1, NONE
- Next message (by thread): rpms/bash/devel bash.spec,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26140
Modified Files:
bash.spec
Added Files:
bash31-015 bash31-016
Log Message:
* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
- Patchlevel 15.
--- NEW FILE bash31-015 ---
BASH PATCH REPORT
=================
Bash-Release: 3.1
Patch-ID: bash31-015
Bug-Reported-by: Benoit Vila
Bug-Reference-ID: <43FCA614.1090108 at free.fr>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00058.html
Bug-Description:
A problem with the extended globbing code prevented dots from matching
filenames when used in some extended matching patterns.
Patch:
*** ../bash-3.1-patched/lib/glob/sm_loop.c Sun Oct 16 21:21:04 2005
--- lib/glob/sm_loop.c Mon Feb 27 17:18:43 2006
***************
*** 639,643 ****
CHAR *pnext; /* pointer to next sub-pattern */
CHAR *srest; /* pointer to rest of string */
! int m1, m2;
#if DEBUG_MATCHING
--- 638,642 ----
CHAR *pnext; /* pointer to next sub-pattern */
CHAR *srest; /* pointer to rest of string */
! int m1, m2, xflags; /* xflags = flags passed to recursive matches */
#if DEBUG_MATCHING
***************
*** 645,648 ****
--- 644,648 ----
fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se);
fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe);
+ fprintf(stderr, "extmatch: flags = %d\n", flags);
#endif
***************
*** 678,683 ****
multiple matches of the pattern. */
if (m1)
! m2 = (GMATCH (srest, se, prest, pe, flags) == 0) ||
! (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0);
if (m1 && m2)
return (0);
--- 678,687 ----
multiple matches of the pattern. */
if (m1)
! {
! /* if srest > s, we are not at start of string */
! xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
! m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) ||
! (s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0);
! }
if (m1 && m2)
return (0);
***************
*** 705,710 ****
for ( ; srest <= se; srest++)
{
if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
! GMATCH (srest, se, prest, pe, flags) == 0)
return (0);
}
--- 709,716 ----
for ( ; srest <= se; srest++)
{
+ /* if srest > s, we are not at start of string */
+ xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 &&
! GMATCH (srest, se, prest, pe, xflags) == 0)
return (0);
}
***************
*** 727,731 ****
break;
}
! if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0)
return (0);
}
--- 733,739 ----
break;
}
! /* if srest > s, we are not at start of string */
! xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags;
! if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0)
return (0);
}
*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005
--- patchlevel.h Wed Dec 7 13:48:42 2005
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 14
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 15
#endif /* _PATCHLEVEL_H_ */
--- NEW FILE bash31-016 ---
BASH PATCH REPORT
=================
Bash-Release: 3.1
Patch-ID: bash31-016
Bug-Reported-by: Nikita Danilov <nikita at clusterfs.com>
Bug-Reference-ID: <17397.51015.769854.541057 at gargle.gargle.HOWL>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00064.html
Bug-Description:
Bash will dump core when attempting to perform globbing in directories with
very large numbers of files.
Patch:
*** ../bash-3.1-patched/lib/glob/glob.c Thu Mar 24 12:42:27 2005
--- lib/glob/glob.c Fri Mar 3 16:54:12 2006
***************
*** 361,364 ****
--- 361,365 ----
firstmalloc = 0;
+ nalloca = 0;
/* If PAT is empty, skip the loop, but return one (empty) filename. */
***************
*** 547,550 ****
--- 551,556 ----
tmplink = lastlink;
}
+ else
+ tmplink = 0;
free (lastlink->name);
lastlink = lastlink->next;
*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005
--- patchlevel.h Wed Dec 7 13:48:42 2005
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 15
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */
Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- bash.spec 23 Mar 2006 10:01:51 -0000 1.114
+++ bash.spec 4 Apr 2006 12:44:29 -0000 1.115
@@ -1,7 +1,7 @@
Version: 3.1
Name: bash
Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 10
+Release: 11
Group: System Environment/Shells
License: GPL
Url: http://www.gnu.org/software/bash
@@ -25,6 +25,8 @@
Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-012
Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-013
Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-014
+Patch15: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-015
+Patch16: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-016
# Other patches
Patch100: bash-2.03-paths.patch
Patch101: bash-2.02-security.patch
@@ -77,6 +79,8 @@
%patch12 -p0 -b .012
%patch13 -p0 -b .013
%patch14 -p0 -b .014
+%patch15 -p0 -b .015
+%patch16 -p0 -b .016
# Other patches
%patch100 -p1 -b .paths
@@ -228,6 +232,9 @@
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog
+* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com> 3.1-11
+- Patchlevel 15.
+
* Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com> 3.1-10
- Patchlevel 14.
- Previous message (by thread): rpms/vim/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vim.spec, 1.101, 1.102 vim-6.3-dnssyntax.patch, 1.1, NONE
- Next message (by thread): rpms/bash/devel bash.spec,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list