diff options
author | Armin Kuster <akuster808@gmail.com> | 2016-02-25 16:55:08 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-09-18 12:21:07 -0700 |
commit | f5e877779b6d7b8ee8e4d20f7be247af13f675da (patch) | |
tree | 8d1722a5f77396af3bf606ba838de40e2ffd2534 /meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | |
parent | 9fdc965ea518f121a0bf893df9c4f11af9b7e8d2 (diff) | |
download | meta-openembedded-f5e877779b6d7b8ee8e4d20f7be247af13f675da.tar.gz |
php: update to 5.6.18 and 6.6.32
Moved LIC_FILES_CHKSUM from .inc to .bb
5.6.18 changed do to yr update.
Includes: CVE-2016-2554
and
PCRE:
Upgraded bundled PCRE library to 8.38. (CVE-2015-8383, CVE-2015-8386, CVE-2015-8387, CVE-2015-8389, CVE-2015-8390, CVE-2015-8391, CVE-2015-8393, CVE-2015-8394)
see http://php.net/ChangeLog-5.php#5.6.18 for more info.
http://php.net/ChangeLog-5.php#5.5.32
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 9d18babf72c6cbc45123940a365486bf94c0f728)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch')
-rw-r--r-- | meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch new file mode 100644 index 000000000..39c334f39 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | AC_TRY_RUN is not suitable for cross-compile | ||
6 | |||
7 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
8 | --- | ||
9 | ext/fileinfo/config.m4 | 31 ++++++------------------------- | ||
10 | 1 file changed, 6 insertions(+), 25 deletions(-) | ||
11 | |||
12 | diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 | ||
13 | index 7e98d62..8a8ea0e 100644 | ||
14 | --- a/ext/fileinfo/config.m4 | ||
15 | +++ b/ext/fileinfo/config.m4 | ||
16 | @@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then | ||
17 | libmagic/readcdf.c libmagic/softmagic.c" | ||
18 | |||
19 | AC_MSG_CHECKING([for strcasestr]) | ||
20 | - AC_TRY_RUN([ | ||
21 | -#include <string.h> | ||
22 | -#include <strings.h> | ||
23 | -#include <stdlib.h> | ||
24 | - | ||
25 | -int main(void) | ||
26 | -{ | ||
27 | - char *s0, *s1, *ret; | ||
28 | - | ||
29 | - s0 = (char *) malloc(42); | ||
30 | - s1 = (char *) malloc(8); | ||
31 | - | ||
32 | - memset(s0, 'X', 42); | ||
33 | - s0[24] = 'Y'; | ||
34 | - s0[26] = 'Z'; | ||
35 | - s0[41] = '\0'; | ||
36 | - memset(s1, 'x', 8); | ||
37 | - s1[0] = 'y'; | ||
38 | - s1[2] = 'Z'; | ||
39 | - s1[7] = '\0'; | ||
40 | - | ||
41 | - ret = strcasestr(s0, s1); | ||
42 | - | ||
43 | - return !(NULL != ret); | ||
44 | -} | ||
45 | + AC_TRY_COMPILE([ | ||
46 | + #include <string.h> | ||
47 | + #include <strings.h> | ||
48 | + #include <stdlib.h> | ||
49 | + ],[ | ||
50 | + strcasestr(NULL, NULL); | ||
51 | ],[ | ||
52 | dnl using the platform implementation | ||
53 | AC_MSG_RESULT(yes) | ||
54 | -- | ||
55 | 1.9.1 | ||
56 | |||