diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-28 10:34:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-28 10:35:54 +0000 |
| commit | d9519a17ea2ca07433164697a7222dd2b6dd2b9a (patch) | |
| tree | 0658af53a99d86cd2b11edeaac74fc7d1d6c949e | |
| parent | aaf5ae09f14578ff1961ad3b199aacbc77a1f8ff (diff) | |
| download | openembedded-core-d9519a17ea2ca07433164697a7222dd2b6dd2b9a.tar.gz openembedded-core-d9519a17ea2ca07433164697a7222dd2b6dd2b9a.tar.bz2 openembedded-core-d9519a17ea2ca07433164697a7222dd2b6dd2b9a.zip | |
file: Update CVE patch to ensure file gets built correctly
If we touch both files, we can end up in a situation where magic.h should be
rebuilt and isn't. The easiest fix is not to touch the generated files which
ensures the timestamps are such that it is always rebuilt.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/file/file/file-CVE-2014-9620-and-CVE-2014-9621.patch | 24 |
1 files changed, 3 insertions, 21 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 2482de3998..7b23975abf 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 @@ -16,6 +16,9 @@ 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> @@ -28,7 +31,6 @@ 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 | 9 ++ src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- src/softmagic.c | 93 ++++++----- @@ -423,26 +425,6 @@ index 22174b8..a89647c 100644 + 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 index 86fc41b..2efc7bc 100644 --- a/src/magic.h.in |