summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:56:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:56:59 (GMT)
commit02e603e48c6e0b0492f596890adadf6590fa692c (patch)
tree91f0391425433d648057baef974c1b9c80f7359f
parent2d80a6bc8a5a1058efc46e81984647fd750ac59c (diff)
downloadpoky-02e603e48c6e0b0492f596890adadf6590fa692c.tar.gz
Revert "file: Update CVE patch to ensure file gets built correctly"
This reverts commit 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.patch24
1 files changed, 21 insertions, 3 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 b80ded7..af02b99 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,9 +11,6 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f
11https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 11https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4
12https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c 12https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c
13 13
14[RP: Don't patch magic.h, only magic.h.in so that timestamps ensure
15the file gets rebuilt]
16
17Upstream-Status: Backport 14Upstream-Status: Backport
18 15
19Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 16Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
@@ -26,6 +23,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
26 src/file_opts.h | 6 + 23 src/file_opts.h | 6 +
27 src/funcs.c | 42 ++++- 24 src/funcs.c | 42 ++++-
28 src/magic.c | 50 ++++++ 25 src/magic.c | 50 ++++++
26 src/magic.h | 9 ++
29 src/magic.h.in | 4 + 27 src/magic.h.in | 4 +
30 src/readelf.c | 467 +++++++++++++++++++++++++++++++++--------------------- 28 src/readelf.c | 467 +++++++++++++++++++++++++++++++++---------------------
31 src/softmagic.c | 70 ++++---- 29 src/softmagic.c | 70 ++++----
@@ -416,6 +414,26 @@ Index: file-5.16/src/magic.c
416+ return -1; 414+ return -1;
417+ } 415+ }
418+} 416+}
417Index: 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
419Index: file-5.16/src/magic.h.in 437Index: file-5.16/src/magic.h.in
420=================================================================== 438===================================================================
421--- file-5.16.orig/src/magic.h.in 439--- file-5.16.orig/src/magic.h.in