From 41ed4935a4232f664e2b54c017ee2b855f52a522 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 18 2004 13:30:38 +0000
Subject: - Fixed a bug in the fgrep patch, exposed by the dfa-optional patch (bug

    #138558).

---

diff --git a/grep-2.5.1-dfa-optional.patch b/grep-2.5.1-dfa-optional.patch
index aa7e79a..4bc1272 100644
--- a/grep-2.5.1-dfa-optional.patch
+++ b/grep-2.5.1-dfa-optional.patch
@@ -64,16 +64,3 @@
  	    goto success_in_beg_and_end;
  	}
        else
-@@ -450,7 +475,11 @@
- 		    if ((start == 0 || !WCHAR ((unsigned char) beg[start - 1]))
- 			&& (len == end - beg - 1
- 			    || !WCHAR ((unsigned char) beg[start + len])))
--		      goto success_in_start_and_len;
-+		      {
-+			if (len == 0)
-+			  len++;
-+			goto success_in_start_and_len;
-+		      }
- 		    if (len > 0)
- 		      {
- 			/* Try a shorter length anchored at the same place. */
diff --git a/grep-2.5.1-fgrep.patch b/grep-2.5.1-fgrep.patch
index 6d9f68b..6a69637 100644
--- a/grep-2.5.1-fgrep.patch
+++ b/grep-2.5.1-fgrep.patch
@@ -56,7 +56,7 @@
  			&& (len == end - beg - 1
  			    || !WCHAR ((unsigned char) beg[start + len])))
 -		      goto success;
-+		      goto success_in_start_and_len;
++		      goto success_in_beg_and_end;
  		    if (len > 0)
  		      {
  			/* Try a shorter length anchored at the same place. */
diff --git a/grep.spec b/grep.spec
index 4db01e4..492a71b 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 39
+Release: 40
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2
@@ -85,6 +85,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Thu Nov 18 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-40
+- Fixed a bug in the fgrep patch, exposed by the dfa-optional patch
+  (bug #138558).
+
 * Tue Nov 16 2004 Tim Waugh <twaugh@redhat.com> 2.5.1-39
 - Fixed last patch.