summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:55:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-28 10:56:50 +0000
commitec75238f6cc2d2d8d40e0268f6d2acc070cbe9a4 (patch)
tree1c4f4b45920ff1660b85dd6b17a3cc9155971626 /meta/recipes-devtools
parentb90dd7944eac8494c6722524f53d263eed1fecd4 (diff)
downloadpoky-ec75238f6cc2d2d8d40e0268f6d2acc070cbe9a4.tar.gz
Revert "file: Update CVE patch to ensure file gets built correctly"
This reverts commit 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.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 7b23975abf..2482de3998 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,9 +16,6 @@ https://github.com/file/file/commit/445c8fb0ebff85195be94cd9f7e1df89cade5c7f
16https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4 16https://github.com/file/file/commit/ce90e05774dd77d86cfc8dfa6da57b32816841c4
17https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c 17https://github.com/file/file/commit/65437cee25199dbd385fb35901bc0011e164276c
18 18
19[RP: Don't patch magic.h, only magic.h.in so that timestamps ensure
20the file gets rebuilt]
21
22Upstream-Status: Backport 19Upstream-Status: Backport
23 20
24Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 21Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
@@ -31,6 +28,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
31 src/file_opts.h | 6 + 28 src/file_opts.h | 6 +
32 src/funcs.c | 42 ++++- 29 src/funcs.c | 42 ++++-
33 src/magic.c | 50 ++++++ 30 src/magic.c | 50 ++++++
31 src/magic.h | 9 ++
34 src/magic.h.in | 9 ++ 32 src/magic.h.in | 9 ++
35 src/readelf.c | 471 +++++++++++++++++++++++++++++++++---------------------- 33 src/readelf.c | 471 +++++++++++++++++++++++++++++++++----------------------
36 src/softmagic.c | 93 ++++++----- 34 src/softmagic.c | 93 ++++++-----
@@ -425,6 +423,26 @@ index 22174b8..a89647c 100644
425+ return -1; 423+ return -1;
426+ } 424+ }
427+} 425+}
426diff --git a/src/magic.h b/src/magic.h
427index 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
428diff --git a/src/magic.h.in b/src/magic.h.in 446diff --git a/src/magic.h.in b/src/magic.h.in
429index 86fc41b..2efc7bc 100644 447index 86fc41b..2efc7bc 100644
430--- a/src/magic.h.in 448--- a/src/magic.h.in