summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php-5.6.23
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-07-19 05:14:48 -0400
committerArmin Kuster <akuster808@gmail.com>2016-09-18 12:21:25 -0700
commit512968d9b43583e013d5b827aad8844e0cf65697 (patch)
treecd7d229053b66e57b5a36a22c956bc32944abb0c /meta-oe/recipes-devtools/php/php-5.6.23
parentf5e877779b6d7b8ee8e4d20f7be247af13f675da (diff)
downloadmeta-openembedded-512968d9b43583e013d5b827aad8844e0cf65697.tar.gz
php: update to 5.5.37 and 5.6.23
Includes many CVE fixes and other bug fixes: http://php.net/ChangeLog-5.php#5.5.37 http://php.net/ChangeLog-5.php#5.6.23 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit aa01ab95a374fd00a8cbde841ce0efffdada63c4) Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 5490337a5e8e85541bbc14845fe0bc358583abee) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php-5.6.23')
-rw-r--r--meta-oe/recipes-devtools/php/php-5.6.23/change-AC_TRY_RUN-to-AC_TRY_LINK.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/php/php-5.6.23/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.23/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.23/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
3Upstream-Status: Pending
4
5AC_TRY_RUN is not suitable for cross-compile
6
7Signed-off-by: Roy Li <rongqing.li@windriver.com>
8---
9 ext/fileinfo/config.m4 | 31 ++++++-------------------------
10 1 file changed, 6 insertions(+), 25 deletions(-)
11
12diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
13index 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--
551.9.1
56