Update grep to 2.12

This commit is contained in:
Chris Roberts
2012-05-03 04:48:52 +00:00
parent 82db272da5
commit cb54726d96
2 changed files with 40 additions and 0 deletions

View File

@@ -0,0 +1,26 @@
DESCRIPTION="GNU regular expression matcher"
HOMEPAGE="http://www.gnu.org/software/grep/"
SRC_URI="http://ftpmirror.gnu.org/grep/grep-2.12.tar.xz"
CHECKSUM_MD5="8d2f0346d08b13c18afb81f0e8aa1e2f"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="sys-devel/gettext >= 0.17
sys-devel/libiconv >= 1.13.1"
BUILD {
cd grep-2.12
libtoolize --force --copy --install
aclocal -I m4
autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd grep-2.12
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="1992-2012 Free Software Foundation, Inc."

View File

@@ -0,0 +1,14 @@
diff -up grep-2.12/src/kwsearch.c.orig grep-2.12/src/kwsearch.c
--- grep-2.12/src/kwsearch.c.orig 2012-02-27 02:35:19.015204352 -0700
+++ grep-2.12/src/kwsearch.c 2012-05-02 22:46:36.262668288 -0600
@@ -106,8 +106,9 @@ Fexecute (char const *buf, size_t size,
/* The match was a part of multibyte character, advance at least
one byte to ensure no infinite loop happens. */
mbstate_t s;
+ size_t mb_len;
memset (&s, 0, sizeof s);
- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s);
+ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s);
if (mb_len == (size_t) -2)
goto failure;
beg = mb_start;