rpms/grep/devel grep-bz460641.patch,NONE,1.1 grep.spec,1.73,1.74

Štěpán Kasal kasal at fedoraproject.org
Thu Jan 8 09:17:13 UTC 2009


Author: kasal

Update of /cvs/extras/rpms/grep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1596

Modified Files:
	grep.spec 
Added Files:
	grep-bz460641.patch 
Log Message:
bug #460641 (a.k.a. 479152)

grep-bz460641.patch:

--- NEW FILE grep-bz460641.patch ---
diff -up grep-2.5.3/src/search.c.bz479152 grep-2.5.3/src/search.c
--- grep-2.5.3/src/search.c.bz479152	2009-01-08 09:57:12.000000000 +0100
+++ grep-2.5.3/src/search.c	2009-01-08 09:58:57.000000000 +0100
@@ -757,7 +757,7 @@ EXECUTE_FCT(Fexecute)
   const char *last_char = NULL;
 #endif /* MBS_SUPPORT */
 
-  for (beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
+  for (beg = start_ptr ? start_ptr : buf; beg < buf + size; beg++)
     {
       size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch);
       if (offset == (size_t) -1)


Index: grep.spec
===================================================================
RCS file: /cvs/extras/rpms/grep/devel/grep.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- grep.spec	24 Nov 2008 09:52:09 -0000	1.73
+++ grep.spec	8 Jan 2009 09:16:42 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@@ -12,6 +12,8 @@
 Patch2: grep-2.5.3-pcrewrap.patch
 Patch3: grep-2.5.3-case.patch
 Patch4: grep-2.5.3-egf-speedup.patch
+# bug #460641 (a.k.a. 479152)
+Patch40: grep-bz460641.patch
 Patch5: grep-2.5.1a-utf8.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
@@ -34,6 +36,7 @@
 %patch2 -p1 -b .pcrewrap
 %patch3 -p1 -b .case
 %patch4 -p1 -b .egf-speedup
+%patch40 -p1 -b .bz460641
 %patch5 -p1 -b .utf8
 
 %build
@@ -73,6 +76,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan  8 2009 Stepan Kasal <skasal at redhat.com> 2.5.3-2
+- fix bug #460641 (a.k.a. 479152)
+
 * Thu Nov 20 2008 Lubomir Rintel <lkundrak at v3.sk> 2.5.3-1
 - Update to latest upstream version
 - Drop upstreamed patches




More information about the fedora-extras-commits mailing list