From: Elan Ruusamäe Date: Thu, 16 Jul 2015 13:56:48 +0000 (+0300) Subject: up to 5.6.11 (10 Jul 2015) X-Git-Tag: auto/th/php56-5.6.11-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=58fe9e2709b33cd8ba338dd04aa839bbf3334721;p=packages%2Fphp.git up to 5.6.11 (10 Jul 2015) - fixes for CVE-2015-4642, CVE-2015-4643, CVE-2015-4644, CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 --- diff --git a/libvpx2.patch b/libvpx2.patch deleted file mode 100644 index 9f0bd9f..0000000 --- a/libvpx2.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix build with latest libvpx 1.4.0 -These new constants exist at least since 1.0.0 -Compatibility ones have been droped in 1.4.0 - -https://github.com/libgd/libgd/commit/d41eb72cd4545c394578332e5c102dee69e02ee8 - -From d242f958dfca03640356ea29f624005a895f64a0 Mon Sep 17 00:00:00 2001 -From: Ole Markus With -Date: Sun, 24 May 2015 09:19:09 +0200 -Subject: [PATCH] Fix for bug #69479: GD fails to build with newer libvpx - ---- - ext/gd/libgd/webpimg.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c -index 1f1c023..9d801a2 100644 ---- a/ext/gd/libgd/webpimg.c -+++ b/ext/gd/libgd/webpimg.c -@@ -706,14 +706,14 @@ static WebPResult VPXEncode(const uint8* Y, - codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); - codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); - -- vpx_img_wrap(&img, IMG_FMT_I420, -+ vpx_img_wrap(&img, VPX_IMG_FMT_I420, - y_width, y_height, 16, (uint8*)(Y)); -- img.planes[PLANE_Y] = (uint8*)(Y); -- img.planes[PLANE_U] = (uint8*)(U); -- img.planes[PLANE_V] = (uint8*)(V); -- img.stride[PLANE_Y] = y_stride; -- img.stride[PLANE_U] = uv_stride; -- img.stride[PLANE_V] = uv_stride; -+ img.planes[VPX_PLANE_Y] = (uint8*)(Y); -+ img.planes[VPX_PLANE_U] = (uint8*)(U); -+ img.planes[VPX_PLANE_V] = (uint8*)(V); -+ img.stride[VPX_PLANE_Y] = y_stride; -+ img.stride[VPX_PLANE_U] = uv_stride; -+ img.stride[VPX_PLANE_V] = uv_stride; - - res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); - diff --git a/php.spec b/php.spec index d2ae051..df9737f 100644 --- a/php.spec +++ b/php.spec @@ -153,7 +153,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define rel 4 +%define rel 1 %define orgname php %define ver_suffix 56 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -164,7 +164,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.6.9 +Version: 5.6.11 Release: %{rel} Epoch: 4 # All files licensed under PHP version 3.01, except @@ -173,7 +173,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: f6b90cd0503310c38e9573bae1eb38c7 +# Source0-md5: e463c557b20a7ad3a3397683b3067ea7 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -232,7 +232,6 @@ Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch Patch69: fpm-conf-split.patch Patch70: mysqlnd-ssl.patch -Patch71: libvpx2.patch URL: http://www.php.net/ %{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} %{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0} @@ -331,7 +330,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define hashver 1.0 %define intlver 1.1.0 %define jsonver 1.2.1 -%define opcachever 7.0.4-dev +%define opcachever 7.0.6-dev %define pharver 2.0.2 %define sqlite3ver 0.7-dev %define zipver 1.12.5 @@ -2083,7 +2082,6 @@ exit 1 %patch66 -p1 %patch67 -p1 %patch70 -p1 -%patch71 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4