Update GNU grep to 3.2

components/text/ggrep/Makefile

@@ -17,21 +17,24 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
+
 #
 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, Michal Nowak
 #
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		grep
-COMPONENT_VERSION=	3.1
-COMPONENT_FMRI= text/gnu-grep
-COMPONENT_SUMMARY=  GNU grep utilities
+COMPONENT_VERSION=	3.2
+COMPONENT_FMRI=		text/gnu-grep
+COMPONENT_SUMMARY= 	GNU grep utilities
 COMPONENT_CLASSIFICATION= Applications/System Utilities
 COMPONENT_PROJECT_URL=	http://gnu.org/software/grep/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e
+	sha256:8e6e1f05bf76c30f52605278d0ab06c322e7bfa69e3c193499a8fd2c2c31599c
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/grep/$(COMPONENT_ARCHIVE)
 COMPONENT_LICENSE= GPLv3, FDLv1.3 
 
@@ -74,6 +77,11 @@ install:	$(INSTALL_64)
 # 
 test:		$(TEST_64)
 
+# Testsuite requirements
+REQUIRED_PACKAGES += locale/tr
+REQUIRED_PACKAGES += locale/ru-extra
+# Auto-generated dependencies
+REQUIRED_PACKAGES += library/libsigsegv
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += system/library

components/text/ggrep/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2017 <contributor>
+# Copyright 2018 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -25,7 +25,6 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 file path=usr/bin/egrep
 file path=usr/bin/fgrep
 file path=usr/bin/grep
-file path=usr/lib/$(MACH64)/charset.alias
 file path=usr/share/info/dir
 file path=usr/share/info/grep.info
 file path=usr/share/locale/af/LC_MESSAGES/grep.mo

components/text/ggrep/test/results-64.master

@@ -87,17 +87,18 @@ PASS: skip-device
 PASS: skip-read
 PASS: spencer1
 PASS: spencer1-locale
+PASS: stack-overflow
 PASS: status
 PASS: surrogate-pair
 PASS: symlink
 XFAIL: triple-backref
 PASS: turkish-I
-SKIP: turkish-I-without-dot
+PASS: turkish-I-without-dot
 SKIP: turkish-eyes
 PASS: two-chars
 PASS: two-files
 PASS: unibyte-binary
-SKIP: unibyte-bracket-expr
+PASS: unibyte-bracket-expr
 PASS: unibyte-negated-circumflex
 PASS: utf8-bracket
 PASS: warn-char-classes
@@ -107,39 +108,44 @@ PASS: word-multibyte
 PASS: write-error-msg
 PASS: yesno
 PASS: z-anchor-newline
-# TOTAL: 109
-# PASS:  94
-# SKIP:  13
+# TOTAL: 110
+# PASS:  97
+# SKIP:  11
 # XFAIL: 2
 # FAIL:  0
 # XPASS: 0
 # ERROR: 0
+PASS: test-accept
 PASS: test-alignof
 PASS: test-alloca-opt
 PASS: test-argmatch
+PASS: test-arpa_inet
 PASS: test-binary-io.sh
+PASS: test-bind
 PASS: test-bitrotate
 PASS: test-btowc1.sh
 PASS: test-btowc2.sh
 PASS: test-c-ctype
+PASS: test-c-stack.sh
+PASS: test-c-stack2.sh
 PASS: test-c-strcase.sh
 PASS: test-chdir
 PASS: test-cloexec
 PASS: test-close
+PASS: test-connect
 PASS: test-ctype
 PASS: dfa-invalid-char-class.sh
 PASS: dfa-match.sh
-PASS: test-dirent-safer
 PASS: test-dirent
 PASS: test-dup
 PASS: test-dup2
 PASS: test-environ
 PASS: test-errno
 PASS: test-exclude1.sh
-SKIP: test-exclude2.sh
+PASS: test-exclude2.sh
 PASS: test-exclude3.sh
 PASS: test-exclude4.sh
-SKIP: test-exclude5.sh
+PASS: test-exclude5.sh
 PASS: test-exclude6.sh
 PASS: test-exclude7.sh
 PASS: test-exclude8.sh
@@ -151,34 +157,40 @@ PASS: test-fdopen
 PASS: test-fdopendir
 PASS: test-fgetc
 PASS: test-float
+PASS: test-fnmatch-h
 PASS: test-fnmatch
 PASS: test-fpending.sh
 PASS: test-fputc
 PASS: test-fread
 PASS: test-fstat
 PASS: test-fstatat
+PASS: test-ftruncate.sh
 PASS: test-fwrite
 PASS: test-getcwd-lgpl
 PASS: test-getdtablesize
 PASS: test-getopt-gnu
 PASS: test-getopt-posix
 PASS: test-getprogname
+PASS: test-gettimeofday
 PASS: test-hash
 PASS: test-i-ring
 PASS: test-iconv-h
 PASS: test-iconv
 PASS: test-ignore-value
+PASS: test-inet_pton
 PASS: test-intprops
 PASS: test-inttostr
 PASS: test-inttypes
+PASS: test-ioctl
 PASS: test-isatty
 PASS: test-isblank
 PASS: test-iswblank
 PASS: test-langinfo
 PASS: test-limits-h
+PASS: test-listen
 PASS: test-locale
 PASS: test-localeconv
-FAIL: test-localename
+PASS: test-localename
 PASS: test-lseek.sh
 PASS: test-lstat
 PASS: test-malloc-gnu
@@ -195,28 +207,44 @@ PASS: test-mbsstr3.sh
 PASS: test-memchr
 PASS: test-memchr2
 PASS: test-memrchr
+PASS: test-nanosleep
+PASS: test-netinet_in
 PASS: test-nl_langinfo.sh
 PASS: test-open
 PASS: test-openat-safer
 PASS: test-openat
 PASS: test-pathmax
+PASS: test-perror.sh
+PASS: test-perror2
 PASS: test-pipe
 PASS: test-quotearg-simple
+PASS: test-raise
 PASS: test-read
 PASS: test-realloc-gnu
 PASS: test-regex
+PASS: test-select
+PASS: test-select-in.sh
+PASS: test-select-out.sh
 PASS: test-setenv
 PASS: test-setlocale1.sh
 PASS: test-setlocale2.sh
+PASS: test-setsockopt
+PASS: test-sigaction
+PASS: test-signal-h
+PASS: test-sigprocmask
+PASS: test-sleep
 PASS: test-snprintf
+PASS: test-sockets
 PASS: test-stat
+PASS: test-stat-time
 PASS: test-stdalign
 PASS: test-stdbool
 PASS: test-stddef
 PASS: test-stdint
 PASS: test-stdio
 PASS: test-stdlib
 PASS: test-strerror
+PASS: test-strerror_r
 PASS: test-striconv
 PASS: test-string
 PASS: test-strnlen
@@ -226,8 +254,13 @@ PASS: test-strtoll
 PASS: test-strtoull
 PASS: test-strtoumax
 PASS: test-symlink
+PASS: test-sys_ioctl
+PASS: test-sys_select
+PASS: test-sys_socket
 PASS: test-sys_stat
+PASS: test-sys_time
 PASS: test-sys_types
+PASS: test-sys_uio
 PASS: test-init.sh
 PASS: test-time
 PASS: test-dup-safer
@@ -255,37 +288,10 @@ PASS: test-wcwidth
 PASS: test-xalloc-die.sh
 PASS: test-xstrtoimax.sh
 PASS: test-xstrtol.sh
-# TOTAL: 141
-# PASS:  131
-# SKIP:  9
+# TOTAL: 173
+# PASS:  166
+# SKIP:  7
 # XFAIL: 0
-# FAIL:  1
-# XPASS: 0
-# ERROR: 0
-SKIP: test-exclude2.sh
-SKIP test-exclude2.sh (exit status: 77)
-SKIP: test-exclude5.sh
-SKIP test-exclude5.sh (exit status: 77)
-FAIL: test-localename
-FAIL test-localename (exit status: 134)
-SKIP: test-mbscasecmp.sh
-SKIP test-mbscasecmp.sh (exit status: 77)
-SKIP: test-mbsrtowcs3.sh
-SKIP test-mbsrtowcs3.sh (exit status: 77)
-SKIP: test-wcrtomb-w32-1.sh
-SKIP test-wcrtomb-w32-1.sh (exit status: 77)
-SKIP: test-wcrtomb-w32-2.sh
-SKIP test-wcrtomb-w32-2.sh (exit status: 77)
-SKIP: test-wcrtomb-w32-3.sh
-SKIP test-wcrtomb-w32-3.sh (exit status: 77)
-SKIP: test-wcrtomb-w32-4.sh
-SKIP test-wcrtomb-w32-4.sh (exit status: 77)
-SKIP: test-wcrtomb-w32-5.sh
-SKIP test-wcrtomb-w32-5.sh (exit status: 77)
-# TOTAL: 141
-# PASS:  131
-# SKIP:  9
-# XFAIL: 0
-# FAIL:  1
+# FAIL:  0
 # XPASS: 0
 # ERROR: 0