From f5e877779b6d7b8ee8e4d20f7be247af13f675da Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 25 Feb 2016 16:55:08 -0800 Subject: php: update to 5.6.18 and 6.6.32 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 Signed-off-by: Martin Jansa (cherry picked from commit 9d18babf72c6cbc45123940a365486bf94c0f728) 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.inc | 1 - meta-oe/recipes-devtools/php/php_5.5.31.bb | 4 -- meta-oe/recipes-devtools/php/php_5.5.32.bb | 6 +++ meta-oe/recipes-devtools/php/php_5.6.17.bb | 5 -- meta-oe/recipes-devtools/php/php_5.6.18.bb | 7 +++ 7 files changed, 69 insertions(+), 66 deletions(-) delete mode 100644 meta-oe/recipes-devtools/php/php-5.6.17/change-AC_TRY_RUN-to-AC_TRY_LINK.patch create mode 100644 meta-oe/recipes-devtools/php/php-5.6.18/change-AC_TRY_RUN-to-AC_TRY_LINK.patch delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.31.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.5.32.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.17.bb create mode 100644 meta-oe/recipes-devtools/php/php_5.6.18.bb 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 deleted file mode 100644 index 39c334f39d..0000000000 --- a/meta-oe/recipes-devtools/php/php-5.6.17/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.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 new file mode 100644 index 0000000000..39c334f39d --- /dev/null +++ b/meta-oe/recipes-devtools/php/php-5.6.18/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.inc b/meta-oe/recipes-devtools/php/php.inc index 793ffe8885..ee7a14334f 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -3,7 +3,6 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ diff --git a/meta-oe/recipes-devtools/php/php_5.5.31.bb b/meta-oe/recipes-devtools/php/php_5.5.31.bb deleted file mode 100644 index cdd89b4a2a..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.5.31.bb +++ /dev/null @@ -1,4 +0,0 @@ -require php.inc - -SRC_URI[md5sum] = "ebb66ad8e2bcf1a966b10d86e81a0119" -SRC_URI[sha256sum] = "fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277" diff --git a/meta-oe/recipes-devtools/php/php_5.5.32.bb b/meta-oe/recipes-devtools/php/php_5.5.32.bb new file mode 100644 index 0000000000..4ee3c38308 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.5.32.bb @@ -0,0 +1,6 @@ +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.6.17.bb b/meta-oe/recipes-devtools/php/php_5.6.17.bb deleted file mode 100644 index d92d92b4e0..0000000000 --- a/meta-oe/recipes-devtools/php/php_5.6.17.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] = "23e2183852b172a8e2b2c739b7dde4ca" -SRC_URI[sha256sum] = "77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b" diff --git a/meta-oe/recipes-devtools/php/php_5.6.18.bb b/meta-oe/recipes-devtools/php/php_5.6.18.bb new file mode 100644 index 0000000000..2ce012f1b9 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_5.6.18.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] = "7340353bedd998286ba2c4d87d7864f8" +SRC_URI[sha256sum] = "c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed" -- cgit 1.2.3-korg