commit 18ac93729ba24cbd09e31709266c0e3b134e3666
Author: Łukasz Kieś <[email protected]>
Date: Mon Dec 16 15:16:35 2013 +0100
- updated to 5.5.7 (fixes CVE-2013-6420)
- fix building with freetype >= 2.5.1 (cherry-pick 732e12)
php-freetype.patch | 11 +++++++++++
php.spec | 8 +++++---
2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8d6b80e..30def91 100644
--- a/php.spec
+++ b/php.spec
@@ -139,13 +139,13 @@ 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.5.6
+Version: 5.5.7
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 77ad90035931aacb95d11318b09c12ca
+# Source0-md5: 0c02437f661105221e99a301a5275a41
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -218,6 +218,7 @@ Patch63: %{orgname}-mysql-nowarning.patch
Patch65: system-libzip.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
+Patch68: php-freetype.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}
@@ -239,7 +240,7 @@ BuildRequires: sed >= 4.0
%if %{with mssql} || %{with sybase_ct}
BuildRequires: freetds-devel >= 0.82
%endif
-BuildRequires: freetype-devel >= 2.0
+BuildRequires: freetype-devel >= 2.5.1
%if %{with system_gd}
BuildRequires: gd-devel >= 2.1
%endif
@@ -1954,6 +1955,7 @@ cp -p php.ini-production php.ini
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
%patch67 -p1
+%patch68 -p1
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#'
ext/xmlrpc/config.m4
diff --git a/php-freetype.patch b/php-freetype.patch
new file mode 100644
index 0000000..8253d62
--- /dev/null
+++ b/php-freetype.patch
@@ -0,0 +1,11 @@
+--- php-5.3.27/ext/gd/config.m4~ 2013-07-10 19:43:08.000000000 +0200
++++ php-5.3.27/ext/gd/config.m4 2013-12-12 14:38:29.753000608 +0100
+@@ -162,7 +162,7 @@
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ if test -f "$i/include/freetype2/freetype.h"; then
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/18ac93729ba24cbd09e31709266c0e3b134e3666
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
