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:35 +0000 |
commit | 2d80a6bc8a5a1058efc46e81984647fd750ac59c (patch) | |
tree | 0e3396c1fd7dd83ac18c2b570b85c05e423b64cf | |
parent | 159f66aea7860b1008b7dcd60d81dfa12d7546d9 (diff) | |
download | poky-2d80a6bc8a5a1058efc46e81984647fd750ac59c.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: ece58a88ef905e42de4b8b690106b553ccaa9f30)
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 af02b995b7..b80ded7aa0 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,6 +11,9 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f | |||
11 | https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 | 11 | https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 |
12 | https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c | 12 | https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c |
13 | 13 | ||
14 | [RP: Don't patch magic.h, only magic.h.in so that timestamps ensure | ||
15 | the file gets rebuilt] | ||
16 | |||
14 | Upstream-Status: Backport | 17 | Upstream-Status: Backport |
15 | 18 | ||
16 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | 19 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> |
@@ -23,7 +26,6 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | |||
23 | src/file_opts.h | 6 + | 26 | src/file_opts.h | 6 + |
24 | src/funcs.c | 42 ++++- | 27 | src/funcs.c | 42 ++++- |
25 | src/magic.c | 50 ++++++ | 28 | src/magic.c | 50 ++++++ |
26 | src/magic.h | 9 ++ | ||
27 | src/magic.h.in | 4 + | 29 | src/magic.h.in | 4 + |
28 | src/readelf.c | 467 +++++++++++++++++++++++++++++++++--------------------- | 30 | src/readelf.c | 467 +++++++++++++++++++++++++++++++++--------------------- |
29 | src/softmagic.c | 70 ++++---- | 31 | src/softmagic.c | 70 ++++---- |
@@ -414,26 +416,6 @@ Index: file-5.16/src/magic.c | |||
414 | + return -1; | 416 | + return -1; |
415 | + } | 417 | + } |
416 | +} | 418 | +} |
417 | Index: file-5.16/src/magic.h | ||
418 | =================================================================== | ||
419 | --- file-5.16.orig/src/magic.h | ||
420 | +++ file-5.16/src/magic.h | ||
421 | @@ -101,6 +101,15 @@ int magic_check(magic_t, const char *); | ||
422 | int magic_list(magic_t, const char *); | ||
423 | int magic_errno(magic_t); | ||
424 | |||
425 | +#define MAGIC_PARAM_INDIR_MAX 0 | ||
426 | +#define MAGIC_PARAM_NAME_MAX 1 | ||
427 | +#define MAGIC_PARAM_ELF_PHNUM_MAX 2 | ||
428 | +#define MAGIC_PARAM_ELF_SHNUM_MAX 3 | ||
429 | +#define MAGIC_PARAM_ELF_NOTES_MAX 4 | ||
430 | + | ||
431 | +int magic_setparam(magic_t, int, const void *); | ||
432 | +int magic_getparam(magic_t, int, void *); | ||
433 | + | ||
434 | #ifdef __cplusplus | ||
435 | }; | ||
436 | #endif | ||
437 | Index: file-5.16/src/magic.h.in | 419 | Index: file-5.16/src/magic.h.in |
438 | =================================================================== | 420 | =================================================================== |
439 | --- file-5.16.orig/src/magic.h.in | 421 | --- file-5.16.orig/src/magic.h.in |