Fix UTF8 case matching with a patch from Debian #76192 by Michael Mauch. Also update one of the tests to fix #63507 by Daniel Black.

6 files changed, 49 insertions, 13 deletions

diff --git a/sys-apps/grep/files/2.5.1-manpage-line-buffering.diff b/sys-apps/grep/files/2.5.1-manpage-line-buffering.patch
index 8b32dd2984d7..6a417a9b9b4d 100644
--- a/sys-apps/grep/files/2.5.1-manpage-line-buffering.diff
+++ b/sys-apps/grep/files/2.5.1-manpage-line-buffering.patch
@@ -1,3 +1,6 @@
+grep recognizes '--line-buffered' instead of '--line-buffering'
+taviso (20 Aug 2004)
+
 --- doc/grep.1.orig	2004-08-20 09:28:45.857442048 +0100
 +++ doc/grep.1	2004-08-20 09:27:20.959348520 +0100
 @@ -303,7 +303,7 @@
diff --git a/sys-apps/grep/files/2.5.1-tests.patch b/sys-apps/grep/files/2.5.1-tests.patch
new file mode 100644
index 000000000000..c0f98945eaaa
--- /dev/null
+++ b/sys-apps/grep/files/2.5.1-tests.patch
@@ -0,0 +1,13 @@
+glibc has changed the error code it returns from '1' to '2'.  The 
+included grep regex library returns '1' still though, so spencer 
+test #55 incorrectly fails.  For now, we update the test to match 
+the glibc regex since that is what we're using ;).
+
+http://bugs.gentoo.org/show_bug.cgi?id=76192
+http://linuxfromscratch.org/pipermail/lfs-dev/2003-February/032543.html
+
+--- tests/spencer1.tests.orig	2005-01-06 00:17:34.550645568 -0500
++++ tests/spencer1.tests	2005-01-06 00:18:43.682135984 -0500
+@@ -55 +55 @@
+-1@(*)b@-
++2@(*)b@-
diff --git a/sys-apps/grep/files/2.5.1-utf8-case.patch b/sys-apps/grep/files/2.5.1-utf8-case.patch
new file mode 100644
index 000000000000..c8842709daf9
--- /dev/null
+++ b/sys-apps/grep/files/2.5.1-utf8-case.patch
@@ -0,0 +1,29 @@
+Grabbed from Debian:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=249245
+
+To fix Gentoo bug:
+http://bugs.gentoo.org/show_bug.cgi?id=76192
+
+--- grep-2.5.1.orig/src/dfa.c	2004-10-19 02:07:23.000000000 +0900
++++ grep-2.5.1/src/dfa.c	2004-10-19 02:24:28.000000000 +0900
+@@ -652,6 +652,20 @@
+ 	  REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al,
+ 			       work_mbc->nchars + 1);
+ 	  work_mbc->chars[work_mbc->nchars++] = (wchar_t)wc;
++	  if (case_fold && (iswlower((wint_t) wc) || iswupper((wint_t) wc)))
++	    {
++		wint_t altcase;
++
++		altcase = wc;		/* keeps compiler happy */
++		if (iswlower((wint_t) wc))
++		  altcase = towupper((wint_t) wc);
++		else if (iswupper((wint_t) wc))
++		  altcase = towlower((wint_t) wc);
++
++		REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al,
++			       work_mbc->nchars + 1);
++		work_mbc->chars[work_mbc->nchars++] = (wchar_t) altcase;
++	    }
+ 	}
+     }
+   while ((wc = wc1) != L']');
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r7 b/sys-apps/grep/files/digest-grep-2.5.1-r7
new file mode 100644
index 000000000000..ef03a032aa20
--- /dev/null
+++ b/sys-apps/grep/files/digest-grep-2.5.1-r7
@@ -0,0 +1 @@
+MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/files/gentoo-sparc32-dfa.patch b/sys-apps/grep/files/gentoo-sparc32-dfa.patch
deleted file mode 100644
index 20295fc43fdd..000000000000
--- a/sys-apps/grep/files/gentoo-sparc32-dfa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-*** src/dfa.h	Fri Apr 25 01:36:02 2003
---- src/dfa.h.mod	Fri Apr 25 01:36:56 2003
-***************
-*** 428,432 ****
---- 428,433 ----
-  
-  /* dfaerror() is called by the regexp routines whenever an error occurs.  It
-     takes a single argument, a NUL-terminated string describing the error.
-     The user must supply a dfaerror.  */
-  extern void dfaerror PARAMS ((const char *));
-+ 
diff --git a/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
index aa71bbcb9db0..54caa355c2fa 100644
--- a/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
+++ b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
@@ -1,10 +1,11 @@
 --- lib/posix/regex.h.mps	2004-06-09 22:00:00.000000000 +0200
 +++ lib/posix/regex.h	2004-06-09 22:00:40.000000000 +0200
-@@ -533,7 +533,9 @@ extern int re_exec _RE_ARGS ((const char
+@@ -533,7 +533,10 @@ extern int re_exec _RE_ARGS ((const char
  /* For now unconditionally define __restrict_arr to expand to nothing.
     Ideally we would have a test for the compiler which allows defining
     it to restrict.  */
-+#ifndef __restrict_arr
++#include <features.h>
++#if !defined(__UCLIBC__) || !defined(__restrict_arr)
  #define __restrict_arr
 +#endif