mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 17:59:59 +00:00
Code Issues Projects Releases Wiki Activity

php: update to 5.6.18 and 6.6.32

Browse Source 
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 9d18babf72)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2016-02-25 16:55:08 -08:00
parent 9fdc965ea5
commit f5e877779b
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
+56
View File
@@ -0,0 +1,56 @@
[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
Upstream-Status: Pending
AC_TRY_RUN is not suitable for cross-compile
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
ext/fileinfo/config.m4 | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7e98d62..8a8ea0e 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
libmagic/readcdf.c libmagic/softmagic.c"
AC_MSG_CHECKING([for strcasestr])
- AC_TRY_RUN([
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-int main(void)
-{
- char *s0, *s1, *ret;
-
- s0 = (char *) malloc(42);
- s1 = (char *) malloc(8);
-
- memset(s0, 'X', 42);
- s0[24] = 'Y';
- s0[26] = 'Z';
- s0[41] = '\0';
- memset(s1, 'x', 8);
- s1[0] = 'y';
- s1[2] = 'Z';
- s1[7] = '\0';
-
- ret = strcasestr(s0, s1);
-
- return !(NULL != ret);
-}
+ AC_TRY_COMPILE([
+ #include <string.h>
+ #include <strings.h>
+ #include <stdlib.h>
+ ],[
+ strcasestr(NULL, NULL);
],[
dnl using the platform implementation
AC_MSG_RESULT(yes)
--
1.9.1