Author: glen Date: Fri May 4 11:16:52 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 5.2.2, CVE patches not checked
---- Files affected:
SPECS:
php.spec (1.667 -> 1.668)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.667 SPECS/php.spec:1.668
--- SPECS/php.spec:1.667 Sun Apr 29 22:43:50 2007
+++ SPECS/php.spec Fri May 4 13:16:44 2007
@@ -71,7 +71,7 @@
%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
@@ -79,13 +79,13 @@
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
@@ -127,10 +127,10 @@
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}
@@ -1592,10 +1592,10 @@
%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
@@ -2723,6 +2723,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.668 2007/05/04 11:16:44 glen
+- 5.2.2, CVE patches not checked
+
Revision 1.667 2007/04/29 20:43:50 qboosh
- merged RH's security patches from AC-branch
(CVE-2007-0455 CVE-2007-1001 CVE-2007-1583 CVE-2007-1718)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.667&r2=1.668&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
