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:45:27 +0000 |
commit | b90dd7944eac8494c6722524f53d263eed1fecd4 (patch) | |
tree | 589a707720729b795f774b8c2581f738118d9a6b /meta/recipes-devtools | |
parent | 82c843842854c7e2e87bf7762c3f9e83b3e2bf1b (diff) | |
download | poky-b90dd7944eac8494c6722524f53d263eed1fecd4.tar.gz |
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.
(From OE-Core rev: d9519a17ea2ca07433164697a7222dd2b6dd2b9a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 | |||
16 | https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 | 16 | https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 |
17 | https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c | 17 | https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c |
18 | 18 | ||
19 | [RP: Don't patch magic.h, only magic.h.in so that timestamps ensure | ||
20 | the file gets rebuilt] | ||
21 | |||
19 | Upstream-Status: Backport | 22 | Upstream-Status: Backport |
20 | 23 | ||
21 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | 24 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> |
@@ -28,7 +31,6 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | |||
28 | src/file_opts.h | 6 + | 31 | src/file_opts.h | 6 + |
29 | src/funcs.c | 42 ++++- | 32 | src/funcs.c | 42 ++++- |
30 | src/magic.c | 50 ++++++ | 33 | src/magic.c | 50 ++++++ |
31 | src/magic.h | 9 ++ | ||
32 | src/magic.h.in | 9 ++ | 34 | src/magic.h.in | 9 ++ |
33 | src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- | 35 | src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- |
34 | src/softmagic.c | 93 ++++++----- | 36 | src/softmagic.c | 93 ++++++----- |
@@ -423,26 +425,6 @@ index 22174b8..a89647c 100644 | |||
423 | + return -1; | 425 | + return -1; |
424 | + } | 426 | + } |
425 | +} | 427 | +} |
426 | diff --git a/src/magic.h b/src/magic.h | ||
427 | index 535a177..89bfe4b 100644 | ||
428 | --- a/src/magic.h | ||
429 | +++ b/src/magic.h | ||
430 | @@ -101,6 +101,15 @@ int magic_check(magic_t, const char *); | ||
431 | int magic_list(magic_t, const char *); | ||
432 | int magic_errno(magic_t); | ||
433 | |||
434 | +#define MAGIC_PARAM_INDIR_MAX 0 | ||
435 | +#define MAGIC_PARAM_NAME_MAX 1 | ||
436 | +#define MAGIC_PARAM_ELF_PHNUM_MAX 2 | ||
437 | +#define MAGIC_PARAM_ELF_SHNUM_MAX 3 | ||
438 | +#define MAGIC_PARAM_ELF_NOTES_MAX 4 | ||
439 | + | ||
440 | +int magic_setparam(magic_t, int, const void *); | ||
441 | +int magic_getparam(magic_t, int, void *); | ||
442 | + | ||
443 | #ifdef __cplusplus | ||
444 | }; | ||
445 | #endif | ||
446 | diff --git a/src/magic.h.in b/src/magic.h.in | 428 | diff --git a/src/magic.h.in b/src/magic.h.in |
447 | index 86fc41b..2efc7bc 100644 | 429 | index 86fc41b..2efc7bc 100644 |
448 | --- a/src/magic.h.in | 430 | --- a/src/magic.h.in |