Index: tches/bzip2-1.0.3-bzgrep_security-1.patch
===================================================================
--- patches/bzip2-1.0.3-bzgrep_security-1.patch	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
+++ 	(revision )
@@ -1,35 +1,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-08-09
-Initial Package Version: 1.0.3
-Upstream Status: Unknown.
-Origin: Jyri Ryska (RedHat) for fedora3
-Description: Fixes filename sanitisation in bzgrep.
- This fixes CAN-2005-0758 (if a user can be tricked into running
-bzgrep in an untrusted directory containing files with carefully
-crafted filenames, arbitrary commands could be executed as the user
-running bzgrep).  Risk is reported as low.  I've modified it to force
-the interpreter to be bash, some of the other shells in use won't
-like the bash syntax.
-
-diff -Naur bzip2-1.0.3/bzgrep bzip2-1.0.3-new/bzgrep
---- bzip2-1.0.3/bzgrep	2004-10-09 12:29:32.000000000 +0100
-+++ bzip2-1.0.3-new/bzgrep	2005-08-09 21:36:37.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # Bzgrep wrapped for bzip2, 
- # adapted from zgrep by Philippe Troin <phil@fifi.org> for Debian GNU/Linux.
-@@ -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: tches/bzip2-1.0.3-install_docs-1.patch
===================================================================
--- patches/bzip2-1.0.3-install_docs-1.patch	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
+++ 	(revision )
@@ -1,41 +1,0 @@
-Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
-Date:                    2005-08-03
-Initial Package Version: 1.0.3
-Upstream Status:         Not submitted
-Origin:                  Randy McMurchy & Steve Crosby
-Description:             Installs pre-formatted documentation
-
-diff -Naur bzip2-1.0.3.orig/Makefile bzip2-1.0.3/Makefile
---- bzip2-1.0.3.orig/Makefile	2005-02-17 11:28:24.000000000 +0000
-+++ bzip2-1.0.3/Makefile	2005-08-14 13:08:25.626703640 +0000
-@@ -12,6 +12,7 @@
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr
-+DOCDIR=share/doc/$(DISTNAME)
- 
- 
- OBJS= blocksort.o  \
-@@ -61,6 +62,7 @@
- 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
- 	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
- 	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
-+	if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi
- 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
- 	cp -f bzip2 $(PREFIX)/bin/bzip2
- 	cp -f bzip2 $(PREFIX)/bin/bunzip2
-@@ -94,6 +96,14 @@
- 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
- 	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
- 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	cp -f manual.html $(PREFIX)/$(DOCDIR)
-+	cp -f manual.pdf $(PREFIX)/$(DOCDIR)
-+	cp -f manual.ps $(PREFIX)/$(DOCDIR)
-+	cp -f bzip2.txt $(PREFIX)/$(DOCDIR)
-+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.html
-+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf
-+	chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps
-+	chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \
Index: tches/bzip2-1.0.3-remove_tempfile-1.patch
===================================================================
--- patches/bzip2-1.0.3-remove_tempfile-1.patch	(revision 1f3f3d361f65cfec1d55b638a2b534229b448c64)
+++ 	(revision )
@@ -1,46 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-02-19
-Initial Package Version: 1.0.3
-Origin: Jim Gifford
-Upstream Status: Sent
-Description: Removes Dependency of tempfile
- 
---- bzip2-1.0.3/bzdiff.orig	2004-10-09 11:29:42.000000000 +0000
-+++ bzip2-1.0.3/bzdiff	2006-02-20 07:43:08.000000000 +0000
-@@ -37,10 +37,6 @@
- 	echo "Usage: $prog [${comp}_options] file [file]"
- 	exit 1
- fi
--tmp=`tempfile -d /tmp -p bz` || {
--      echo 'cannot create a temporary file' >&2
--      exit 1
--}
- set $FILES
- if test $# -eq 1; then
- 	FILE=`echo "$1" | sed 's/.bz2$//'`
-@@ -53,19 +49,20 @@
-                 case "$2" in
- 	        *.bz2)
- 			F=`echo "$2" | sed 's|.*/||;s|.bz2$||'`
--                        bzip2 -cdfq "$2" > $tmp
--                        bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp
-+                        bzip2 -cdfq "$2"  > /tmp/"$F".$$
-+                        bzip2 -cdfq "$1" | $comp $OPTIONS - /tmp/"$F".$$ | sed -e "s|Files - and /tmp/"$F".$$|Files $1 and $2|g"
-                         STAT="$?"
--			/bin/rm -f $tmp;;
-+			/bin/rm -f /tmp/"$F".$$;;
- 
--                *)      bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
-+                *)      bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" | sed -e "s|Files - and /tmp/"$F".$$|Files $1 and $2|g"
-                         STAT="$?";;
-                 esac;;
-         *)      case "$2" in
- 	        *.bz2)
-                         bzip2 -cdfq "$2" | $comp $OPTIONS "$1" -
-                         STAT="$?";;
--                *)      $comp $OPTIONS "$1" "$2"
-+                *)      $comp $OPTIONS "$1" "$2" | sed -e "s|Files - and /tmp/"$F".$$|Files $1 and $2|g"
-+
-                         STAT="$?";;
-                 esac;;
- 	esac
