aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php/pear-makefile.patch
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-04-03 17:50:13 +0800
committerArmin Kuster <akuster808@gmail.com>2018-04-08 17:00:06 -0700
commit2768c1deb3e3e8ad96c0f251fd44d76c5b044159 (patch)
tree4678d8f415af8d4076285c9b30e790ceee8467bb /meta-oe/recipes-devtools/php/php/pear-makefile.patch
parent08c5797ccb39ace8d53a43d3c706a0fb80415daa (diff)
downloadmeta-openembedded-2768c1deb3e3e8ad96c0f251fd44d76c5b044159.tar.gz
php7: upgrade to 7.2.4
* For changes, see: http://www.php.net/ChangeLog-7.php#7.2.4 * Remove patches as they've been upstreamed: - 0001-Specify-tag-with-libtool.patch - CVE-2017-16642.patch - CVE-2018-5711.patch * mcrypt module has been deprecated and as such dependency has been moved from php.inc to php5 recipe. * Refresh patches to avoid fuzz warnings. * New patches to: - Make sure libxml is detected using pkg-config instead of binconfig. - Fix link time warnings (backport, see patch for details) * Move the following patches to php5 from inc as they were getting applied out of context: - acinclude-xml2-config.patch - 0001-acinclude-use-pkgconfig-for-libxml2-config.patch License-Update: License is same, just a change in copyright year to 2018. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/pear-makefile.patch')
-rw-r--r--meta-oe/recipes-devtools/php/php/pear-makefile.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-oe/recipes-devtools/php/php/pear-makefile.patch
index 9927d2d967..4bc1025261 100644
--- a/meta-oe/recipes-devtools/php/php/pear-makefile.patch
+++ b/meta-oe/recipes-devtools/php/php/pear-makefile.patch
@@ -1,11 +1,18 @@
-Upstream-status: Unknown
+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
+
+---
+ pear/Makefile.frag | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
-index 00bacae..739eeca 100644
+index bbe8ec3..16f43e2 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
-@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix}
- PEAR_SUFFIX = -ds a$(program_suffix)
+@@ -12,7 +12,7 @@ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
install-pear-installer: $(SAPI_CLI_PATH)
- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
@@ -13,6 +20,3 @@ index 00bacae..739eeca 100644
install-pear:
@echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
---
-1.9.3
-