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>

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 2482de399844f33bbc78a8eb253e4055b6f5ec22..7b23975abf1e5e01c37e37fb42233c366460bccb 100644 (file)
--- 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