rpms/gzip/FC-3 gzip-1.3.3-zgrep-sed.patch, NONE, 1.1 gzip.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/gzip/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv18757

Modified Files:
	gzip.spec 
Added Files:
	gzip-1.3.3-zgrep-sed.patch 
Log Message:
fix bug #121514 - CAN-2005-0758 zgrep problem with sed


gzip-1.3.3-zgrep-sed.patch:
 zgrep.in |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE gzip-1.3.3-zgrep-sed.patch ---
--- gzip-1.3.3/zgrep.in.sed	2005-04-07 17:13:58.000000000 +0200
+++ gzip-1.3.3/zgrep.in	2005-04-07 17:16:19.557614328 +0200
@@ -24,7 +24,7 @@
 
 PATH="BINDIR:$PATH"; export PATH
 
-prog=`echo $0 | sed 's|.*/||'`
+prog=`echo "$0" | sed 's|.*/||'`
 case "$prog" in
 	*egrep)	grep=${EGREP-egrep}	;;
 	*fgrep)	grep=${FGREP-fgrep}	;;
@@ -96,12 +96,16 @@
 for i do
   gzip -cdfq "$i" |
     if test $files_with_matches -eq 1; then
-      $grep $opt "$pat" > /dev/null && echo $i
+      $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
     elif test $files_without_matches -eq 1; then
-      $grep $opt "$pat" > /dev/null || echo $i
+      $grep $opt "$pat" > /dev/null || printf "%s\n" "$i"
     elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then
       $grep $opt "$pat"
     else
+      i=${i//\\/\\\\}
+      i=${i//|/\\|}
+      i=${i//&/\\&}
+      i=`printf "%s" "$i" | tr '\n' ' '`
       if test $with_filename -eq 1; then
 	sed_script="s|^[^:]*:|${i}:|"
       else


Index: gzip.spec
===================================================================
RCS file: /cvs/dist/rpms/gzip/FC-3/gzip.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gzip.spec	17 Jun 2005 09:56:10 -0000	1.13
+++ gzip.spec	20 Jun 2005 11:41:21 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program.
 Name: gzip
 Version: 1.3.3
-Release: 14.fc3
+Release: 15.fc3
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch6: gzip-1.3.3-window-size.patch
 Patch7: gzip-1.3.5-gzip-perm.patch
 Patch8: gzip-1.3.5-gunzip-dir.patch
+Patch9: gzip-1.3.3-zgrep-sed.patch
 URL: http://www.gzip.org/
 Prereq: /sbin/install-info
 Requires: mktemp less
@@ -37,6 +38,7 @@
 %patch6 -p1 -b .window-size
 %patch7 -p1 -b .perm
 %patch8 -p1 -b .dir
+%patch9 -p1 -b .sed
 
 %build
 export DEFS="-DNO_ASM"
@@ -89,6 +91,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Mon Jun 20 2005 Ivana Varekova <varekova at redhat.com> 1.3.5-15.fc3
+- fix bug #121514 - CAN-2005-0758 zgrep problem with sed
+ 
 * Fri Jun 17 2005 Ivana Varekova <varekova at redhat.com> 1.3.5-14.fc3
 - fix bug 156269 - CAN-2005-1228 directory traversal bug
  (using the patch from Ulf Harnhammar)