--- a/components/ggrep/Makefile Tue Feb 02 13:44:05 2016 -0800
+++ b/components/ggrep/Makefile Tue Feb 02 13:47:41 2016 -0800
@@ -18,24 +18,24 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
BITS=64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= grep
-COMPONENT_VERSION= 2.20
+COMPONENT_VERSION= 2.22
COMPONENT_PROJECT_URL= http://gnu.org/software/grep/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65
+ sha256:ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb
COMPONENT_ARCHIVE_URL= http://ftp.gnu.org/gnu/grep/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/ggrep
-TPNO= 18300
+TPNO= 26437
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
--- a/components/ggrep/patches/correct_prefix.patch Tue Feb 02 13:44:05 2016 -0800
+++ b/components/ggrep/patches/correct_prefix.patch Tue Feb 02 13:47:41 2016 -0800
@@ -3,12 +3,11 @@
available both without prefix and with 'g' prefix at the same time, only in
different paths.
---- grep-2.20/src/egrep.sh 2015-06-29 16:48:08.536062429 +0200
-+++ grep-2.20/src/egrep.sh 2015-06-29 16:47:57.380731794 +0200
-@@ -1,11 +1,29 @@
+--- grep-2.22-orig/src/egrep.sh Wed Oct 21 22:00:20 2015
++++ grep-2.22/src/egrep.sh Tue Jan 19 14:42:27 2016
+@@ -1,2 +1,29 @@
#!@SHELL@
--grep=grep
--case $0 in
+-exec @grep@ @option@ "$@"
+# The script is a wrapper to GNU grep to be called with apropriate (-E or -F)
+# command line option. We can't just run 'ggrep' as the path may not contain
+# '/usr/bin' and we can't just use 'grep' as the PATH may not contain
@@ -25,12 +24,7 @@
+fi
+
+case "$0" in
- */*)
-- dir=${0%/*}
-- if test -x "$dir/@grep@"; then
-- PATH=$dir:$PATH
-- grep=@grep@
-- fi;;
++ */*)
+ dir="${0%/*}"
+ if test -x "$dir/$grep"; then
+ PATH="$dir:$PATH"
@@ -39,7 +33,6 @@
+ *)
+ PATH="@prefix@/bin:$PATH"
+ ;;
- esac
--exec $grep @option@ "$@"
++esac
+
+exec "$grep" @option@ "$@"
--- a/components/ggrep/patches/gnulib-tests_localename_c.patch Tue Feb 02 13:44:05 2016 -0800
+++ b/components/ggrep/patches/gnulib-tests_localename_c.patch Tue Feb 02 13:47:41 2016 -0800
@@ -1,18 +1,16 @@
-# This patch fixes the core dump and locale issues previously seen in
-# the test-mbrtowc3.sh, test-mbrtowc4.sh and test-mbsrtowcs4.sh tests.
+# This patch fixes a test failure in gnulib-tests/test-localename
# __getlocalename_l is an Oracle private interface.
# Do not send this patch upstream.
-diff -rup grep-2.20-orig/gnulib-tests/localename.c grep-2.20/gnulib-tests/localename.c
---- grep-2.20-orig/gnulib-tests/localename.c 2014-01-01 17:36:42.000000000 -0800
-+++ grep-2.20/gnulib-tests/localename.c 2015-05-28 14:48:57.639643024 -0700
-@@ -2644,6 +2644,9 @@ gl_locale_name_thread_unsafe (int catego
- return "";
- }
- return querylocale (mask, thread_locale);
+--- grep-2.22-orig/gnulib-tests/localename.c 2015-10-24 13:07:13.000000000 -0700
++++ grep-2.22/gnulib-tests/localename.c 2016-01-19 17:18:20.049731748 -0800
+@@ -2732,6 +2732,9 @@ gl_locale_name_thread_unsafe (int catego
+ # elif defined __sun && HAVE_GETLOCALENAME_L
+ /* Solaris >= 12. */
+ return getlocalename_l (category, thread_locale);
+# elif defined(sun) || defined(__sun) || defined(__sun__)
+ extern char * __getlocalename_l(int, locale_t);
+ return __getlocalename_l (category, thread_locale);
+ # elif defined __ANDROID__
+ return MB_CUR_MAX == 4 ? "C.UTF-8" : "C";
# endif
- }
- }
--- a/components/ggrep/test/results-64.master Tue Feb 02 13:44:05 2016 -0800
+++ b/components/ggrep/test/results-64.master Tue Feb 02 13:47:41 2016 -0800
@@ -1,4 +1,5 @@
PASS: backref
+PASS: backref-alt
PASS: backref-multibyte-slow
PASS: backref-word
PASS: backslash-s-and-repetition-operators
@@ -19,9 +20,11 @@
PASS: count-newline
PASS: dfa-coverage
PASS: dfa-heap-overrun
+PASS: dfa-match
PASS: dfaexec-multibyte
PASS: empty
PASS: empty-line
+PASS: empty-line-mb
PASS: epipe
XFAIL: equiv-classes
PASS: ere
@@ -34,27 +37,33 @@
PASS: grep-dev-null
PASS: grep-dir
PASS: help-version
+PASS: high-bit-range
PASS: in-eq-out-infloop
PASS: include-exclude
PASS: inconsistent-range
+PASS: invalid-char-class
PASS: invalid-multibyte-infloop
PASS: khadafy
+PASS: kwset-abuse
SKIP: long-line-vs-2GiB-read
+PASS: long-pattern-perf
+PASS: match-lines
PASS: max-count-overread
PASS: max-count-vs-context
+PASS: mb-dot-newline
+PASS: mb-non-UTF8-overrun
PASS: mb-non-UTF8-performance
PASS: multibyte-white-space
PASS: multiple-begin-or-end-line
PASS: null-byte
-PASS: empty-line-mb
-PASS: unibyte-bracket-expr
-PASS: unibyte-negated-circumflex
-PASS: high-bit-range
PASS: options
PASS: pcre
PASS: pcre-abort
+PASS: pcre-context
PASS: pcre-infloop
PASS: pcre-invalid-utf8-input
+PASS: pcre-jitstack
+PASS: pcre-o
PASS: pcre-utf8
PASS: pcre-w
PASS: pcre-wx-backref
@@ -64,27 +73,34 @@
PASS: r-dot
PASS: repetition-overflow
PASS: reversed-range-endpoints
+PASS: sjis-mb
PASS: skip-device
-SKIP: sjis-mb
PASS: spencer1
PASS: spencer1-locale
PASS: status
PASS: surrogate-pair
PASS: symlink
-SKIP: turkish-eyes
+XFAIL: triple-backref
PASS: turkish-I
PASS: turkish-I-without-dot
+SKIP: turkish-eyes
+PASS: two-files
+PASS: unibyte-bracket-expr
+PASS: unibyte-negated-circumflex
+PASS: utf8-bracket
PASS: warn-char-classes
PASS: word-delim-multibyte
PASS: word-multi-file
+PASS: word-multibyte
PASS: yesno
-# TOTAL: 80
-# PASS: 73
-# SKIP: 6
-# XFAIL: 1
+# TOTAL: 95
+# PASS: 88
+# SKIP: 5
+# XFAIL: 2
# FAIL: 0
# XPASS: 0
# ERROR: 0
+PASS: test-alignof
PASS: test-alloca-opt
PASS: test-argmatch
PASS: test-binary-io.sh
@@ -149,15 +165,6 @@
PASS: test-lstat
PASS: test-malloc-gnu
PASS: test-malloca
-PASS: test-mbrtowc1.sh
-PASS: test-mbrtowc2.sh
-PASS: test-mbrtowc3.sh
-PASS: test-mbrtowc4.sh
-SKIP: test-mbrtowc-w32-1.sh
-SKIP: test-mbrtowc-w32-2.sh
-SKIP: test-mbrtowc-w32-3.sh
-SKIP: test-mbrtowc-w32-4.sh
-SKIP: test-mbrtowc-w32-5.sh
SKIP: test-mbscasecmp.sh
PASS: test-mbsinit.sh
PASS: test-mbsrtowcs1.sh
@@ -185,6 +192,7 @@
PASS: test-setlocale2.sh
PASS: test-snprintf
PASS: test-stat
+SKIP: test-stdalign
PASS: test-stdbool
PASS: test-stddef
PASS: test-stdint
@@ -194,6 +202,7 @@
PASS: test-striconv
PASS: test-string
PASS: test-strnlen
+PASS: test-strstr
PASS: test-strtoimax
PASS: test-strtoll
PASS: test-strtoull
@@ -230,9 +239,9 @@
PASS: test-xalloc-die.sh
PASS: test-xstrtoimax.sh
PASS: test-xstrtol.sh
-# TOTAL: 145
-# PASS: 134
-# SKIP: 11
+# TOTAL: 139
+# PASS: 132
+# SKIP: 7
# XFAIL: 0
# FAIL: 0
# XPASS: 0