summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-06 15:57:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-08 10:51:59 +0100
commitd1870c9903ada9b8f05f71752c93693c244b03f2 (patch)
tree4baf0ea0851680dc16187692512b09688f7a2bc1
parent41171c6c62931ba99b8236c07216737c03230449 (diff)
downloadpoky-d1870c9903ada9b8f05f71752c93693c244b03f2.tar.gz
file: Update to 5.34
Distros which have glibc 2.28 on them otherwsise fail to build due to some syscall mismatches (From OE-Core rev: 990a9c944375146bb3f0208b30e8b7f50239cef5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/file/file/CVE-2018-10360.patch32
-rw-r--r--meta/recipes-devtools/file/file/fix-bogus-magic.patch32
-rw-r--r--meta/recipes-devtools/file/file_5.34.bb (renamed from meta/recipes-devtools/file/file_5.33.bb)4
3 files changed, 1 insertions, 67 deletions
diff --git a/meta/recipes-devtools/file/file/CVE-2018-10360.patch b/meta/recipes-devtools/file/file/CVE-2018-10360.patch
deleted file mode 100644
index 7f5671b834..0000000000
--- a/meta/recipes-devtools/file/file/CVE-2018-10360.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From df494f4ca494b5e1044052d96a6092a16ef1f6b3 Mon Sep 17 00:00:00 2001
2From: Christos Zoulas <christos@zoulas.com>
3Date: Sat, 9 Jun 2018 16:00:06 +0000
4Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis)
5
6Upstream-Status: Backport
7[https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22]
8
9CVE: CVE-2018-10360
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 src/readelf.c | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/src/readelf.c b/src/readelf.c
17index 3df0836..d96a538 100644
18--- a/src/readelf.c
19+++ b/src/readelf.c
20@@ -825,7 +825,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
21
22 cname = (unsigned char *)
23 &nbuf[doff + prpsoffsets(i)];
24- for (cp = cname; *cp && isprint(*cp); cp++)
25+ for (cp = cname; cp < nbuf + size && *cp
26+ && isprint(*cp); cp++)
27 continue;
28 /*
29 * Linux apparently appends a space at the end
30--
312.7.4
32
diff --git a/meta/recipes-devtools/file/file/fix-bogus-magic.patch b/meta/recipes-devtools/file/file/fix-bogus-magic.patch
deleted file mode 100644
index 9a33ea7a0d..0000000000
--- a/meta/recipes-devtools/file/file/fix-bogus-magic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From c637aaad6f0db5ad45a5296c837cb1f5253d3e3a Mon Sep 17 00:00:00 2001
2From: Christos Zoulas <christos@zoulas.com>
3Date: Thu, 24 May 2018 18:54:40 +0000
4Subject: [PATCH] fix bogus magic
5
6Upstream-Status: Backport
7[https://github.com/file/file/commit/4fb6a59df80d4974f8230bfce36e38e6de7d574f]
8
9Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
10---
11 magic/Magdir/dbpf | 6 ++----
12 1 file changed, 2 insertions(+), 4 deletions(-)
13
14diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf
15index 65cab61e..e81c5538 100644
16--- a/magic/Magdir/dbpf
17+++ b/magic/Magdir/dbpf
18@@ -9,9 +9,7 @@
19 >4 ulelong x \b, version: %u.
20 >>8 ulelong x \b%u
21 >>>36 ulelong x \b, files: %u
22+>>24 ledate !0 \b, created: %s
23+>>28 ledate !0 \b, modified: %s
24 !:ext dbpf/package/dat/sc4
25 !:mime application/x-maxis-dbpf
26-4 ulelong 1
27->8 ulelong !1
28->>24 ledate !0 \b, created: %s
29->>>28 ledate !0 \b, modified: %s
30--
312.13.3
32
diff --git a/meta/recipes-devtools/file/file_5.33.bb b/meta/recipes-devtools/file/file_5.34.bb
index a29402a0ab..6612b71000 100644
--- a/meta/recipes-devtools/file/file_5.33.bb
+++ b/meta/recipes-devtools/file/file_5.34.bb
@@ -16,11 +16,9 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
16 16
17SRC_URI = "git://github.com/file/file.git \ 17SRC_URI = "git://github.com/file/file.git \
18 file://debian-742262.patch \ 18 file://debian-742262.patch \
19 file://CVE-2018-10360.patch \
20 file://fix-bogus-magic.patch \
21 " 19 "
22 20
23SRCREV = "219846094c7593e27453e62855e61181089c48cf" 21SRCREV = "315cef2f699da3c31a54bd3c6c6070680fbaf1f5"
24S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
25 23
26inherit autotools 24inherit autotools