summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch23
-rw-r--r--meta/recipes-core/busybox/busybox_1.22.1.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch
new file mode 100644
index 0000000..3c3c23a
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch
@@ -0,0 +1,23 @@
1
2This patch allows tar to continue correctly when it does not detect
3a compressed format. This allows tar to then untar a non-compressed
4tar file.
5
6See this thread for details: http://lists.busybox.net/pipermail/busybox/2014-January/080389.html
7
8Upstream-Status: Inappropriate [Upstream has different fix with additional functionality]
9Signed-off-by: Saul Wold <sgw@linux.intel.com>
10
11Index: busybox-1.22.1/archival/libarchive/open_transformer.c
12===================================================================
13--- busybox-1.22.1.orig/archival/libarchive/open_transformer.c
14+++ busybox-1.22.1/archival/libarchive/open_transformer.c
15@@ -200,7 +200,7 @@ int FAST_FUNC open_zipped(const char *fn
16 || (ENABLE_FEATURE_SEAMLESS_BZ2)
17 || (ENABLE_FEATURE_SEAMLESS_XZ)
18 ) {
19- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
20+ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0);
21 }
22
23 return fd;
diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb
index ae8eca7..1b1eaf3 100644
--- a/meta/recipes-core/busybox/busybox_1.22.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.22.1.bb
@@ -35,6 +35,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
35 file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ 35 file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \
36 file://lzop-add-overflow-check.patch \ 36 file://lzop-add-overflow-check.patch \
37 file://libarchive-open_zipped-does-not-need-to-check-extens.patch \ 37 file://libarchive-open_zipped-does-not-need-to-check-extens.patch \
38 file://unbreak_noncompressed_tar.patch \
38" 39"
39 40
40SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" 41SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e"