From 62137a706ad5931ab25b81c01c356bedf24f9bae Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 10 2018 05:20:14 +0000
Subject: import gzip-1.5-10.el7


---

diff --git a/SOURCES/gzip-1.5-missing-grep-options-part1.patch b/SOURCES/gzip-1.5-missing-grep-options-part1.patch
new file mode 100644
index 0000000..8a3991f
--- /dev/null
+++ b/SOURCES/gzip-1.5-missing-grep-options-part1.patch
@@ -0,0 +1,31 @@
+From c423935181a9a92beadb247747f0bcab2c597e20 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 12 Jun 2013 11:42:34 -0700
+Subject: zgrep: usage should say which grep options are not supported
+
+* zgrep.in (usage): Document which grep options are not supported.
+Problem reported by Liron Paryente in
+<http://lists.gnu.org/archive/html/bug-grep/2013-06/msg00005.html>.
+---
+ zgrep.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/zgrep.in b/zgrep.in
+index 154d17f..c149577 100644
+--- a/zgrep.in
++++ b/zgrep.in
+@@ -42,7 +42,10 @@ usage="Usage: $0 [OPTION]... [-e] PATTERN [FILE]...
+ Look for instances of PATTERN in the input FILEs, using their
+ uncompressed contents if they are compressed.
+ 
+-OPTIONs are the same as for 'grep'.
++OPTIONs are the same as for 'grep', except that the following 'grep'
++options are not supported: --dereference-recursive (-R), --directories (-d),
++--exclude, --exclude-from, --exclude-dir, --include, --null (-Z),
++--null-data (-z), and --recursive (-r).
+ 
+ Report bugs to <bug-gzip@gnu.org>."
+ 
+-- 
+cgit v1.0-41-gc330
+
diff --git a/SOURCES/gzip-1.5-missing-grep-options-part2.patch b/SOURCES/gzip-1.5-missing-grep-options-part2.patch
new file mode 100644
index 0000000..4729e19
--- /dev/null
+++ b/SOURCES/gzip-1.5-missing-grep-options-part2.patch
@@ -0,0 +1,48 @@
+From a2c82475de5fb39e5e36586e664f7940e7daf48f Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue, 11 Jun 2013 19:43:21 -0700
+Subject: doc: zgrep exit status, unsupported options
+
+* zgrep.1 (EXIT STATUS, BUGS): New sections.
+Problem reported by Bdale Garbee in
+<http://lists.gnu.org/archive/html/bug-gzip/2013-06/msg00007.html>.
+---
+ zgrep.1 | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/zgrep.1 b/zgrep.1
+index ef37bd8..dfcf21e 100644
+--- a/zgrep.1
++++ b/zgrep.1
+@@ -23,6 +23,28 @@ If the GREP environment variable is set,
+ uses it as the
+ .I grep
+ program to be invoked.
++.SH "EXIT STATUS"
++Exit status is 0 for a match, 1 for no matches, and 2 if trouble.
++.SH BUGS
++.PP
++The following
++.I grep
++options are not supported:
++.B --dereference-recursive
++.RB ( \-R ),
++.B --directories
++.RB ( \-d ),
++.BR --exclude ,
++.BR --exclude-from ,
++.BR --exclude-dir ,
++.BR --include ,
++.B --null
++.RB ( \-Z ),
++.B --null-data
++.RB ( \-z ),
++and
++.B --recursive
++.RB ( \-r ).
+ .SH AUTHOR
+ Charles Levert (charles@comm.polymtl.ca)
+ .SH "SEE ALSO"
+-- 
+cgit v1.0-41-gc330
+
diff --git a/SPECS/gzip.spec b/SPECS/gzip.spec
index 5795edf..d486e5b 100644
--- a/SPECS/gzip.spec
+++ b/SPECS/gzip.spec
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 # info pages are under GFDL license
 License: GPLv3+ and GFDL
 Group: Applications/File
@@ -15,6 +15,8 @@ Patch7: gzip-1.3.13-cve-2006-4337.patch
 Patch8: gzip-1.3.5-cve-2006-4337_len.patch
 Patch9: gzip-1.5-nonblock.patch
 Patch10: gzip-1.5-overwrite.patch
+Patch11: gzip-1.5-missing-grep-options-part1.patch
+Patch12: gzip-1.5-missing-grep-options-part2.patch
 # Fixed in upstream code.
 # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378
 URL: http://www.gzip.org/
@@ -50,6 +52,8 @@ very commonly used data compression program.
 %patch8 -p1 -b .4337l
 %patch9 -p1 -b .nonblock
 %patch10 -p1 -b .overwrite
+%patch11 -p1 -b .options1
+%patch12 -p1 -b .options2
 
 %build
 export DEFS="NO_ASM"
@@ -90,6 +94,11 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Mon Sep 11 2017 Jakub Martisko <jamartis@redhat.com> - 1.5-10
+- doc change: missing grep options are now mentioned in the zgrep 
+  man pages/help message
+  Resolves: #1437002
+
 * Tue Feb 28 2017 Petr Stodulka <pstodulk@redhat.com> - 1.5-9
 - fix zfoce
   Resolves: #1382054