packages: php/php.spec, php/bug-52078-fileinode.patch (REMOVED), php/bug-60...

[glen]

Author: glen                         Date: Fri Apr 27 23:26:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.3.11 (CVE-2012-1172, CVE-2012-0831), should compile with apache 2.4

---- Files affected:
packages/php:
   php.spec (1.980 -> 1.981) , bug-52078-fileinode.patch (1.5 -> NONE)  (REMOVED), bug-60986.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.980 packages/php/php.spec:1.981
--- packages/php/php.spec:1.980	Thu Mar 29 10:59:22 2012
+++ packages/php/php.spec	Sat Apr 28 01:26:43 2012
@@ -111,7 +111,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	7
+%define		rel	1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -119,13 +119,13 @@
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php
-Version:	5.3.10
+Version:	5.3.11
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	816259e5ca7d0a7e943e56a3bb32b17f
+# Source0-md5:	94709f6e7c920cbe26e19fa991d9975d
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -187,7 +187,6 @@
 Patch51:	spl-shared.patch
 Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
-Patch55:	bug-52078-fileinode.patch
 Patch59:	%{name}-systzdata.patch
 Patch60:	%{name}-oracle-instantclient.patch
 Patch62:	mcrypt-libs.patch
@@ -195,7 +194,6 @@
 Patch64:	%{name}-m4.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:	system-libzip.patch
-Patch66:	bug-60986.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}
@@ -1930,13 +1928,11 @@
 %patch52 -p1
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-%patch55 -p1
 %patch59 -p1
 %patch60 -p1
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
-%patch66 -p4
 %{?with_system_libzip:%patch65 -p1}
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
@@ -3330,6 +3326,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.981  2012/04/27 23:26:43  glen
+- up to 5.3.11 (CVE-2012-1172, CVE-2012-0831), should compile with apache 2.4
+
 Revision 1.980  2012/03/29 08:59:22  glen
 - fix patch depth
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/php/php.spec?r1=1.980&r2=1.981