Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC r270668, r270669, r270672:

r270668:
Add gnugrep.1 to CLEANFILES.

r270669:
Add host.1 to CLEANFILES.

r270672:
Add svnlite.1 to CLEANFILES.

Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Part of r245761 makes "grep -D skip" broken for pipes, i.e.
echo xxx | grep -D skip xxx
returns nothing. Instead of just removing added S_ISFIFO condition
(originally absent in this version of grep), make it work as latest
GNU version does: don't skip directories and devices if fd == STDIN_FILENO.

Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861.

Reported by: gjb, tinderbox

Connect libgnuregex 2.17 to the build.

Don't look for headers outside of the source or object directories. In
particular, don't use DESTDIR. Such creates an unnecessary dependency
on the build machine.

Obtained from: Juniper Networks, Inc.

grep: change some int types.

Change several int variables to size_t, ssize_t, or ptrdiff_t.
This should fix the bug described in CVE-2012-5667 when an input
line is so long that its length cannot be stored in an int
variable.

This is based on NetBSD's revision which says:

This change to NetBSD's version of GNU grep 2.5.1 (licenced under
GPLv2) was made without direct reference to any code licenced
under GPLv3.

Obtained from: NetBSD
MFC after: 3 days

Make "-D skip" option work with FIFO by opening file in non-blocking mode.

Reviewed by: jhb
Tested by: delphij

Build and install a BSD licensed grep.
If WITH_BSD_GREP is not set, it will be 'bsdgrep' and GNUgrep will be
'[ef]grep'. Otherwise, BSD-grep will be the grep family, and GNUgrep
will be 'gnugrep'.

Discussed with: brooks

For files not named on the command line, only the basename is compared
to the exclude pattern.
Change this so that "grep --exclude='*/.svn/*' -[Rr] foo *" DWIM.

Obtained from: dave+news001@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (Dave Gibson)
Obtained from: comp.unix.questions [Thu, 15 Mar 2007 18:54:38 +0000]
Obtained from: http://unix.derkeiler.com/Newsgroups/comp.unix.questions/2007-03/msg00046.html

Add the -P option back, but with a note that it is not supported on FreeBSD.

Requested by: ru

grep -P xxx file.txt
"The -P option is not supported"
Removed from the manual page via this commit.

PR: 99831

Correctly locate the character preceeding the matched string in -w
mode when in non-UTF-8 multibyte locales (e.g. EUC, GB2312, etc.).

PR: 91909

Fix a markup nit.

PR: docs/88848
Prodded by: remko

Fix 'grep -Fw' for encodings other than UTF-8 (RH bug #161700).

PR: 87969
Obtained from: Fedora (Tim Waugh)

Document [:blank:].

Remove redundant string length check from the previous commit.

Fix a longstanding buglet in bz-prefixed grep(1).

Pass the RE_ICASE flag to re_set_syntax() as appropriate to fix
case-insensitive matching (-i option) in certain multibyte locales.

Obtained from: Fedora

Add a note explaining what local modifications have been made to GNU grep,
and giving advice on importing future releases.

Fixed -w handling for EGexecute.

Obtained from: Fedora (Tim Waugh)

Automatically disable DFA when processing multibyte input. GREP_USE_DFA
environment variable overrides.

Obtained from: Fedora (Tim Waugh)

Better multibyte handling in EGexecute() and Fexecute(). Fixed -Fi for
multibyte input (RH bug #143079).

Obtained from: Fedora (Jakub Jelinek, Tim Waugh)

Removed redundant (and incorrect) code in prline. Fixes grep -i --color "",
among other things.

PR: 79063
Obtained from: Fedora (Tim Waugh)

Fix background colour problems with --color output (RH bug #138913).

Obtained from: Karsten Hopp via Fedora

Fixed a bug in the fgrep patch, exposed by the dfa-optional patch
(RH bug #138558). Removed bogus part of grep-2.5.1-fgrep patch.

Obtained from: Fedora (Jakub Jelinek, Tim Waugh)

Fix dfa multibyte character class matching when -i is used (RH bug #123363).

Obtained from: Fedora (Tim Waugh)

Remove mb-caching hack.

Obtained from: Fedora (Tim Waugh)

Fix regression in output with -R compared to previous version.

PR: 77466
Submitted by: Andre Guibert de Bruet <andy@siliconlandmark.com>

The correct name of the long option is --line-buffered,
not --line-bufferring.

PR: docs/72985
Submitted by: John Engelhart <johne@zang.com>
MFC after: 1 week

Change version string to distinguish our modified version of GNU grep
from the original.

Fix bug causing `[' to be wrongly included in character class expressions
in some multibyte locales (Red Hat bug #108484).

Obtained from: Fedora (Tim Waugh)

Make grep run much (~10x) faster in multibyte locales by caching the wide
character representation of input data across calls to dfaexec(), and by
caching the lengths of character across calls to check_multibyte_string().

Obtained from: Fedora (Tim Waugh)

Avoid accessing accessing memory past the end of mb_properties in the
degenerate case of fgrep with an empty pattern in a multibyte locale.
Found by phkmalloc.

Improve case-insensitive matching in multibyte locales.

Obtained from: Isamu Hasegawa (IBM) via Fedora

Fix failure of fgrep to report some matches (Red Hat bug #116909).

Obtained from: Fedora (Tim Waugh)

Use hard_locale() to check whether collating order is "hard" regardless
of whether NLS is enabled.

Ignore ENABLE_NLS when deciding whether we can use setlocale().
Use the same shortcut as glibc to test for the "C" or "POSIX" locale.

Update for grep 2.5.1.

Merge local changes.

This commit was generated by cvs2svn to compensate for changes in r131554,
which included commits to RCS files with non-trunk default branches.

Merge conflicts, upgrade

This commit was generated by cvs2svn to compensate for changes in r126432,
which included commits to RCS files with non-trunk default branches.

Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu

1) Remove files no longer needed.
2) Switch back to regex.h

Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

We HAVE_STPCPY now.

Added bzip2 variants to the NAME section.
Added missing break.
Remove the statement that -J requires zlib(3).

Allow -J to simultaneously do non-bzip2 grepping.
Don't allow -J and -Z together.

Partially submitted by: knu

Create bzgrep.

Typo in [^[:alnum:]] character class.

PR: docs/41728
Submitted by: osgene@web.de

Mention zegrep and zfgrep too,
and what their equivalent grep options are.

PR: docs/35603
Submitted by: "Gary W. Swearingen" <swear@blarg.net>

Removed glibc specific stuff.

PR: docs/31431

In FreeBSD, -Z is reserved for zgrep(1), and only
a long version of the --null option is supported.

PR: gnu/30644

mdoc(7) police: remove extraneous .Pp before and/or after .Sh.

This file was not regenerated for the latest import, thus the
reported grep version is wrong. The correct version is 2.4d.

Restore backwards compatible -R option.
Broken in revision 1.17.

Noticed by: hoek

Merge FreeBSD changes into 2.4d.

Merge FreeBSD changes into 2.4d.

FreeBSD changes OBE'ed by 2.4d:
* rev 1.5 - use collate for alpha character ranges.

This is the stock GNU grep 2.4d file.

This commit was generated by cvs2svn to compensate for changes in r56915,
which included commits to RCS files with non-trunk default branches.

Back out previous revision because someone upgraded our
texinfo system to one that understands "command{foo}".

Fix conflicts.

This commit was generated by cvs2svn to compensate for changes in r56230,
which included commits to RCS files with non-trunk default branches.

Decompression is supported via -Z, not -z.

* Make --null option work in (HAVE_LIBZ > 0) case.
* Remove "why we need this decl..." comment. The `matcher' variable
is defined in *grepmat.c files in the original distribution, which
we did not import.

Update for version 2.4.

Turn off GNU Info docs until someone upgrades our texinfo system to one
that understands "command{foo}".

Merge FreeBSD chagnes into GNU grep 2.4.

This commit was generated by cvs2svn to compensate for changes in r55360,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r55357,
which included commits to RCS files with non-trunk default branches.

This is the stock 2.3 file. Since someone majorly SPAMMED the
repository by NOT vendor importing the virgin 2.0 sources, CVS
had no idea what to do here.

Support the environtmental var "GREP_OPTIONS". Which can hold a set of
default options for diff. These options are interpreted first and can be
overwritten by explicit command line parameters.

Obtained from: GNU Grep 2.3h

GNU killed this sometime before 2.3.

Missed two.

Submitted by: Philippe Charnier <charnier@xp11.frmug.org>

This commit was generated by cvs2svn to compensate for changes in r53574,
which included commits to RCS files with non-trunk default branches.

Make the tests work again.

spencer.tests is now spencer1.tests. The other files aren't part of
GNU Grep any longer.

This commit was generated by cvs2svn to compensate for changes in r53568,
which included commits to RCS files with non-trunk default branches.

Finish proper hookup of GNU Grep 2.3, including docs & config header file,
rather than the compile commandline from hell.

Submitted by: ru

Build and install GNU Grep 2.3 docs.

This commit was generated by cvs2svn to compensate for changes in r53564,
which included commits to RCS files with non-trunk default branches.

Restore the 2.3 config file.

Apply a bandaid to the grep Makefile to try and get it to compile and stop
breaking world.

Spell command names correctly. Even when they appear at the beginning
of a sentence.

Merge FreeBSD changes into 2.3:
* revs 1.5-6 - added builtin decompression using zlib library, option -Z.

Submitted by: ru

Merge FreeBSD changes into 2.3:
* rev 1.2 - use -lgnuregex

FreeBSD changes OBE'ed by 2.3:
* revs 1.4-5 - icase searches & ctype macro changes, fuctionality moved
elsewhere.
* rev 1.3 - Remove trailing whitespace. The GNU Grep maintainers did this
for us.

Submitted by: ru

Alias -R to -r for backward compatibility.

Submitted by: ru
Requested by: wosch

Set default matcher from argv[0].

Merge FreeBSD changes into 2.3:
* revs 1.9-10 - built-in decompression using zlib(3) library

FreeBSD changes OBE'ed by 2.3:
* rev 1.7 - our "-q" flag. Use "-L" or "-l" now.
* revs 1.{4,6} - colleate, and with correct LC_ type.
* rev 1.3 - remove trailing whitespace.

Submitted by: ru

This is the stock 2.3 file (+ FreeBSD id). Since someone added 2.0 rather
than vendor importing the virgin 2.0 sources, we have to manually put this
on the HEAD branch.

This is the stock 2.3 file (+ FreeBSD id). Since someone majorly SPAMMED
the repository by NOT vendor importing the virgin 2.0 sources, CVS had no
idea what to do here.

This is the stock 2.3 file (+ FreeBSD id). Since someone majorly SPAMMED
the repository by NOT vendor importing the virgin 2.0 sources, CVS had no
idea what to do here.

Merge FreeBSD changes into 2.3:
* rev 1.5 - use collate for alpha character ranges
* rev 1.3 - use -lgnuregex

Submitted by: ru

This commit was generated by cvs2svn to compensate for changes in r53469,
which included commits to RCS files with non-trunk default branches.

Back out the botched attempt to update to gnu grep 2.3 (lots of history
was lost). Restore original version to try and avoid breaking the build
while David O'brien does a proper set of imports and merges.

Requested by: obrien

Upgrade grep to version 2.3

Cast tp[-2] to unsigned char before comparing.

PR: 14011
Ignored by: maintainer
Obtained from: GNU grep 2.3

$Id$ -> $FreeBSD$

Added myself as maintainer.

Use mmap for reading files. This is faster than read().

Install z*grep manpages

Fixed printf format errors.

Delete cc(1) debug option, typo from last commit.

Pointed out by: Søren Schmidt

When called as `zgrep', the -Z argument is assumed. Make a
link from zgrep to grep.

Pointed out by: Tim Vanderhoek <hoek@hwcn.org> and
Mike Smith <mike@smith.net.au>

Added builtin decompression using zlib library, option -Z.

Enabled this new feature with the makefile variable GREP_LIBZ. If
you don't like it, compile with `make GREP_LIBZ='.

grep + zlib has several advantages:

- the shell script zgrep(1) will be basically a one line
exec grep -Z "$@"

- no shell script, no bugs. The current zgrep implementations
have many bugs and some grep options are no supported.

- no shell script, no security risks.

- it is a magnitude faster than a shell script

Also fixed:
0 -> STDIN_FILENO
Close a file descriptor only if the open call was successfully. It does
not hurt for the open(2) function, but the gzclose(3) function
died in free() to free up (not) allocated memory.

Add unsigned char cast to ctype macros

Add (unsigned char) casts to ctype macros

Fix a number of typos, one of which is part of PR# 2917.

Replace collate_range_cmp call with its code (GNU version)

grep -q pattern file

search 'pattern' in whole file 'file', from top to bottom. This is
not necessary; if grep found 'pattern' it can stop further searching
in file 'file'.

Example:

$ time ./grep-old -q Adam /usr/share/dict/*
1.93 real 1.05 user 0.85 sys
$ time ./grep-new -q Adam /usr/share/dict/*
0.14 real 0.06 user 0.06 sys

test 37: [b-a] is a syntax error and exit with status 2

Use collate for alpha character ranges

Pick collate info too

recursive grep, enabled with -DHAVE_FTS=1
enable mmap (-DHAVE_MMAP=1)

This commit was generated by cvs2svn to compensate for changes in r13122,
which included commits to RCS files with non-trunk default branches.

recording cvs-1.6 file death

Add setlocale LC_CTYPE
Fix icase searches for 8bit charsets

Remove trailing whitespace.

Use -lgnuregex
Tune for 8bit ctype

Merge. Fix LINKS+= with $DESTDIR$BINDIR in them, you do NOT need to
specify $DESTDIR on a LINKS+= line.

Gnu grep 2.0 does fgrep too!

Removed egrep since the new grep is just a link to it w/out any changes
anymore

Left an ugly in the Makefile

Update GNU grep to version 2.0

Ugh, whoever did the port made a mess, I cleaned up the Makefile and
deleted un-necessary stuff

This commit was generated by cvs2svn to compensate for changes in r61,
which included commits to RCS files with non-trunk default branches.