summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/cpio/cpio-2.11/Fix-symlink-bad-length-test-for-64-bit-architectures.patch36
-rw-r--r--meta/recipes-extended/cpio/cpio_2.11.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.11/Fix-symlink-bad-length-test-for-64-bit-architectures.patch b/meta/recipes-extended/cpio/cpio-2.11/Fix-symlink-bad-length-test-for-64-bit-architectures.patch
new file mode 100644
index 0000000000..c2da9e1628
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.11/Fix-symlink-bad-length-test-for-64-bit-architectures.patch
@@ -0,0 +1,36 @@
1From 0e8d8ed494433237cff0ad6c513c40f025005e8c Mon Sep 17 00:00:00 2001
2From: Jun Zhang <jun.zhang@windriver.com>
3Date: Fri, 16 Oct 2015 10:48:21 +0800
4Subject: [PATCH] Fix symlink-bad-length test for 64-bit architectures.
5
6* src/util.c: Return non-zero exit code if EOF is hit prematurely.
7
8Backport commit:
9http://git.savannah.gnu.org/cgit/cpio.git/commit/src/util.c?id=f6a8a2cbd2d5ca40ea94900b55b845dd5ca87328
10
11Upstream-Status: Backport
12
13Signed-off-by: Jun Zhang <jun.zhang@windriver.com>
14---
15 src/util.c | 5 +----
16 1 file changed, 1 insertion(+), 4 deletions(-)
17
18diff --git a/src/util.c b/src/util.c
19index 00953d5..b536d82 100644
20--- a/src/util.c
21+++ b/src/util.c
22@@ -206,10 +206,7 @@ tape_fill_input_buffer (int in_des, int num_bytes)
23 if (input_size < 0)
24 error (1, errno, _("read error"));
25 if (input_size == 0)
26- {
27- error (0, 0, _("premature end of file"));
28- exit (1);
29- }
30+ error (PAXEXIT_FAILURE, 0, _("premature end of file"));
31 input_bytes += input_size;
32 }
33
34--
351.9.1
36
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index c5d92bfaa3..84e538f079 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -9,6 +9,7 @@ SRC_URI += "file://remove-gets.patch \
9 file://fix-memory-overrun.patch \ 9 file://fix-memory-overrun.patch \
10 file://cpio-CVE-2015-1197.patch \ 10 file://cpio-CVE-2015-1197.patch \
11 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 11 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
12 file://Fix-symlink-bad-length-test-for-64-bit-architectures.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" 15SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"