--- a/components/gzip/Makefile	Mon Mar 28 06:24:55 2016 -0700
+++ b/components/gzip/Makefile	Mon Mar 28 15:41:54 2016 -0700
@@ -18,21 +18,21 @@
 #
 # 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.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gzip
-COMPONENT_VERSION=	1.5
+COMPONENT_VERSION=	1.6
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gzip/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3
+    sha256:97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e
 COMPONENT_ARCHIVE_URL=	ftp://ftp.gnu.org/gnu/gzip/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gzip
 
-TPNO=			17904
+TPNO=			27439
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk

--- a/components/gzip/patches/zgrep.in.patch	Mon Mar 28 06:24:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-From 60b3f4eb672a85de28ecaad47ed426f8c8fe6c32 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <[email protected]>
-Date: Sun, 21 Oct 2012 06:15:26 +0000
-Subject: zgrep: do not assume standard 'grep' has -e
-
-On Solaris 11, /usr/bin/grep -e does not work.
-Problem reported by Petr Sumbera in
-<http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00003.html>.
-* Makefile.am (.in): Substitute @GREP@.
-* configure.ac (AC_PROG_GREP): Invoke.
-* zgrep.in (grep): Use @GREP@.
----
-diff --git a/Makefile.am b/Makefile.am
-index 86a0297..90fff2d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -84,6 +84,7 @@ SUFFIXES = .in
- 	$(AM_V_GEN)sed \
- 		-e 's|/bin/sh|$(SHELL)|g' \
- 		-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
-+		-e 's|[@]GREP@|$(GREP)|g' \
- 		-e 's|[@]VERSION@|$(VERSION)|g' \
- 		$(srcdir)/[email protected] >$@-t \
- 	  && chmod a+x $@-t \
-diff --git a/configure.ac b/configure.ac
-index 4705ce4..ecb362b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,6 +33,7 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
- AC_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_CPP
-+AC_PROG_GREP
- AC_CHECK_TOOL([NM], [nm], [nm])
- AC_PROG_LN_S
- AC_PROG_RANLIB
-diff --git a/zgrep.in b/zgrep.in
-index f878acf..aec4a67 100644
---- a/zgrep.in
-+++ b/zgrep.in
-@@ -28,7 +28,7 @@ case $1 in
- esac
- PATH=$bindir:$PATH
- 
--grep='${GREP-grep}'
-+grep='${GREP-'\''@GREP@'\''}'
- 
- version='zgrep (gzip) @VERSION@
- Copyright (C) 2010-2012 Free Software Foundation, Inc.
---
-cgit v0.9.0.2

--- a/components/gzip/test/results-64.master	Mon Mar 28 06:24:55 2016 -0700
+++ b/components/gzip/test/results-64.master	Mon Mar 28 15:41:54 2016 -0700
@@ -1,16 +1,19 @@
 PASS: helin-segv
 PASS: help-version
 PASS: hufts
+PASS: keep
 PASS: memcpy-abuse
 PASS: mixed
 PASS: null-suffix-clobber
 PASS: stdin
 PASS: trailing-nul
+PASS: unpack-invalid
 PASS: zdiff
 PASS: zgrep-f
+PASS: zgrep-context
 PASS: zgrep-signal
 PASS: znew-k
-# PASS:  12
+# PASS:  15
 # XFAIL: 0
 # FAIL:  0
 # XPASS: 0