rpms/bzip2/FC-4 bzip2-1.0.2-bzgrep.patch, NONE, 1.1 bzip2.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: jryska

Update of /cvs/dist/rpms/bzip2/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29770

Modified Files:
	bzip2.spec 
Added Files:
	bzip2-1.0.2-bzgrep.patch 
Log Message:
fixed sed flaw in bzgrep


bzip2-1.0.2-bzgrep.patch:
 bzgrep |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE bzip2-1.0.2-bzgrep.patch ---
--- bzip2-1.0.2/bzgrep.flaw	2005-06-16 08:51:21.000000000 -0400
+++ bzip2-1.0.2/bzgrep	2005-06-16 08:55:20.000000000 -0400
@@ -63,7 +63,11 @@
     bzip2 -cdfq "$i" | $grep $opt "$pat"
     r=$?
   else
-    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
+    j=${i//\\/\\\\}
+    j=${j//|/\\|}
+    j=${j//&/\\&}
+    j=`printf "%s" "$j" | tr '\n' ' '`
+    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
     r=$?
   fi
   test "$r" -ne 0 && res="$r"


Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/FC-4/bzip2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bzip2.spec	19 May 2005 12:51:19 -0000	1.13
+++ bzip2.spec	16 Jun 2005 12:58:57 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.2
-Release: 16
+Release: 16.FC4
 License: BSD
 Group: Applications/File
 URL: http://sources.redhat.com/bzip2/
@@ -10,6 +10,7 @@
 Patch1: bzip2-1.0.2-tempfile.patch
 Patch2: bzip2-1.0.2-chmod.patch
 Patch3: bzip2-1.0.2-bomb.patch
+Patch4: bzip2-1.0.2-bzgrep.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: bzip2-libs = %{version}
 
@@ -48,6 +49,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -107,6 +109,9 @@
 %{_libdir}/*so
 
 %changelog
+* Thu Jun 16 2005 Jiri Ryska <jryska at redhat.com>
+- fixed sed flaw in bzgrep
+
 * Thu May 19 2005 Jiri Ryska <jryska at redhat.com>
 - fixed permission setting for decompressed files #155742
 - fixed decompression bomb (DoS) #157548