rpms/grep/FC-4 grep-2.5.1-egf-speedup.patch, 1.13, 1.14 grep.spec, 1.50, 1.51

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/grep/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22281

Modified Files:
	grep-2.5.1-egf-speedup.patch grep.spec 
Log Message:
* Mon Jun 27 2005 Tim Waugh <twaugh at redhat.com> 2.5.1-48.1
- Fix 'grep -Fw' for encodings other than UTF-8 (bug #161700).


grep-2.5.1-egf-speedup.patch:
 search.c |  655 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 525 insertions(+), 130 deletions(-)

Index: grep-2.5.1-egf-speedup.patch
===================================================================
RCS file: /cvs/dist/rpms/grep/FC-4/grep-2.5.1-egf-speedup.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- grep-2.5.1-egf-speedup.patch	7 Jan 2005 15:03:52 -0000	1.13
+++ grep-2.5.1-egf-speedup.patch	27 Jun 2005 11:19:23 -0000	1.14
@@ -659,7 +659,7 @@
 +		}
 +	      else
 +#endif /* MBS_SUPPORT */
-+		if (beg + len >= buf + size && !WCHAR ((unsigned char) beg[len]))
++		if (beg + len >= buf + size || !WCHAR ((unsigned char) beg[len]))
 +		  word_match = 1;
 +	      if (word_match)
 +		{


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/FC-4/grep.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- grep.spec	13 Apr 2005 09:17:50 -0000	1.50
+++ grep.spec	27 Jun 2005 11:19:23 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 48
+Release: 48.1
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -92,6 +92,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 27 2005 Tim Waugh <twaugh at redhat.com> 2.5.1-48.1
+- Fix 'grep -Fw' for encodings other than UTF-8 (bug #161700).
+
 * Wed Apr 13 2005 Tim Waugh <twaugh at redhat.com>
 - Build requires recent pcre-devel (bug #154626).