| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 04 Dec 2012 02:01:04 -0800 | |
| branch | s11u1-sru |
| changeset 2443 | 952b267446eb |
| parent 755 | e7d0aed114ef |
| child 2842 | 2168e180aa83 |
| permissions | -rw-r--r-- |
|
2443
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
1 |
This simplified patch was generated based on following community fix |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
2 |
which we have adopted in 12.0 and 11.2 (where we have latest gzip |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
3 |
version and patch applied there without problem): |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
4 |
|
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
5 |
http://git.savannah.gnu.org/cgit/gzip.git/commit/?id=60b3f4eb672a85de28ecaad47ed426f8c8fe6c32 |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
6 |
|
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
7 |
--- gzip-1.4/zgrep.in Sun Jan 3 09:26:02 2010 |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
8 |
+++ gzip-1.4/zgrep.in Wed Nov 28 05:44:33 2012 |
|
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
9 |
@@ -26,7 +26,7 @@ |
|
755
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
esac |
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
PATH=$bindir:$PATH |
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
|
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
-grep='${GREP-grep}'
|
|
2443
952b267446eb
15785482 SUNBT7161330 gzgrep -e option no longer works
Petr Sumbera <petr.sumbera@oracle.com>
parents:
755
diff
changeset
|
14 |
+grep='${GREP-'\''/usr/bin/ggrep'\''}'
|
|
755
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
version='zgrep (gzip) @VERSION@ |
|
e7d0aed114ef
7157429 gzip 1.4 integration still has a couple of problems
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. |