This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 84581c2d9b890587e6f56448b509970b3240a887 (commit) via 87621bcc7aceddb24b80ebffc529a176080cfed3 (commit) from b9f034e1d693ba17cce1295ca1e430262a734dc3 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 84581c2d9b890587e6f56448b509970b3240a887 Merge: 87621bc b9f034e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 23 16:37:43 2014 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 87621bcc7aceddb24b80ebffc529a176080cfed3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 23 16:36:58 2014 +0100

grep: Update to 2.17.

Also adds automatic colouring of matched strings.

-----------------------------------------------------------------------

Summary of changes: grep/GREP_COLORS | 4 ++++ grep/colorgrep.sh | 9 +++++++++ grep/grep.nm | 16 +++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 grep/GREP_COLORS create mode 100644 grep/colorgrep.sh

Difference in files: diff --git a/grep/GREP_COLORS b/grep/GREP_COLORS new file mode 100644 index 0000000..1ef53a6 --- /dev/null +++ b/grep/GREP_COLORS @@ -0,0 +1,4 @@ +# Configuration file for the color grep utility + +# 'none' shuts colorization off. +#COLOR none diff --git a/grep/colorgrep.sh b/grep/colorgrep.sh new file mode 100644 index 0000000..929c78a --- /dev/null +++ b/grep/colorgrep.sh @@ -0,0 +1,9 @@ +# color-grep initialization + +if [ -r /etc/GREP_COLORS ]; then + grep -qi "^COLOR.*none" /etc/GREP_COLORS >/dev/null 2>/dev/null && return +fi + +alias grep='grep --color=auto' 2>/dev/null +alias egrep='egrep --color=auto' 2>/dev/null +alias fgrep='fgrep --color=auto' 2>/dev/null diff --git a/grep/grep.nm b/grep/grep.nm index 0aa3427..2dea0cc 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,7 +4,7 @@ ###############################################################################

name = grep -version = 2.16 +version = 2.17 release = 1

groups = Applications/Text @@ -41,6 +41,14 @@ build test make check end + + install_cmds + mkdir -pv %{BUILDROOT}%{sysconfdir}/profile.d + install -m 644 %{DIR_SOURCE}/colorgrep.sh \ + %{BUILDROOT}%{sysconfdir}/profile.d + install -m 644 %{DIR_SOURCE}/GREP_COLORS \ + %{BUILDROOT}%{sysconfdir} + end end

packages @@ -49,11 +57,17 @@ packages

provides /bin/grep + bundled(gnulib) end

conflicts filesystem < 002 end + + configfiles + %{sysconfdir}/profile.d/colorgrep.sh + %{sysconfdir}/GREP_COLORS + end end

package %{name}-debuginfo

hooks/post-receive -- IPFire 3.x development tree