aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:56:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:56:32 +0000
commit5094b8268daf8129cc6c7fad9c51a1bb845c99d1 (patch)
tree6f257e17832725a1fe6460499e5625cc3c1234a6
parentece58a88ef905e42de4b8b690106b553ccaa9f30 (diff)
downloadopenembedded-core-5094b8268daf8129cc6c7fad9c51a1bb845c99d1.zip
openembedded-core-5094b8268daf8129cc6c7fad9c51a1bb845c99d1.tar.gz
openembedded-core-5094b8268daf8129cc6c7fad9c51a1bb845c99d1.tar.bz2
Revert "file: Update CVE patch to ensure file gets built correctly"
This reverts commit ece58a88ef905e42de4b8b690106b553ccaa9f30.
-rw-r--r--meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch24
1 files changed, 21 insertions, 3 deletions
diff --git a/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch b/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch
index b80ded7..af02b99 100644
--- a/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch
+++ b/meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch
@@ -11,9 +11,6 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f
https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4
https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c
-[RP: Don't patch magic.h, only magic.h.in so that timestamps ensure
-the file gets rebuilt]
-
Upstream-Status: Backport
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
@@ -26,6 +23,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
src/file_opts.h | 6 +
src/funcs.c | 42 ++++-
src/magic.c | 50 ++++++
+ src/magic.h | 9 ++
src/magic.h.in | 4 +
src/readelf.c | 467 +++++++++++++++++++++++++++++++++---------------------
src/softmagic.c | 70 ++++----
@@ -416,6 +414,26 @@ Index: file-5.16/src/magic.c
+ return -1;
+ }
+}
+Index: file-5.16/src/magic.h
+===================================================================
+--- file-5.16.orig/src/magic.h
++++ file-5.16/src/magic.h
+@@ -101,6 +101,15 @@ int magic_check(magic_t, const char *);
+ int magic_list(magic_t, const char *);
+ int magic_errno(magic_t);
+
++#define MAGIC_PARAM_INDIR_MAX 0
++#define MAGIC_PARAM_NAME_MAX 1
++#define MAGIC_PARAM_ELF_PHNUM_MAX 2
++#define MAGIC_PARAM_ELF_SHNUM_MAX 3
++#define MAGIC_PARAM_ELF_NOTES_MAX 4
++
++int magic_setparam(magic_t, int, const void *);
++int magic_getparam(magic_t, int, void *);
++
+ #ifdef __cplusplus
+ };
+ #endif
Index: file-5.16/src/magic.h.in
===================================================================
--- file-5.16.orig/src/magic.h.in