mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

busybox: unbreak tar of uncompressed files

Browse Source 
A patch was added to fix compressed tar files, but broke uncompressed
tar files, this fix is from the busybox mailing list

http://lists.busybox.net/pipermail/busybox/2014-January/080389.html

[YOCTO #7645]

(From OE-Core rev: 2e67a2d35ffcaa0d35363b05209060aff7026c9a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2015-04-28 15:46:04 -07:00
committed by Richard Purdie
parent 80bc382c62
commit 29812e6173
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch Normal file
View File

@@ -0,0 +1,23 @@
This patch allows tar to continue correctly when it does not detect
a compressed format. This allows tar to then untar a non-compressed
tar file.
See this thread for details: http://lists.busybox.net/pipermail/busybox/2014-January/080389.html
Upstream-Status: Inappropriate [Upstream has different fix with additional functionality]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: busybox-1.22.1/archival/libarchive/open_transformer.c
===================================================================
--- busybox-1.22.1.orig/archival/libarchive/open_transformer.c
+++ busybox-1.22.1/archival/libarchive/open_transformer.c
@@ -200,7 +200,7 @@ int FAST_FUNC open_zipped(const char *fn
|| (ENABLE_FEATURE_SEAMLESS_BZ2)
|| (ENABLE_FEATURE_SEAMLESS_XZ)
) {
- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0);
}
return fd;

1
meta/recipes-core/busybox/busybox_1.22.1.bb
View File

@@ -35,6 +35,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \
file://lzop-add-overflow-check.patch \
file://libarchive-open_zipped-does-not-need-to-check-extens.patch \
file://unbreak_noncompressed_tar.patch \
"
SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e"