* [PATCH] file: fix regression for determining DB file type
@ 2018-07-12 5:19 Yi Zhao
0 siblings, 0 replies; only message in thread
From: Yi Zhao @ 2018-07-12 5:19 UTC (permalink / raw)
To: openembedded-core
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)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
This patch is rebased against master-next
.../file/file/fix-bogus-magic.patch | 32 ++++++++++++++++++++++
meta/recipes-devtools/file/file_5.33.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-devtools/file/file/fix-bogus-magic.patch
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 0000000..9a33ea7
--- /dev/null
+++ b/meta/recipes-devtools/file/file/fix-bogus-magic.patch
@@ -0,0 +1,32 @@
+From c637aaad6f0db5ad45a5296c837cb1f5253d3e3a Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 24 May 2018 18:54:40 +0000
+Subject: [PATCH] fix bogus magic
+
+Upstream-Status: Backport
+[https://github.com/file/file/commit/4fb6a59df80d4974f8230bfce36e38e6de7d574f]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ magic/Magdir/dbpf | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf
+index 65cab61e..e81c5538 100644
+--- a/magic/Magdir/dbpf
++++ b/magic/Magdir/dbpf
+@@ -9,9 +9,7 @@
+ >4 ulelong x \b, version: %u.
+ >>8 ulelong x \b%u
+ >>>36 ulelong x \b, files: %u
++>>24 ledate !0 \b, created: %s
++>>28 ledate !0 \b, modified: %s
+ !:ext dbpf/package/dat/sc4
+ !:mime application/x-maxis-dbpf
+-4 ulelong 1
+->8 ulelong !1
+->>24 ledate !0 \b, created: %s
+->>>28 ledate !0 \b, modified: %s
+--
+2.13.3
+
diff --git a/meta/recipes-devtools/file/file_5.33.bb b/meta/recipes-devtools/file/file_5.33.bb
index 745ef10..a29402a0 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).+)"
SRC_URI = "git://github.com/file/file.git \
file://debian-742262.patch \
file://CVE-2018-10360.patch \
+ file://fix-bogus-magic.patch \
"
SRCREV = "219846094c7593e27453e62855e61181089c48cf"
--
2.7.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-07-12 5:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-12 5:19 [PATCH] file: fix regression for determining DB file type Yi Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.