aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchangqing.li@windriver.com <changqing.li@windriver.com>2018-06-29 14:22:13 +0800
committerArmin Kuster <akuster808@gmail.com>2018-07-08 15:03:52 -0700
commit3c978f910eee6f356eeced35f902461a86f2f2f4 (patch)
treee66808c2dd31658f7c472bf2ae27acac917841ae
parent6ae1ddbcb889e0406a7cad5a49a01990f3f36803 (diff)
downloadmeta-openembedded-contrib-3c978f910eee6f356eeced35f902461a86f2f2f4.tar.gz
meta-openembedded-contrib-3c978f910eee6f356eeced35f902461a86f2f2f4.tar.bz2
meta-openembedded-contrib-3c978f910eee6f356eeced35f902461a86f2f2f4.zip
php: upgrade 7.2.4 -> 7.2.7
Included: 7.2.5 Fixed bug #76130 (Heap Buffer Overflow (READ: 1786) in exif_iif_add_value). (CVE-2018-10549) Fixed bug #76249 (stream filter convert.iconv leads to infinite loop on invalid sequence). (CVE-2018-10546) Fixed bug #76248 (Malicious LDAP-Server Response causes Crash). (CVE-2018-10548) Fixed bug #76129 (fix for CVE-2018-5712 may not be complete). (CVE-2018-10547) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 188097b4e9f458b3c2268ba10ac28d0938b4fd2e) [Bug fix update] Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/iconv.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/pear-makefile.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php/php_exec_native.patch2
-rw-r--r--meta-oe/recipes-devtools/php/php_7.2.7.bb (renamed from meta-oe/recipes-devtools/php/php_7.2.4.bb)5
8 files changed, 9 insertions, 10 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
index 51a5e43b60..e7d326d7e5 100644
--- a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
+++ b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
@@ -4,7 +4,7 @@ Date: Tue, 17 Jun 2014 09:53:00 +0200
Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
-Upstream-Status: pending
+Upstream-Status: Pending
---
acinclude.m4 | 63 ++++++++++++++++++++++--------------------------------------
1 file changed, 23 insertions(+), 40 deletions(-)
diff --git a/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch b/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
index 30811a74bd..d0831669f9 100644
--- a/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
+++ b/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
@@ -1,4 +1,4 @@
-Upstream-status: Unknown
+Upstream-Status: Pending
diff --git a/acinclude.m4 b/acinclude.m4
index 4fd452e..206fcbf 100644
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch
index b6e3ceb0b9..ecf7d87207 100644
--- a/meta-oe/recipes-devtools/php/php/iconv.patch
+++ b/meta-oe/recipes-devtools/php/php/iconv.patch
@@ -1,7 +1,7 @@
From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 2 Nov 2011 16:54:57 +0100
-Subject: [PATCH] Upstream-status: Unknown
+Subject: [PATCH] Upstream-Status: Pending
---
acinclude.m4 | 3 ++-
diff --git a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
index b5fb7d4fd7..16359af9fd 100644
--- a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
+++ b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
@@ -1,7 +1,7 @@
From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 2 Nov 2011 16:54:57 +0100
-Subject: [PATCH] Upstream-status: Unknown
+Subject: [PATCH] Upstream-Status: Pending
---
acinclude.m4 | 2 +-
diff --git a/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-oe/recipes-devtools/php/php/pear-makefile.patch
index 4bc1025261..fcbf25be9b 100644
--- a/meta-oe/recipes-devtools/php/php/pear-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/pear-makefile.patch
@@ -1,7 +1,7 @@
From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 2 Nov 2011 16:54:57 +0100
-Subject: [PATCH] Upstream-status: Unknown
+Subject: [PATCH] Upstream-Status: Pending
---
pear/Makefile.frag | 2 +-
diff --git a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
index cff6426ab3..997430309b 100644
--- a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
@@ -1,7 +1,7 @@
From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 2 Nov 2011 16:54:57 +0100
-Subject: [PATCH] Upstream-status: Unknown
+Subject: [PATCH] Upstream-Status: Pending
%% original patch: php5-pear-makefile.patch
---
diff --git a/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-oe/recipes-devtools/php/php/php_exec_native.patch
index 6af0dc81a1..80409000d3 100644
--- a/meta-oe/recipes-devtools/php/php/php_exec_native.patch
+++ b/meta-oe/recipes-devtools/php/php/php_exec_native.patch
@@ -1,7 +1,7 @@
From d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 2 Nov 2011 16:54:57 +0100
-Subject: [PATCH] Upstream-status: Inappriate
+Subject: [PATCH] Upstream-Status: Inappriate
---
sapi/cli/config.m4 | 2 +-
diff --git a/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-oe/recipes-devtools/php/php_7.2.7.bb
index 2fd1e66c78..a256cd7506 100644
--- a/meta-oe/recipes-devtools/php/php_7.2.4.bb
+++ b/meta-oe/recipes-devtools/php/php_7.2.7.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2"
SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \
- file://0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch \
file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \
"
SRC_URI_append_class-target = " \
@@ -13,8 +12,8 @@ SRC_URI_append_class-target = " \
file://0001-opcache-config.m4-enable-opcache.patch \
"
-SRC_URI[md5sum] = "864c64ffd2f1686b035ef8ce6a6d8478"
-SRC_URI[sha256sum] = "11658a0d764dc94023b9fb60d4b5eb75d438ad17981efe70abb0d0d09a447ef3"
+SRC_URI[md5sum] = "4b5698c8c6c2b9cbff3a5706da67bb0f"
+SRC_URI[sha256sum] = "cc81675a96af4dd18d8ffc02f26a36c622abadf86af7ecfea7bcde8d3c96d5a3"
PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
--with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \