- 5.2.2, CVE patches not checked

Changed files:
    php.spec -> 1.668

diff --git a/php.spec b/php.spec
index ee0e94ad22b656c9b9181d5ba0ba1f16a8dd55cd..971fcb8f9f01b0f261a8d979aed7989b3d12ae19 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -70,7 +70,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define        _rel 6
+%define        _rel 0.1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -78,13 +78,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:          php
-Version:       5.2.1
+Version:       5.2.2
 Release:       %{_rel}%{?with_hardening:hardened}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 261218e3569a777dbd87c16a15f05c8d
+# Source0-md5: d084337867d70b50a10322577be0e44e
 Source2:       zend.gif
 Source3:       %{name}-mod_%{name}.conf
 Source4:       %{name}-cgi-fcgi.ini
@@ -126,10 +126,10 @@ Patch26:  %{name}-versioning.patch
 Patch27:       %{name}-linkflags-clean.patch
 Patch28:       %{name}-pear.patch
 Patch29:       %{name}-config-dir.patch
-Patch30:       %{name}-5.1.6-CVE-2007-0455.patch
-Patch31:       %{name}-5.1.6-CVE-2007-1001.patch
-Patch32:       %{name}-5.1.6-CVE-2007-1583.patch
-Patch33:       %{name}-5.1.6-CVE-2007-1718.patch
+#Patch30:      %{name}-5.1.6-CVE-2007-0455.patch
+#Patch31:      %{name}-5.1.6-CVE-2007-1001.patch
+#Patch32:      %{name}-5.1.6-CVE-2007-1583.patch
+#Patch33:      %{name}-5.1.6-CVE-2007-1718.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}
@@ -1591,10 +1591,10 @@ patch -p1 < %{PATCH22} || exit 1
 
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
+#%patch30 -p1 collisions
+#%patch31 -p1 collisions
+#%patch32 -p1 reversed patch
+#%patch33 -p1 reversed patch 
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4