From 9fdc965ea518f121a0bf893df9c4f11af9b7e8d2 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sun, 24 Jan 2016 08:35:19 -0500 Subject: php: update to 5.6.17 and 5.5.31 Fixes CVE-2016-1903 and other bugs https://secure.php.net/ChangeLog-5.php https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1903 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa (cherry picked from commit 3a43f6897c59b84d00c85e259aeea523b7a87fb9) 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.30.bb | 4 -- meta-oe/recipes-devtools/php/php_5.5.31.bb | 4 ++ meta-oe/recipes-devtools/php/php_5.6.16.bb | 5 -- meta-oe/recipes-devtools/php/php_5.6.17.bb | 5 ++ 6 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 meta-oe/recipes-devtools/php/php-5.6.16/change-AC_TRY_RUN-to-AC_TRY_LINK.patch create mode 100644 meta-oe/recipes-devtools/php/php-5.6.17/change-AC_TRY_RUN-to-AC_TRY_LINK.patch delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.30.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.5.31.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.16.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.6.17.bb diff --git a/meta-oe/recipes-devtools/php/php-5.6.16/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.16/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.16/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.17/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.17/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.17/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.30.bb b/meta-oe/recipes-devtools/php/php_5.5.30.bb deleted file mode 100644 index 2bfadc1128..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.5.30.bb +++ /dev/null @@ -1,4 +0,0 @@ -require php.inc - -SRC_URI[md5sum] = "181d153c9fba7ff46534df1bdab4d853" -SRC_URI[sha256sum] = "e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29" diff --git a/meta-oe/recipes-devtools/php/php_5.5.31.bb b/meta-oe/recipes-devtools/php/php_5.5.31.bb new file mode 100644 index 0000000000..cdd89b4a2a --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.5.31.bb @@ -0,0 +1,4 @@ +require php.inc + +SRC_URI[md5sum] = "ebb66ad8e2bcf1a966b10d86e81a0119" +SRC_URI[sha256sum] = "fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277" diff --git a/meta-oe/recipes-devtools/php/php_5.6.16.bb b/meta-oe/recipes-devtools/php/php_5.6.16.bb deleted file mode 100644 index 822c0907c8..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.6.16.bb +++ /dev/null @@ -1,5 +0,0 @@ -require php.inc - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" -SRC_URI[md5sum] = "765b164b89af1f03ae2fdf39a4e4e1df" -SRC_URI[sha256sum] = "4fe6f40964c1bfaba05fc144ba20a2cdad33e11685f4f101ea5a48b98bbcd2ae" diff --git a/meta-oe/recipes-devtools/php/php_5.6.17.bb b/meta-oe/recipes-devtools/php/php_5.6.17.bb new file mode 100644 index 0000000000..d92d92b4e0 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.6.17.bb @@ -0,0 +1,5 @@ +require php.inc + +SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch" +SRC_URI[md5sum] = "23e2183852b172a8e2b2c739b7dde4ca" +SRC_URI[sha256sum] = "77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b" -- cgit 1.2.3-korg