diff options
Diffstat (limited to 'tools/busybox-patches/bzip2-payload-1.11.1.diff')
| -rw-r--r-- | tools/busybox-patches/bzip2-payload-1.11.1.diff | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/tools/busybox-patches/bzip2-payload-1.11.1.diff b/tools/busybox-patches/bzip2-payload-1.11.1.diff deleted file mode 100644 index 4e55b4c9..00000000 --- a/tools/busybox-patches/bzip2-payload-1.11.1.diff +++ /dev/null @@ -1,62 +0,0 @@ -diff -wur busybox-1.11.0/archival/Config.in busybox-1.11.0-patched/archival/Config.in ---- busybox-1.11.0/archival/Config.in 2008-06-25 14:51:26.000000000 +0200 -+++ busybox-1.11.0-patched/archival/Config.in 2008-07-10 17:53:29.000000000 +0200 -@@ -145,6 +145,14 @@ - help - Converts an RPM file into a CPIO archive. - -+config FEATURE_RPM2CPIO_BZIP2 -+ bool " Support bzip2 decompression" -+ default n -+ depends on RPM2CPIO -+ help -+ If you enable this option you'll be able to extract -+ rpms compressed with bzip2. -+ - config RPM - bool "rpm" - default n -Only in busybox-1.11.0-patched/archival: Config.in.orig -diff -wur busybox-1.11.0/archival/libunarchive/Kbuild busybox-1.11.0-patched/archival/libunarchive/Kbuild ---- busybox-1.11.0/archival/libunarchive/Kbuild 2008-06-25 14:51:26.000000000 +0200 -+++ busybox-1.11.0-patched/archival/libunarchive/Kbuild 2008-07-10 17:53:29.000000000 +0200 -@@ -55,6 +55,7 @@ - lib-$(CONFIG_GUNZIP) += decompress_unzip.o - lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o - lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o -+lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o - lib-$(CONFIG_RPM) += decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o - lib-$(CONFIG_TAR) += get_header_tar.o -diff -wur busybox-1.11.0/archival/rpm2cpio.c busybox-1.11.0-patched/archival/rpm2cpio.c ---- busybox-1.11.0/archival/rpm2cpio.c 2008-06-25 14:51:26.000000000 +0200 -+++ busybox-1.11.0-patched/archival/rpm2cpio.c 2008-07-10 17:53:29.000000000 +0200 -@@ -75,13 +75,23 @@ - skip_header(rpm_fd); - - xread(rpm_fd, &magic, 2); -- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { -- bb_error_msg_and_die("invalid gzip magic"); -- } -- -+ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { - if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { -- bb_error_msg("error inflating"); -+ bb_error_msg("error inflating (gzip)"); -+ } -+ } -+ 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 (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0) -+ bb_error_msg("error inflating (bzip2)"); -+#else -+ bb_error_msg_and_die("bzip2 not supported"); -+#endif - } -+ else -+ bb_error_msg_and_die("not gzip or bzip2 compressed"); - - close(rpm_fd); - |