From 3bfe887513811c20d4279af6b60c5e27dcf47929 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 4 Jun 2014 21:00:47 +0000 Subject: [PATCH] grep: recipe for version 2.20 --- sys-apps/grep/grep-2.20.recipe | 68 ++++ sys-apps/grep/patches/grep-2.20.patchset | 420 +++++++++++++++++++++++ 2 files changed, 488 insertions(+) create mode 100644 sys-apps/grep/grep-2.20.recipe create mode 100644 sys-apps/grep/patches/grep-2.20.patchset diff --git a/sys-apps/grep/grep-2.20.recipe b/sys-apps/grep/grep-2.20.recipe new file mode 100644 index 000000000..e87c73bab --- /dev/null +++ b/sys-apps/grep/grep-2.20.recipe @@ -0,0 +1,68 @@ +SUMMARY="GNU regular expression matcher" +DESCRIPTION=" +The grep command searches one or more input files for lines containing a match \ +to a specified pattern. By default, grep prints the matching lines. +" +HOMEPAGE="http://www.gnu.org/software/grep/" +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2014 Free Software Foundation, Inc." +SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.20.tar.xz" +CHECKSUM_SHA256="f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" + +PATCHES="grep-2.20.patchset" + +PROVIDES=" + grep = $portVersion compat >= 2 + cmd:egrep = $portVersion compat >= 2 + cmd:fgrep = $portVersion compat >= 2 + cmd:grep = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + lib:libintl + " +BUILD_REQUIRES=" + devel:libiconv + devel:libintl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:gettext + cmd:ld + cmd:libtoolize + cmd:make + " + +defineDebugInfoPackage grep \ + $binDir/grep + + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + runConfigure ./configure \ + --disable-perl-regexp --disable-gcc-warnings + make $jobArgs +} + +INSTALL() +{ + make install + + rm $libDir/charset.alias + rmdir $libDir +} + +TEST() +{ + make check +} diff --git a/sys-apps/grep/patches/grep-2.20.patchset b/sys-apps/grep/patches/grep-2.20.patchset new file mode 100644 index 000000000..9fe1e2c7d --- /dev/null +++ b/sys-apps/grep/patches/grep-2.20.patchset @@ -0,0 +1,420 @@ +From 38dd3e2a6c52f5b15da9502d582f290b036f0e85 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 4 Jun 2014 19:20:57 +0000 +Subject: gcc2 patch + + +diff --git a/lib/fts.c b/lib/fts.c +index 500e92c..e2180c7 100644 +--- a/lib/fts.c ++++ b/lib/fts.c +@@ -1293,6 +1293,7 @@ fts_build (register FTS *sp, int type) + int dir_fd; + FTSENT *cur = sp->fts_cur; + bool continue_readdir = !!cur->fts_dirp; ++ size_t max_entries; + + /* When cur->fts_dirp is non-NULL, that means we should + continue calling readdir on that existing DIR* pointer +@@ -1354,7 +1355,7 @@ fts_build (register FTS *sp, int type) + function. But when no such function is specified, we can read + entries in batches that are large enough to help us with inode- + sorting, yet not so large that we risk exhausting memory. */ +- size_t max_entries = (sp->fts_compar == NULL ++ max_entries = (sp->fts_compar == NULL + ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX); + + /* +diff --git a/src/dfasearch.c b/src/dfasearch.c +index 77b4e3e..076f49c 100644 +--- a/src/dfasearch.c ++++ b/src/dfasearch.c +@@ -95,13 +95,17 @@ kwsmusts (void) + of the matching string that it chooses. */ + for (; dm; dm = dm->next) + { ++ char *must; ++ char *mp; ++ size_t old_len; ++ size_t new_len; + if (!dm->exact) + continue; + ++kwset_exact_matches; +- size_t old_len = strlen (dm->must); +- size_t new_len = old_len + dm->begline + dm->endline; +- char *must = xmalloc (new_len); +- char *mp = must; ++ old_len = strlen (dm->must); ++ new_len = old_len + dm->begline + dm->endline; ++ must = xmalloc (new_len); ++ mp = must; + *mp = eolbyte; + mp += dm->begline; + begline |= dm->begline; +@@ -126,6 +130,7 @@ kwsmusts (void) + void + GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits) + { ++ char const *p; + size_t total = size; + char *motif; + +@@ -138,9 +143,10 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits) + "[\nallo\n]\n", where the patterns are "[", "allo" and "]", and + this should be a syntax error. The same for backref, where the + backref should be local to each pattern. */ +- char const *p = pattern; ++ p = pattern; + do + { ++ char const *err; + size_t len; + char const *sep = memchr (p, '\n', total); + if (sep) +@@ -158,7 +164,7 @@ GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits) + patterns = xnrealloc (patterns, pcount + 1, sizeof *patterns); + patterns[pcount] = patterns0; + +- char const *err = re_compile_pattern (p, len, ++ err = re_compile_pattern (p, len, + &(patterns[pcount].regexbuf)); + if (err) + error (EXIT_TROUBLE, 0, "%s", err); +@@ -218,6 +224,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size, + size_t i; + struct dfa *superset = dfasuperset (dfa); + bool dfafast = dfaisfast (dfa); ++ size_t off; + + mb_start = buf; + buflim = buf + size; +@@ -448,7 +455,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size, + success: + len = end - beg; + success_in_len:; +- size_t off = beg - buf; ++ off = beg - buf; + *match_size = len; + return off; + } +diff --git a/src/dosbuf.c b/src/dosbuf.c +index 9ac2d13..92383d2 100644 +--- a/src/dosbuf.c ++++ b/src/dosbuf.c +@@ -95,11 +95,11 @@ guess_type (char *buf, size_t buflen) + static int + undossify_input (char *buf, size_t buflen) + { ++ int chars_left = 0; ++ + if (! O_BINARY) + return buflen; + +- int chars_left = 0; +- + if (totalcc == 0) + { + /* New file: forget everything we knew about character +@@ -186,12 +186,12 @@ undossify_input (char *buf, size_t buflen) + static off_t + dossified_pos (off_t byteno) + { +- if (! O_BINARY) +- return byteno; +- + off_t pos_lo; + off_t pos_hi; + ++ if (! O_BINARY) ++ return byteno; ++ + if (dos_file_type != DOS_TEXT || dos_report_unix_offset) + return byteno; + +diff --git a/src/grep.c b/src/grep.c +index 7c0f8a8..7e3f8dd 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -460,6 +460,7 @@ file_is_binary (char const *buf, size_t bufsize, int fd, struct stat const *st) + /* If the file has holes, it must contain a null byte somewhere. */ + if (SEEK_HOLE != SEEK_END && usable_st_size (st)) + { ++ off_t hole_start; + off_t cur = bufsize; + if (O_BINARY || fd == STDIN_FILENO) + { +@@ -469,7 +470,7 @@ file_is_binary (char const *buf, size_t bufsize, int fd, struct stat const *st) + } + + /* Look for a hole after the current location. */ +- off_t hole_start = lseek (fd, cur, SEEK_HOLE); ++ hole_start = lseek (fd, cur, SEEK_HOLE); + if (0 <= hole_start) + { + if (lseek (fd, cur, SEEK_SET) < 0) +@@ -983,11 +984,13 @@ prtext (char const *beg, char const *lim) + { + static bool used; /* Avoid printing SEP_STR_GROUP before any output. */ + char eol = eolbyte; ++ char const *p; ++ intmax_t n; + + if (!out_quiet && pending > 0) + prpending (beg); + +- char const *p = beg; ++ p = beg; + + if (!out_quiet) + { +@@ -1020,7 +1023,6 @@ prtext (char const *beg, char const *lim) + } + } + +- intmax_t n; + if (out_invert) + { + /* One or more lines are output. */ +@@ -1103,6 +1105,7 @@ grepbuf (char const *beg, char const *lim) + + for (p = beg; p < lim; p = endp) + { ++ char const *b; + size_t match_size; + size_t match_offset = do_execute (p, lim - p, &match_size); + if (match_offset == (size_t) -1) +@@ -1112,7 +1115,7 @@ grepbuf (char const *beg, char const *lim) + match_offset = lim - p; + match_size = 0; + } +- char const *b = p + match_offset; ++ b = p + match_offset; + endp = b + match_size; + /* Avoid matching the empty line at the end of the buffer. */ + if (!out_invert && b == lim) +@@ -1942,6 +1945,7 @@ main (int argc, char **argv) + int fread_errno; + intmax_t default_context; + FILE *fp; ++ struct stat tmp_stat; + exit_failure = EXIT_TROUBLE; + initialize_main (&argc, &argv); + set_program_name (argv[0]); +@@ -2297,7 +2301,6 @@ main (int argc, char **argv) + if (show_help) + usage (EXIT_SUCCESS); + +- struct stat tmp_stat; + if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode)) + out_stat = tmp_stat; + +diff --git a/src/kwsearch.c b/src/kwsearch.c +index 6bd516a..c5e7e55 100644 +--- a/src/kwsearch.c ++++ b/src/kwsearch.c +@@ -38,16 +38,18 @@ Fcompile (char const *pattern, size_t size) + { + size_t total = size; + mb_len_map_t *map = NULL; ++ char const *p; + char const *pat = (match_icase && MB_CUR_MAX > 1 + ? mbtoupper (pattern, &total, &map) + : pattern); + + kwsinit (&kwset); + +- char const *p = pat; ++ p = pat; + do + { + size_t len; ++ char *buf = NULL; + char const *sep = memchr (p, '\n', total); + if (sep) + { +@@ -61,7 +63,6 @@ Fcompile (char const *pattern, size_t size) + total = 0; + } + +- char *buf = NULL; + if (match_lines) + { + buf = xmalloc (len + 2); +@@ -110,6 +111,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size, + char eol = eolbyte; + struct kwsmatch kwsmatch; + size_t ret_val; ++ size_t off; + mb_len_map_t *map = NULL; + + if (MB_CUR_MAX > 1) +@@ -179,7 +181,7 @@ Fexecute (char const *buf, size_t size, size_t *match_size, + --beg; + len = end - beg; + success_in_beg_and_len:; +- size_t off = beg - buf; ++ off = beg - buf; + mb_case_map_apply (map, &off, &len); + + *match_size = len; +diff --git a/src/kwset.c b/src/kwset.c +index 6d21893..8df7cd4 100644 +--- a/src/kwset.c ++++ b/src/kwset.c +@@ -162,6 +162,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len) + installing new nodes when necessary. */ + while (len--) + { ++ int depth = 1; + unsigned char uc = *--text; + unsigned char label = trans ? trans[uc] : uc; + +@@ -173,8 +174,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len) + enum { L, R } dirs[DEPTH_SIZE]; + links[0] = (struct tree *) &trie->links; + dirs[0] = L; +- int depth = 1; +- ++ + while (link && label != link->label) + { + links[depth] = link; +@@ -392,10 +392,13 @@ treenext (struct tree const *tree, struct trie *next[]) + void + kwsprep (kwset_t kwset) + { ++ struct trie *curr, *last; + char const *trans = kwset->trans; + int i; + unsigned char deltabuf[NCHAR]; + unsigned char *delta = trans ? deltabuf : kwset->delta; ++ struct trie *nextbuf[NCHAR]; ++ struct trie **next; + + /* Initial values for the delta table; will be changed later. The + delta entry for a given character is the smallest depth of any +@@ -404,9 +407,10 @@ kwsprep (kwset_t kwset) + + /* Traverse the nodes of the trie in level order, simultaneously + computing the delta table, failure function, and shift function. */ +- struct trie *curr, *last; + for (curr = last = kwset->trie; curr; curr = curr->next) + { ++ struct trie *fail; ++ + /* Enqueue the immediate descendants in the level order queue. */ + enqueue (curr->links, &last); + +@@ -421,7 +425,6 @@ kwsprep (kwset_t kwset) + + /* Update the shifts at each node in the current node's chain + of fails back to the root. */ +- struct trie *fail; + for (fail = curr->fail; fail; fail = fail->fail) + { + /* If the current node has some outgoing edge that the fail +@@ -451,8 +454,7 @@ kwsprep (kwset_t kwset) + + /* Create a vector, indexed by character code, of the outgoing links + from the root node. */ +- struct trie *nextbuf[NCHAR]; +- struct trie **next = trans ? nextbuf : kwset->next; ++ next = trans ? nextbuf : kwset->next; + memset (next, 0, sizeof nextbuf); + treenext (kwset->trie->links, next); + if (trans) +@@ -463,6 +465,8 @@ kwsprep (kwset_t kwset) + of the hairy commentz-walter algorithm. */ + if (kwset->words == 1) + { ++ char gc1; ++ int gc1help = -1; + /* Looking for just one string. Extract it from the trie. */ + kwset->target = obstack_alloc (&kwset->obstack, kwset->mind); + for (i = kwset->mind - 1, curr = kwset->trie; i >= 0; --i) +@@ -484,11 +488,10 @@ kwsprep (kwset_t kwset) + } + } + +- char gc1 = tr (trans, kwset->target[kwset->mind - 1]); ++ gc1 = tr (trans, kwset->target[kwset->mind - 1]); + + /* Set GC1HELP according to whether exactly one, exactly two, or + three-or-more characters match GC1. */ +- int gc1help = -1; + if (trans) + { + char const *equiv1 = memchr (trans, gc1, NCHAR); +@@ -570,13 +573,16 @@ bm_delta2_search (char const **tpp, char const *ep, char const *sp, int len, + static char const * + memchr_kwset (char const *s, size_t n, kwset_t kwset) + { ++ int small_heuristic = 2; ++ int small; ++ size_t ntrans; ++ char const *slim; + if (kwset->gc1help < 0) + return memchr (s, kwset->gc1, n); +- int small_heuristic = 2; +- int small = (- (uintptr_t) s % sizeof (long) ++ small = (- (uintptr_t) s % sizeof (long) + + small_heuristic * sizeof (long)); +- size_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n; +- char const *slim = s + ntrans; ++ ntrans = kwset->gc1help < NCHAR && small < n ? small : n; ++ slim = s + ntrans; + for (; s < slim; s++) + if (kwset->trans[U(*s)] == kwset->gc1) + return s; +@@ -593,6 +599,7 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + int d; + int len = kwset->mind; + char const *trans = kwset->trans; ++ char gc1, gc2; + + if (len == 0) + return 0; +@@ -607,8 +614,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + d1 = kwset->delta; + sp = kwset->target + len; + tp = text + len; +- char gc1 = kwset->gc1; +- char gc2 = kwset->gc2; ++ gc1 = kwset->gc1; ++ gc2 = kwset->gc2; + + /* Significance of 12: 1 (initial offset) + 10 (skip loop) + 1 (md2). */ + if (size > 12 * len) +@@ -630,12 +637,12 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) + d = d1[U(tp[-1])], tp += d; + if (d != 0) + { ++ int advance_heuristic = 16 * sizeof (long); + d = d1[U(tp[-1])], tp += d; + d = d1[U(tp[-1])], tp += d; + + /* As a heuristic, prefer memchr to seeking by + delta1 when the latter doesn't advance much. */ +- int advance_heuristic = 16 * sizeof (long); + if (advance_heuristic <= tp - tp0) + goto big_advance; + tp--; +diff --git a/src/searchutils.c b/src/searchutils.c +index 5eb9a12..2572c3f 100644 +--- a/src/searchutils.c ++++ b/src/searchutils.c +@@ -270,9 +270,10 @@ mb_goback (char const **mb_start, char const *cur, char const *end) + wint_t + mb_prev_wc (char const *buf, char const *cur, char const *end) + { ++ char const *p; + if (cur == buf) + return WEOF; +- char const *p = buf; ++ p = buf; + cur--; + cur -= mb_goback (&p, cur, end); + return mb_next_wc (cur, end); +-- +1.8.3.4 +