From 512968d9b43583e013d5b827aad8844e0cf65697 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 19 Jul 2016 05:14:48 -0400 Subject: 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 Signed-off-by: Martin Jansa (cherry picked from commit aa01ab95a374fd00a8cbde841ce0efffdada63c4) Signed-off-by: Armin Kuster (cherry picked from commit 5490337a5e8e85541bbc14845fe0bc358583abee) Signed-off-by: Armin Kuster --- .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 ---------------------- .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 ++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.5.32.bb | 6 --- meta-oe/recipes-devtools/php/php_5.5.37.bb | 6 +++ meta-oe/recipes-devtools/php/php_5.6.18.bb | 7 --- meta-oe/recipes-devtools/php/php_5.6.23.bb | 7 +++ 6 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch create mode 100644 meta-oe/recipes-devtools/php/php-5.6.23/change-AC_TRY_RUN-to-AC_TRY_LINK.patch delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.32.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.5.37.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.18.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.6.23.bb 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 deleted file mode 100644 index 39c334f39d..0000000000 --- a/meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch +++ /dev/null @@ -1,56 +0,0 @@ -[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 ---- - 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 --#include --#include -- --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 -+ #include -+ #include -+ ],[ -+ strcasestr(NULL, NULL); - ],[ - dnl using the platform implementation - AC_MSG_RESULT(yes) --- -1.9.1 - 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 0000000000..39c334f39d --- /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 @@ +[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 +--- + 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 +-#include +-#include +- +-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 ++ #include ++ #include ++ ],[ ++ strcasestr(NULL, NULL); + ],[ + dnl using the platform implementation + AC_MSG_RESULT(yes) +-- +1.9.1 + diff --git a/meta-oe/recipes-devtools/php/php_5.5.32.bb b/meta-oe/recipes-devtools/php/php_5.5.32.bb deleted file mode 100644 index 4ee3c38308..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.5.32.bb +++ /dev/null @@ -1,6 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd" - -SRC_URI[md5sum] = "47443f39152d671d24bc839e6a49049d" -SRC_URI[sha256sum] = "b0f2c108db8e05db9f6366aaba9a754fd0ee31f3f86ee889561b608dfd6e92ee" diff --git a/meta-oe/recipes-devtools/php/php_5.5.37.bb b/meta-oe/recipes-devtools/php/php_5.5.37.bb new file mode 100644 index 0000000000..c7655bc2cf --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.5.37.bb @@ -0,0 +1,6 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd" + +SRC_URI[md5sum] = "3a4b249bee5451a0982263a94a8a8c9d" +SRC_URI[sha256sum] = "d2380ebe46caf17f2c4cd055867d00a82e6702dc5f62dc29ce864a5742905d88" diff --git a/meta-oe/recipes-devtools/php/php_5.6.18.bb b/meta-oe/recipes-devtools/php/php_5.6.18.bb deleted file mode 100644 index 2ce012f1b9..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.6.18.bb +++ /dev/null @@ -1,7 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" -SRC_URI[md5sum] = "7340353bedd998286ba2c4d87d7864f8" -SRC_URI[sha256sum] = "c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed" diff --git a/meta-oe/recipes-devtools/php/php_5.6.23.bb b/meta-oe/recipes-devtools/php/php_5.6.23.bb new file mode 100644 index 0000000000..002ca74517 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.6.23.bb @@ -0,0 +1,7 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4" + +SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" +SRC_URI[md5sum] = "147734b7e0164ebdd2dc18474fcfb309" +SRC_URI[sha256sum] = "facd280896d277e6f7084b60839e693d4db68318bfc92085d3dc0251fd3558c7" -- cgit 1.2.3-korg