mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert "file: Update CVE patch to ensure file gets built correctly"

Browse Source 
This reverts commit d9519a17ea2ca07433164697a7222dd2b6dd2b9a.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-03-28 10:55:56 +00:00
parent b90dd7944e
commit ec75238f6c
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch
+21 -3
View File
@@ -16,9 +16,6 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f
https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4
https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c 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 Upstream-Status: Backport
Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
@@ -31,6 +28,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
src/file_opts.h | 6 + src/file_opts.h | 6 +
src/funcs.c | 42 ++++- src/funcs.c | 42 ++++-
src/magic.c | 50 ++++++ src/magic.c | 50 ++++++
src/magic.h | 9 ++
src/magic.h.in | 9 ++ src/magic.h.in | 9 ++
src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- src/readelf.c | 471 +++++++++++++++++++++++++++++++++----------------------
src/softmagic.c | 93 ++++++----- src/softmagic.c | 93 ++++++-----
@@ -425,6 +423,26 @@ index 22174b8..a89647c 100644
+ return -1; + return -1;
+ } + }
+} +}
diff --git a/src/magic.h b/src/magic.h
index 535a177..89bfe4b 100644
--- a/src/magic.h
+++ b/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
diff --git a/src/magic.h.in b/src/magic.h.in diff --git a/src/magic.h.in b/src/magic.h.in
index 86fc41b..2efc7bc 100644 index 86fc41b..2efc7bc 100644
--- a/src/magic.h.in --- a/src/magic.h.in