From 2768c1deb3e3e8ad96c0f251fd44d76c5b044159 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 3 Apr 2018 17:50:13 +0800 Subject: 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 Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/php/php.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta-oe/recipes-devtools/php/php.inc') diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 8394c4f647..d2af4f6195 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -6,15 +6,13 @@ LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ - openssl libmcrypt" + openssl" DEPENDS_class-native = "zlib-native libxml2-native" PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://acinclude-xml2-config.patch \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ - file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ " SRC_URI_append_class-target = " \ @@ -57,7 +55,6 @@ EXTRA_OECONF = "--enable-mbstring \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ - --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ -- cgit v1.2.3-54-g00ecf