15785482 SUNBT7161330 gzgrep -e option no longer works s11u1-sru 0.175.1.3.0.1.0 S11.1SRU3.1
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 04 Dec 2012 02:01:04 -0800
branchs11u1-sru
changeset 2443 952b267446eb
parent 2440 d11ed129f81c
child 2444 c9c2ab14fd50
15785482 SUNBT7161330 gzgrep -e option no longer works
components/gzip/patches/zgrep-f.patch
components/gzip/patches/zgrep.in.patch
--- a/components/gzip/patches/zgrep-f.patch	Mon Dec 03 05:48:20 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gzip-1.4/tests/zgrep-f.orig	2012-03-29 11:21:18.457617592 -0700
-+++ gzip-1.4/tests/zgrep-f	2012-03-29 11:21:56.078983515 -0700
[email protected]@ -32,7 +32,7 @@
- 
- 
- fail=0
--zgrep -f - haystack.gz < n > out 2>&1 || fail=1
-+zgrep --__bindir /usr/gnu/bin -f - haystack.gz < n > out 2>&1 || fail=1
- 
- compare out n || fail=1
- 
--- a/components/gzip/patches/zgrep.in.patch	Mon Dec 03 05:48:20 2012 -0800
+++ b/components/gzip/patches/zgrep.in.patch	Tue Dec 04 02:01:04 2012 -0800
@@ -1,15 +1,17 @@
---- gzip-1.4/zgrep.in.orig	2012-03-29 11:17:35.341079056 -0700
-+++ gzip-1.4/zgrep.in	2012-03-29 11:18:46.475732896 -0700
[email protected]@ -26,7 +26,11 @@
+This simplified patch was generated based on following community fix
+which we have adopted in 12.0 and 11.2 (where we have latest gzip
+version and patch applied there without problem):
+
+http://git.savannah.gnu.org/cgit/gzip.git/commit/?id=60b3f4eb672a85de28ecaad47ed426f8c8fe6c32
+
+--- gzip-1.4/zgrep.in	Sun Jan  3 09:26:02 2010
++++ gzip-1.4/zgrep.in	Wed Nov 28 05:44:33 2012
[email protected]@ -26,7 +26,7 @@
  esac
  PATH=$bindir:$PATH
  
 -grep='${GREP-grep}'
-+case "$1" in
-+	-F) grep='${FGREP-fgrep}'; shift;;
-+	-E) grep='${EGREP-egrep}'; shift;;
-+	*)  grep='${GREP-grep}';;
-+esac
++grep='${GREP-'\''/usr/bin/ggrep'\''}'
  
  version='zgrep (gzip) @[email protected]
  Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.