summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-07-12 13:19:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commitf92cd3aad021e548e37b7628c04efee982aa8576 (patch)
tree6daa07b08a9cb6473fcc54297d744fa64eb45450
parentbf7ed1d046b0636116ab52ef6ea0e8adb9ef55a8 (diff)
downloadpoky-f92cd3aad021e548e37b7628c04efee982aa8576.tar.gz
file: fix regression for determining DB file type
The version 5.33 introduced a regression bug for determining the DB file type. Backport a patch from upstream to fix it. Before apply the patch: $ file aliases.db aliases.db: created: Thu Jan 1 00:38:24 1970, modified: Thu Jan 1 00:00:00 1970 After apply the patch: $ file aliases.db aliases.db: Berkeley DB (Btree, version 9, native byte-order) (From OE-Core rev: 99e50d9e53ab23fc643c46378fa8c36190995335) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/file/file/fix-bogus-magic.patch32
-rw-r--r--meta/recipes-devtools/file/file_5.33.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/file/file/fix-bogus-magic.patch b/meta/recipes-devtools/file/file/fix-bogus-magic.patch
new file mode 100644
index 0000000000..9a33ea7a0d
--- /dev/null
+++ b/meta/recipes-devtools/file/file/fix-bogus-magic.patch
@@ -0,0 +1,32 @@
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.33.bb
index 745ef10951..a29402a0ab 100644
--- a/meta/recipes-devtools/file/file_5.33.bb
+++ b/meta/recipes-devtools/file/file_5.33.bb
@@ -17,6 +17,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
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 \ 19 file://CVE-2018-10360.patch \
20 file://fix-bogus-magic.patch \
20 " 21 "
21 22
22SRCREV = "219846094c7593e27453e62855e61181089c48cf" 23SRCREV = "219846094c7593e27453e62855e61181089c48cf"