aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-08-31 16:54:17 +0800
committerArmin Kuster <akuster808@gmail.com>2016-09-18 13:11:39 -0700
commita99dfa58cb3e2919ae272040ebd0b85988bc708c (patch)
tree56887b32101a2c3dc1cbf806346fdf6fb2f95a02
parent402af09c10e4e811e95d342a0d80c51adac6b805 (diff)
downloadmeta-openembedded-contrib-a99dfa58cb3e2919ae272040ebd0b85988bc708c.tar.gz
php: update to 5.5.38 and 5.6.25
These are security releases, several security bugs are included: http://php.net/ChangeLog-5.php#5.5.38 http://php.net/ChangeLog-5.php#5.6.25 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 99d4505d89e173dea9eccd49859691ca92a677d7) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/php/php-5.6.25/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (renamed from meta-oe/recipes-devtools/php/php-5.6.23/change-AC_TRY_RUN-to-AC_TRY_LINK.patch)0
-rw-r--r--meta-oe/recipes-devtools/php/php_5.5.37.bb6
-rw-r--r--meta-oe/recipes-devtools/php/php_5.5.38.bb6
-rw-r--r--meta-oe/recipes-devtools/php/php_5.6.25.bb (renamed from meta-oe/recipes-devtools/php/php_5.6.23.bb)4
4 files changed, 8 insertions, 8 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.25/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
index 39c334f39d..39c334f39d 100644
--- 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.25/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff --git a/meta-oe/recipes-devtools/php/php_5.5.37.bb b/meta-oe/recipes-devtools/php/php_5.5.37.bb
deleted file mode 100644
index c7655bc2cf..0000000000
--- a/meta-oe/recipes-devtools/php/php_5.5.37.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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.5.38.bb b/meta-oe/recipes-devtools/php/php_5.5.38.bb
new file mode 100644
index 0000000000..26f35b1c16
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php_5.5.38.bb
@@ -0,0 +1,6 @@
+require php.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd"
+
+SRC_URI[md5sum] = "312244a0eecad602a1555ed2434e223f"
+SRC_URI[sha256sum] = "473c81ebb2e48ca468caee031762266651843d7227c18a824add9b07b9393e38"
diff --git a/meta-oe/recipes-devtools/php/php_5.6.23.bb b/meta-oe/recipes-devtools/php/php_5.6.25.bb
index 002ca74517..8620ee169c 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.23.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.25.bb
@@ -3,5 +3,5 @@ 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"
+SRC_URI[md5sum] = "f63b9956c25f1ae0433015a80b44224c"
+SRC_URI[sha256sum] = "58ce6032aced7f3e42ced492bd9820e5b3f2a3cd3ef71429aa92fd7b3eb18dde"