aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-02-13 14:57:22 -0800
committerArmin Kuster <akuster808@gmail.com>2018-02-23 20:28:55 -0800
commit5abacb2751225739f51c9b55ecc8b516b5ea76f8 (patch)
tree6bdffc8a11bbf270aa7c19a8e75c0857785c3287 /meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
parentb955bbbba493360f6ea30717b349468fc959a1b5 (diff)
downloadmeta-openembedded-contrib-5abacb2751225739f51c9b55ecc8b516b5ea76f8.tar.gz
php: update stable version 5.6.31 -> 5.6.33
04 Jan 2017, PHP 5.6.33 - GD: . Fixed bug #75571 (Potential infinite loop in gdImageCreateFromGifCtx). (cmb) - Phar: . Fixed bug #74782 (Reflected XSS in .phar 404 page). (Stas) 26 Sep 2017, PHP 5.6.32 - Date: . Fixed bug #75055 (Out-Of-Bounds Read in timelib_meridian()). (Derick) - mcrypt: . Fixed bug #72535 (arcfour encryption stream filter crashes php). (Leigh) - PCRE: . Fixed bug #75207 (applied upstream patch for CVE-2016-1283). (Anatol) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch')
-rw-r--r--meta-oe/recipes-devtools/php/php-5.6.33/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.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
new file mode 100644
index 0000000000..39c334f39d
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-5.6.33/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
@@ -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
+