# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1492532161 25200
# Node ID 18f1ac4be9fb40f42502790fb3acc76e04b70565
# Parent  7593c955687c7f65a484045c276e832451ca010c
25651768 Update ggrep to version 3.0

diff -r 7593c955687c -r 18f1ac4be9fb components/ggrep/Makefile
--- a/components/ggrep/Makefile	Tue Apr 18 09:13:23 2017 -0700
+++ b/components/ggrep/Makefile	Tue Apr 18 09:16:01 2017 -0700
@@ -27,14 +27,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		grep
-COMPONENT_VERSION=	2.25
+COMPONENT_VERSION=	3.0
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e21e83bac50450e0d0d61a42c154ee0dceaacdbf4f604ef6e79071cb8e596830
+    sha256:e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5
 COMPONENT_BUGDB=	utility/ggrep
 COMPONENT_ANITYA_ID=	1251
 
-TPNO=			28105
+TPNO=			34016
 
 SYSTEM_TEST_TARGET= $(SOURCE_DIR)/.system-test-patched configure $(SYSTEM_TEST_64)
 include $(WS_MAKE_RULES)/gnu-component.mk
diff -r 7593c955687c -r 18f1ac4be9fb components/ggrep/patches/gnulib-tests_localename_c.patch
--- a/components/ggrep/patches/gnulib-tests_localename_c.patch	Tue Apr 18 09:13:23 2017 -0700
+++ b/components/ggrep/patches/gnulib-tests_localename_c.patch	Tue Apr 18 09:16:01 2017 -0700
@@ -1,16 +1,16 @@
 # This patch fixes a test failure in gnulib-tests/test-localename
-# __getlocalename_l is an Oracle private interface. 
+# __getlocalename_l is an Oracle private interface.
 # Do not send this patch upstream.
 
---- 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);
+--- grep-3.0/gnulib-tests/localename.c.orig	2017-03-01 07:14:51.129981406 +0000
++++ grep-3.0/gnulib-tests/localename.c	2017-03-01 07:15:51.216928103 +0000
+@@ -49,6 +49,9 @@
+ # if defined __sun && HAVE_GETLOCALENAME_L
+ /* Solaris >= 12.  */
+ extern char * getlocalename_l(int, locale_t);
 +#  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
++	extern char * __getlocalename_l(int, locale_t);
++	return __getlocalename_l (category, thread_locale);
+ # endif
+ #endif
+ 
diff -r 7593c955687c -r 18f1ac4be9fb components/ggrep/test/results-64.master
--- a/components/ggrep/test/results-64.master	Tue Apr 18 09:13:23 2017 -0700
+++ b/components/ggrep/test/results-64.master	Tue Apr 18 09:16:01 2017 -0700
@@ -21,7 +21,7 @@
 PASS: count-newline
 PASS: dfa-coverage
 PASS: dfa-heap-overrun
-PASS: dfa-match
+PASS: dfa-infloop
 PASS: dfaexec-multibyte
 PASS: empty
 PASS: empty-line
@@ -31,19 +31,23 @@
 XFAIL: equiv-classes
 PASS: ere
 PASS: euc-mb
+PASS: false-match-mb-non-utf8
 PASS: fedora
 PASS: fgrep-infloop
+PASS: fgrep-longest
 PASS: file
+PASS: filename-lineno.pl
 SKIP: fmbtest
 PASS: foad1
 PASS: grep-dev-null
+PASS: grep-dev-null-out
 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: initial-tab
 PASS: invalid-multibyte-infloop
 PASS: khadafy
 PASS: kwset-abuse
@@ -74,11 +78,13 @@
 PASS: pcre-z
 PASS: posix-bracket
 PASS: prefix-of-multibyte
+PASS: proc
 PASS: r-dot
 PASS: repetition-overflow
 PASS: reversed-range-endpoints
 PASS: sjis-mb
 PASS: skip-device
+PASS: skip-read
 PASS: spencer1
 PASS: spencer1-locale
 PASS: status
@@ -88,6 +94,7 @@
 PASS: turkish-I
 PASS: turkish-I-without-dot
 SKIP: turkish-eyes
+PASS: two-chars
 PASS: two-files
 PASS: unibyte-binary
 PASS: unibyte-bracket-expr
@@ -100,155 +107,10 @@
 SKIP: write-error-msg
 PASS: yesno
 PASS: z-anchor-newline
-# TOTAL: 102
-# PASS:  92
+# TOTAL: 109
+# PASS:  99
 # SKIP:  8
 # XFAIL: 2
 # FAIL:  0
 # XPASS: 0
 # ERROR: 0
-PASS: test-alignof
-PASS: test-alloca-opt
-PASS: test-argmatch
-PASS: test-binary-io.sh
-PASS: test-bitrotate
-PASS: test-btowc1.sh
-PASS: test-btowc2.sh
-PASS: test-c-ctype
-PASS: test-c-strcase.sh
-PASS: test-chdir
-PASS: test-cloexec
-PASS: test-close
-PASS: test-ctype
-PASS: test-dirent-safer
-PASS: test-dirent
-PASS: test-dup
-PASS: test-dup2
-PASS: test-environ
-PASS: test-errno
-PASS: test-exclude1.sh
-PASS: test-exclude2.sh
-PASS: test-exclude3.sh
-PASS: test-exclude4.sh
-PASS: test-exclude5.sh
-PASS: test-exclude6.sh
-PASS: test-exclude7.sh
-PASS: test-exclude8.sh
-PASS: test-fchdir
-PASS: test-fcntl-h
-PASS: test-fcntl-safer
-PASS: test-fcntl
-PASS: test-fdopen
-PASS: test-fdopendir
-PASS: test-fgetc
-PASS: test-float
-PASS: test-fnmatch
-PASS: test-fpending.sh
-PASS: test-fputc
-PASS: test-fread
-PASS: test-fstat
-PASS: test-fstatat
-PASS: test-fwrite
-PASS: test-getcwd-lgpl
-PASS: test-getdtablesize
-PASS: test-getopt
-PASS: test-gettimeofday
-PASS: test-hash
-PASS: test-i-ring
-PASS: test-iconv-h
-PASS: test-iconv
-PASS: test-ignore-value
-PASS: test-intprops
-PASS: test-inttostr
-PASS: test-inttypes
-PASS: test-isatty
-PASS: test-isblank
-PASS: test-iswblank
-PASS: test-langinfo
-PASS: test-locale
-PASS: test-localeconv
-PASS: test-localename
-PASS: test-lseek.sh
-PASS: test-lstat
-PASS: test-malloc-gnu
-PASS: test-malloca
-SKIP: test-mbscasecmp.sh
-PASS: test-mbsinit.sh
-PASS: test-mbsrtowcs1.sh
-PASS: test-mbsrtowcs2.sh
-PASS: test-mbsrtowcs3.sh
-PASS: test-mbsrtowcs4.sh
-PASS: test-mbsstr1
-PASS: test-mbsstr2.sh
-PASS: test-mbsstr3.sh
-PASS: test-memchr
-PASS: test-memchr2
-PASS: test-memrchr
-PASS: test-nl_langinfo.sh
-PASS: test-open
-PASS: test-openat-safer
-PASS: test-openat
-PASS: test-pathmax
-PASS: test-pipe
-PASS: test-quotearg-simple
-PASS: test-read
-PASS: test-realloc-gnu
-PASS: test-regex
-PASS: test-setenv
-PASS: test-setlocale1.sh
-PASS: test-setlocale2.sh
-PASS: test-snprintf
-PASS: test-stat
-PASS: test-stdalign
-PASS: test-stdbool
-PASS: test-stddef
-PASS: test-stdint
-PASS: test-stdio
-PASS: test-stdlib
-PASS: test-strerror
-PASS: test-striconv
-PASS: test-string
-PASS: test-strnlen
-PASS: test-strstr
-PASS: test-strtoimax
-PASS: test-strtoll
-PASS: test-strtoull
-PASS: test-strtoumax
-PASS: test-symlink
-PASS: test-sys_stat
-PASS: test-sys_time
-PASS: test-sys_types
-PASS: test-init.sh
-PASS: test-time
-PASS: test-dup-safer
-PASS: test-unistd
-PASS: test-u8-mbtoucr
-PASS: test-u8-uctomb
-PASS: test-uc_width
-PASS: uniwidth/test-uc_width2.sh
-PASS: test-unsetenv
-PASS: test-vasnprintf
-PASS: test-vc-list-files-git.sh
-PASS: test-vc-list-files-cvs.sh
-PASS: test-verify
-PASS: test-verify.sh
-PASS: test-version-etc.sh
-PASS: test-wchar
-PASS: test-wcrtomb.sh
-SKIP: test-wcrtomb-w32-1.sh
-SKIP: test-wcrtomb-w32-2.sh
-SKIP: test-wcrtomb-w32-3.sh
-SKIP: test-wcrtomb-w32-4.sh
-SKIP: test-wcrtomb-w32-5.sh
-PASS: test-wctype-h
-PASS: test-wcwidth
-PASS: test-xalloc-die.sh
-PASS: test-xstrtoimax.sh
-PASS: test-xstrtol.sh
-# TOTAL: 138
-# PASS:  132
-# SKIP:  6
-# XFAIL: 0
-# FAIL:  0
-# XPASS: 0
-# ERROR: 0