From eed50a3ac404baf9272bea4623b3c454e9990eca Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Fri, 22 Jun 2007 16:07:10 +0000
Subject: new busybox snapshot 22.06.2007 fixed bzip2 patch grep extendet regex
 support enabled

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1186 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 tools/busybox-patches/bzip2-payload-1.6.0.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/busybox-patches')

diff --git a/tools/busybox-patches/bzip2-payload-1.6.0.diff b/tools/busybox-patches/bzip2-payload-1.6.0.diff
index 0211e20f..1815b285 100644
--- a/tools/busybox-patches/bzip2-payload-1.6.0.diff
+++ b/tools/busybox-patches/bzip2-payload-1.6.0.diff
@@ -38,19 +38,19 @@ diff -ru ./archival/rpm2cpio.c ../busybox-1.6.0/archival/rpm2cpio.c
 -		bb_error_msg_and_die("invalid gzip magic");
 +	if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) {
 +		check_header_gzip_or_die(rpm_fd);
-+		if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
++		if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
 +			bb_error_msg("error inflating (gzip)");
 +		}
  	}
 -
 -	check_header_gzip_or_die(rpm_fd);
--	if (inflate_gunzip(rpm_fd, STDOUT_FILENO) < 0) {
+-	if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
 -		bb_error_msg("error inflating");
 +	else if ((magic[0] == 'B') && (magic[1] == 'Z')) {
 +#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2
 +		/* return to position before magic (eek..!) */
 +		lseek(rpm_fd, -2, SEEK_CUR);
-+		if (uncompressStream(rpm_fd, fileno(stdout)) != 0)
++		if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0)
 +			bb_error_msg("error inflating (bzip2)");
 +#else
 +		bb_error_msg_and_die("bzip2 not supported");
-- 
cgit v1.2.3-55-g7522