[php/f14/master] Update to 5.3.6

[Remi Collet]

commit f1131b15e2ef9d8151a559ef7ca305e2fc051d37
Author: remi <fedora at famillecollet.com>
Date:   Thu Mar 17 21:48:20 2011 +0100

    Update to 5.3.6

 .gitignore |    1 +
 php.spec   |   16 +++++++---------
 sources    |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a91bfe..7bb4718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 php-5.3.3.tar.bz2
 /php-5.3.4.tar.bz2
 /php-5.3.5.tar.bz2
+/php-5.3.6.tar.bz2
diff --git a/php.spec b/php.spec
index 7eccfd1..d4a64bf 100644
--- a/php.spec
+++ b/php.spec
@@ -20,7 +20,7 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.3.5
+Version: 5.3.6
 Release: 1%{?dist}
 License: PHP
 Group: Development/Languages
@@ -32,14 +32,14 @@ Source2: php.ini
 Source3: macros.php
 
 # Build fixes
-Patch1: php-5.3.4-gnusrc.patch
+Patch1: php-5.3.6-gnusrc.patch
 Patch2: php-5.3.0-install.patch
 Patch3: php-5.2.4-norpath.patch
 Patch4: php-5.3.0-phpize64.patch
 Patch5: php-5.2.0-includedir.patch
 Patch6: php-5.2.4-embed.patch
 Patch7: php-5.3.0-recode.patch
-Patch8: php-5.3.5-aconf26x.patch
+Patch8: php-5.3.6-aconf26x.patch
 
 # Fixes for extension modules
 Patch20: php-4.3.11-shutdown.patch
@@ -52,10 +52,6 @@ Patch42: php-5.3.1-systzdata-v7.patch
 # See http://bugs.php.net/53436
 Patch43: php-5.3.4-phpize.patch
 
-# Security patch from upstream SVN
-# http://svn.php.net/viewvc?view=revision&revision=306154
-Patch50: php-5.3.4-cve.patch
-
 # Fixes for tests
 Patch61: php-5.0.4-tests-wddx.patch
 
@@ -453,8 +449,6 @@ support for using the enchant library to PHP.
 %patch42 -p1 -b .systzdata
 %patch43 -p0 -b .headers
 
-%patch50 -p4 -b .cve
-
 %patch61 -p1 -b .tests-wddx
 
 # Prevent %%doc confusion over LICENSE files
@@ -884,6 +878,10 @@ rm files.* macros.php
 %files enchant -f files.enchant
 
 %changelog
+* Thu Mar 16 2011 Remi Collet <Fedora at famillecollet.com> 5.3.6-1
+- update to 5.3.6
+  http://www.php.net/ChangeLog-5.php#5.3.6
+
 * Fri Jan 07 2011 Remi Collet <Fedora at famillecollet.com> 5.3.5-1
 - update to 5.3.5
   http://www.php.net/ChangeLog-5.php#5.3.5
diff --git a/sources b/sources
index 18fafc2..fccaddf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8aaf20c95e91f25c5b6a591e5d6d61b9  php-5.3.5.tar.bz2
+2286f5a82a6e8397955a0025c1c2ad98  php-5.3.6.tar.bz2