uncompress patch for better performance on utf8 systemsbetter performance on utf8...

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 64742cd849b4a10928a9b43f877f71ea488348e9..60d6d00514c4ad2c1df82c343d39ad34e109f236 100644 (file)
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,29 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8741c3260750de0038a525533c968ee1 ChangeLog 8171
+MD5 a6b713632ad06779ad521eb06562edf8 ChangeLog 8405
 MD5 792f6cb13959979de2b10537067603bb files/2.5.1-manpage-line-buffering.patch 477
 MD5 41f77ef6693dc91a37b5ec51ce5a3e2d files/2.5.1-manpage.patch 283
 MD5 16d6cd54c93041d4f4bef59a9e327d04 files/2.5.1-tests.patch 1786
 MD5 e39e9fd198a2c0a5984f2c7d188b3c49 files/2.5.1-utf8-case.patch 933
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r6 62
-MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r7 62
 MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r8 62
+MD5 5dcaa51f88b364134a43d60b661870ee files/digest-grep-2.5.1-r9 62
 MD5 b43c763953a7b7d3345fc0dd625f299c files/grep-2.5.1-fgrep.patch.bz2 1678
+MD5 26b2ee006a2293540cadc27d9d41267a files/grep-2.5.1-fix-devices-skip.patch 1842
 MD5 294f8a32ae3036ebbf393610a286d80e files/grep-2.5.1-gofast.patch.bz2 4389
 MD5 f2f8cec983dc49b399880ab8eae882cb files/grep-2.5.1-i18n.patch.bz2 2903
 MD5 af3a45582aa7c857f0500c63c823bd52 files/grep-2.5.1-libintl.patch 2662
-MD5 575345b799197d6c79fe93c757664262 files/grep-2.5.1-oi.patch.bz2 831
+MD5 f108b43aae8b2abc6326efa8ab44e8dd files/grep-2.5.1-oi.patch 1695
 MD5 b6da5288895ddd97074deb10f48b4364 files/grep-2.5.1-perl-segv.patch 410
 MD5 1eee743f3bf8a7926c07f9a0307a6b64 files/grep-2.5.1-restrict_arr.patch 410
-MD5 97b1eaf5feac1593d7085913ce9b5deb grep-2.5.1-r6.ebuild 2240
-MD5 5c1510e20a43c023fa1329fb8ef59efc grep-2.5.1-r7.ebuild 1990
-MD5 9a1871636c1f45f002422424d566cab0 grep-2.5.1-r8.ebuild 2091
+MD5 d2f3ae97c78e82789156a70976b35a39 grep-2.5.1-r6.ebuild 2237
+MD5 ff75e5df1dad1b337c9aed5313bc07be grep-2.5.1-r8.ebuild 2085
+MD5 e853cf278bda1dc5f46c743c9f3fe197 grep-2.5.1-r9.ebuild 2156
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK3mTI1lqEGTUzyQRAsl8AJsGEouqxLQIzA9JmtIR2RtGXJkARwCeIPqT
-E1rYSuWsr6eBPMRlH9bycjY=
-=vGnV
------END PGP SIGNATURE-----

diff --git a/sys-apps/grep/files/grep-2.5.1-oi.patch b/sys-apps/grep/files/grep-2.5.1-oi.patch
new file mode 100644 (file)
index 0000000..eb997ad
--- /dev/null
+++ b/sys-apps/grep/files/grep-2.5.1-oi.patch
@@ -0,0 +1,48 @@
+--- grep-2.5.1/lib/posix/regex.h.oi    2004-01-05 12:09:12.984391131 +0000
++++ grep-2.5.1/lib/posix/regex.h       2004-01-05 12:09:24.717990622 +0000
+@@ -109,6 +109,10 @@
+    If not set, \{, \}, {, and } are literals.  */
+ #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
+ 
++/* If this bit is set, then ignore case when matching.
++   If not set, then case is significant.  */
++#define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
++
+ /* If this bit is set, +, ? and | aren't recognized as operators.
+    If not set, they are.  */
+ #define RE_LIMITED_OPS (RE_INTERVALS << 1)
+--- grep-2.5.1/src/search.c.oi 2004-01-05 12:07:00.550199415 +0000
++++ grep-2.5.1/src/search.c    2004-01-05 12:07:00.566197505 +0000
+@@ -31,7 +31,7 @@
+ 
+ #include "system.h"
+ #include "grep.h"
+-#include "regex.h"
++#include <regex.h>
+ #include "dfa.h"
+ #include "kwset.h"
+ #include "error.h"
+@@ -190,7 +190,7 @@
+   size_t total = size;
+   char const *motif = pattern;
+ 
+-  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE);
++  re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE | (match_icase ? RE_ICASE : 0));
+   dfasyntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE, match_icase, eolbyte);
+ 
+   /* For GNU regex compiler we have to pass the patterns separately to detect
+@@ -268,12 +268,12 @@
+ 
+   if (strcmp (matcher, "awk") == 0)
+     {
+-      re_set_syntax (RE_SYNTAX_AWK);
++      re_set_syntax (RE_SYNTAX_AWK | (match_icase ? RE_ICASE : 0));
+       dfasyntax (RE_SYNTAX_AWK, match_icase, eolbyte);
+     }
+   else
+     {
+-      re_set_syntax (RE_SYNTAX_POSIX_EGREP);
++      re_set_syntax (RE_SYNTAX_POSIX_EGREP | (match_icase ? RE_ICASE : 0));
+       dfasyntax (RE_SYNTAX_POSIX_EGREP, match_icase, eolbyte);
+     }
+ 

diff --git a/sys-apps/grep/files/grep-2.5.1-oi.patch.bz2 b/sys-apps/grep/files/grep-2.5.1-oi.patch.bz2
deleted file mode 100644 (file)
index 55fb685..0000000
Binary files a/sys-apps/grep/files/grep-2.5.1-oi.patch.bz2 and /dev/null differ